[Bps-public-commit] rtx-calendar branch, master, updated. 0.14-2-g323331e

Thomas Sibley trs at bestpractical.com
Tue Apr 23 16:18:20 EDT 2013


The branch, master has been updated
       via  323331e75541c560038590e87c55f2e5b53f7f73 (commit)
       via  7778282e546f084a31991154c16c8400d550d9ce (commit)
      from  f5bf8543a6f9719b155ec6b3c287156a23f12c49 (commit)

Summary of changes:
 CHANGES                             |  3 +++
 META.yml                            |  3 ++-
 Makefile.PL                         |  1 +
 html/Prefs/Calendar.html            |  4 ++--
 inc/Module/Install/RTx.pm           | 41 ++++++++++---------------------------
 inc/Module/Install/ReadmeFromPod.pm |  2 +-
 lib/RTx/Calendar.pm                 |  2 +-
 7 files changed, 21 insertions(+), 35 deletions(-)

- Log -----------------------------------------------------------------
commit 7778282e546f084a31991154c16c8400d550d9ce
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Apr 23 13:11:03 2013 -0700

    Switch to Digest::SHA from Digest::SHA1 to appease Debian
    
    See https://bugs.launchpad.net/ubuntu/+source/libdigest-sha1-perl/+bug/993648.
    
    The Makefile.PL now actually declares the dependency too instead of
    (presumably) relying on implicit dep.

diff --git a/Makefile.PL b/Makefile.PL
index e2d9432..d87b8eb 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -10,6 +10,7 @@ requires 'DateTime'      => 0;
 requires 'DateTime::Set' => 0;
 requires 'Data::ICal'    => 0;
 requires 'Date::ICal'    => 0;
+requires 'Digest::SHA';
 
 no_index(package => 'RT::Interface::Web::Menu');
 
diff --git a/html/Prefs/Calendar.html b/html/Prefs/Calendar.html
index 2cf5d92..76ca3b6 100644
--- a/html/Prefs/Calendar.html
+++ b/html/Prefs/Calendar.html
@@ -99,7 +99,7 @@ href="<%$RT::WebPath . '/Search/Build.html'%>">the Query Builder</a>
 </&>
 
 <%INIT>
-use Digest::SHA1;
+use Digest::SHA;
 use RT::SavedSearches;
 
 my $title = loc("Calendar Prefs");
@@ -118,7 +118,7 @@ if ($HiddenField && $HiddenField eq 'Private') {
 }
 
 if (defined $ChangeURL) {
-  my @args = $object->SetAttribute(Name => 'ICalURL', Content => Digest::SHA1::sha1_base64(time));
+  my @args = $object->SetAttribute(Name => 'ICalURL', Content => Digest::SHA::sha1_base64(time));
 } elsif (defined $ResetURL) {
   my @args = $object->DeleteAttribute('ICalURL');
 }

commit 323331e75541c560038590e87c55f2e5b53f7f73
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Apr 23 13:16:18 2013 -0700

    Releng for 0.15

diff --git a/CHANGES b/CHANGES
index d52998f..ab0adec 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+Changes for 0.15
+  * Switch to Digest::SHA from Digest::SHA1 to appease Debian
+
 Changes for 0.14
   * Guard the modern stylesheets call on older RTs
 
diff --git a/META.yml b/META.yml
index f2370fc..e9422ec 100644
--- a/META.yml
+++ b/META.yml
@@ -26,6 +26,7 @@ requires:
   Date::ICal: 0
   DateTime: 0
   DateTime::Set: 0
+  Digest::SHA: 0
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.14
+version: 0.15
diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index 73b9cda..abf6aea 100644
--- a/inc/Module/Install/RTx.pm
+++ b/inc/Module/Install/RTx.pm
@@ -8,13 +8,13 @@ no warnings 'once';
 
 use Module::Install::Base;
 use base 'Module::Install::Base';
-our $VERSION = '0.29';
+our $VERSION = '0.30';
 
 use FindBin;
 use File::Glob     ();
 use File::Basename ();
 
-my @DIRS = qw(etc lib html bin sbin po var);
+my @DIRS = qw(etc lib html static bin sbin po var);
 my @INDEX_DIRS = qw(lib bin sbin);
 
 sub RTx {
@@ -62,10 +62,11 @@ sub RTx {
     unshift @INC, "$RT::LocalPath/lib" if $RT::LocalPath;
     unshift @INC, $lib_path;
 
-    $RT::LocalVarPath  ||= $RT::VarPath;
-    $RT::LocalPoPath   ||= $RT::LocalLexiconPath;
-    $RT::LocalHtmlPath ||= $RT::MasonComponentRoot;
-    $RT::LocalLibPath  ||= "$RT::LocalPath/lib";
+    $RT::LocalVarPath    ||= $RT::VarPath;
+    $RT::LocalPoPath     ||= $RT::LocalLexiconPath;
+    $RT::LocalHtmlPath   ||= $RT::MasonComponentRoot;
+    $RT::LocalStaticPath ||= $RT::StaticPath;
+    $RT::LocalLibPath    ||= "$RT::LocalPath/lib";
 
     my $with_subdirs = $ENV{WITH_SUBDIRS};
     @ARGV = grep { /WITH_SUBDIRS=(.*)/ ? ( ( $with_subdirs = $1 ), 0 ) : 1 }
@@ -129,18 +130,7 @@ install ::
 
     my %has_etc;
     if ( File::Glob::bsd_glob("$FindBin::Bin/etc/schema.*") ) {
-
-        # got schema, load factory module
         $has_etc{schema}++;
-        $self->load('RTxFactory');
-        $self->postamble(<< ".");
-factory ::
-\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxFactory(qw($RTx $name))"
-
-dropdb ::
-\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxFactory(qw($RTx $name drop))"
-
-.
     }
     if ( File::Glob::bsd_glob("$FindBin::Bin/etc/acl.*") ) {
         $has_etc{acl}++;
@@ -164,28 +154,19 @@ dropdb ::
         print "For first-time installation, type 'make initdb'.\n";
         my $initdb = '';
         $initdb .= <<"." if $has_etc{schema};
-\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(schema))"
+\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(schema \$(NAME) \$(VERSION)))"
 .
         $initdb .= <<"." if $has_etc{acl};
-\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(acl))"
+\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(acl \$(NAME) \$(VERSION)))"
 .
         $initdb .= <<"." if $has_etc{initialdata};
-\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(insert))"
+\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(insert \$(NAME) \$(VERSION)))"
 .
         $self->postamble("initdb ::\n$initdb\n");
         $self->postamble("initialize-database ::\n$initdb\n");
     }
 }
 
-sub RTxInit {
-    unshift @INC, substr( delete( $INC{'RT.pm'} ), 0, -5 ) if $INC{'RT.pm'};
-    require RT;
-    RT::LoadConfig();
-    RT::ConnectToDatabase();
-
-    die "Cannot load RT" unless $RT::Handle and $RT::DatabaseType;
-}
-
 # stolen from RT::Handle so we work on 3.6 (cmp_versions came in with 3.8)
 { my %word = (
     a     => -4,
@@ -228,4 +209,4 @@ sub requires_rt {
 
 __END__
 
-#line 348
+#line 329
diff --git a/inc/Module/Install/ReadmeFromPod.pm b/inc/Module/Install/ReadmeFromPod.pm
index fb7075f..6a80818 100644
--- a/inc/Module/Install/ReadmeFromPod.pm
+++ b/inc/Module/Install/ReadmeFromPod.pm
@@ -7,7 +7,7 @@ use warnings;
 use base qw(Module::Install::Base);
 use vars qw($VERSION);
 
-$VERSION = '0.18';
+$VERSION = '0.20';
 
 sub readme_from {
   my $self = shift;
diff --git a/lib/RTx/Calendar.pm b/lib/RTx/Calendar.pm
index 51668d5..7debc94 100644
--- a/lib/RTx/Calendar.pm
+++ b/lib/RTx/Calendar.pm
@@ -4,7 +4,7 @@ use strict;
 use DateTime;
 use DateTime::Set;
 
-our $VERSION = "0.14";
+our $VERSION = "0.15";
 
 RT->AddStyleSheets('calendar.css')
     if RT->can('AddStyleSheets');

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



More information about the Bps-public-commit mailing list