[Rt-commit] rtir branch, 2.6-trunk, updated. 2.6.1rc1-7-gbfe1253

[Ruslan Zakirov]

The branch, 2.6-trunk has been updated
       via  bfe1253a6ac76bf7fe68007a8dc906441737b9bb (commit)
       via  ca8a913e8df8dce056513c093b06b56bc482dd71 (commit)
       via  a1804eb1af650bc6a455f2a284b0c3c19bc58c19 (commit)
       via  fc04e4ae175cb5a1e0d43d8f510dd98711d5eb43 (commit)
      from  b678688bb84c5c5d834a8eea8001ec20c33e701f (commit)

Summary of changes:
 CHANGES      |    2 ++
 META.yml     |    2 +-
 Makefile.PL  |    5 ++++-
 README       |    4 +++-
 lib/RT/IR.pm |    2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit fc04e4ae175cb5a1e0d43d8f510dd98711d5eb43
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Sep 15 00:07:20 2011 +0400

    mention that we don't run on RT 4

diff --git a/README b/README
index 44311cc..53a799a 100644
--- a/README
+++ b/README
@@ -10,11 +10,13 @@ To purchase commercials support, training or custom development for RT
 or RTIR, please contact Best Practical at sales at bestpractical.com.
 
 
+WARNING: This version DOES NOT WORK with RT 4.x, wait for RTIR 3.0.
+
 
 REQUIRED PACKAGES:
 ------------------
 
-o   RT 3.8.3 or later, configured, installed and tested.
+o   RT 3.8.3 or later, but not 4.x, configured, installed and tested.
 o   RTFM 2.4.1 or later, configured, installed and tested.
 o   Net::Whois::RIPE 1.31 or OLDER, later versions broke
     backwards compatibility

commit a1804eb1af650bc6a455f2a284b0c3c19bc58c19
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Sep 15 00:11:13 2011 +0400

    make sure we don't install on RTIR 4.x

diff --git a/Makefile.PL b/Makefile.PL
index 7736a43..e340bf6 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -7,8 +7,11 @@ version_from('lib/RT/IR.pm');
 
 { # check RT version
     my @v = split /\./, "$RT::VERSION";
+    if ($v[0] >= 4) {
+        die "\n\nThis version of RTIR doesn't work with RT 4.x, you have $RT::VERSION";
+    }
     unless ($v[0]>=3 && $v[1]>=8 && ($v[2]>=3 || $v[2]eq'HEAD')) {
-        die "RTIR 2.4.2 and newer needs RT 3.8.3 at least, you have $RT::VERSION";
+        die "\n\nThis version of RTIR needs RT 3.8.3 at least, but don't work with RT 4.x, you have $RT::VERSION";
     }
 }
 

commit ca8a913e8df8dce056513c093b06b56bc482dd71
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Sep 15 00:14:47 2011 +0400

    update changelog

diff --git a/CHANGES b/CHANGES
index 37a531d..c635205 100644
--- a/CHANGES
+++ b/CHANGES
@@ -26,6 +26,8 @@ CLEANUPS
 ========
 
 * code cleanups to better follow modern perl coding guidelines
+* config file is now has POD instead of comments and options are
+  in better ordered
 
 CHANGES IN 2.6.0 SINCE RTIR 2.4.x
 ---------------------------------

commit bfe1253a6ac76bf7fe68007a8dc906441737b9bb
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Sep 15 00:15:28 2011 +0400

    bump version, 2.6.1

diff --git a/META.yml b/META.yml
index 9ddb8ff..c000001 100644
--- a/META.yml
+++ b/META.yml
@@ -35,4 +35,4 @@ requires:
   perl: 5.8.3
 resources:
   license: http://opensource.org/licenses/gpl-license.php
-version: 2.6.1rc1
+version: 2.6.1
diff --git a/lib/RT/IR.pm b/lib/RT/IR.pm
index 337926f..81a5bba 100644
--- a/lib/RT/IR.pm
+++ b/lib/RT/IR.pm
@@ -50,7 +50,7 @@ use 5.008003;
 use warnings;
 use strict;
 
-our $VERSION = '2.6.1rc1';
+our $VERSION = '2.6.1';
 
 
 use Business::Hours;

-----------------------------------------------------------------------