This is an automated email from the git hooks/post-receive script. zeha pushed a commit to branch master in repository sqitch.
commit b3770e570d9faefd5fe7568d5691712bdd57ee0d Author: Christian Hofstaedtler <z...@debian.org> Date: Sun Sep 28 16:58:46 2014 +0200 Remove upstream applied patch --- debian/changelog | 6 +- debian/patches/digest-sha.patch | 187 ---------------------------------------- debian/patches/series | 1 - 3 files changed, 5 insertions(+), 189 deletions(-) diff --git a/debian/changelog b/debian/changelog index 53ef6bf..91f4ca0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sqitch (0.995-2) UNRELEASED; urgency=medium +sqitch (0.996-1) UNRELEASED; urgency=medium [ Salvatore Bonaccorso ] * Update Vcs-Browser URL to cgit web frontend @@ -6,6 +6,10 @@ sqitch (0.995-2) UNRELEASED; urgency=medium [ gregor herrmann ] * debian/control: update Module::Build dependency. + [ Christian Hofstaedtler ] + * New upstream version. + * Remove upstream-supplied and -applied Digest::SHA patch. + -- Salvatore Bonaccorso <car...@debian.org> Sat, 16 Aug 2014 09:36:34 +0200 sqitch (0.995-1) unstable; urgency=low diff --git a/debian/patches/digest-sha.patch b/debian/patches/digest-sha.patch deleted file mode 100644 index 7755ce8..0000000 --- a/debian/patches/digest-sha.patch +++ /dev/null @@ -1,187 +0,0 @@ -From 0571cabf3d7ef9e6e91811ab49f7759f330d314f Mon Sep 17 00:00:00 2001 -From: "David E. Wheeler" <da...@justatheory.com> -Date: Fri, 18 Jul 2014 14:49:48 -0700 -Subject: [PATCH] Switch from Digest::SHA1 to Digest::SHA. - -Resolves #176. ---- - Changes | 2 ++ - dist/sqitch.spec | 4 ++-- - lib/App/Sqitch/Plan/Change.pm | 8 ++++---- - lib/App/Sqitch/Plan/Tag.pm | 8 ++++---- - t/change.t | 10 +++++----- - t/tag.t | 10 +++++----- - 6 files changed, 22 insertions(+), 20 deletions(-) - -Index: sqitch/dist/sqitch.spec -=================================================================== ---- sqitch.orig/dist/sqitch.spec -+++ sqitch/dist/sqitch.spec -@@ -18,7 +18,7 @@ BuildRequires: perl(constant) - BuildRequires: perl(DateTime) - BuildRequires: perl(DBI) - BuildRequires: perl(Devel::StackTrace) >= 1.30 --BuildRequires: perl(Digest::SHA1) -+BuildRequires: perl(Digest::SHA) - BuildRequires: perl(Encode) - BuildRequires: perl(Encode::Locale) - BuildRequires: perl(File::Basename) -@@ -83,7 +83,7 @@ Requires: perl(Config::GitLike) >= - Requires: perl(constant) - Requires: perl(DateTime) - Requires: perl(Devel::StackTrace) >= 1.30 --Requires: perl(Digest::SHA1) -+Requires: perl(Digest::SHA) - Requires: perl(Encode) - Requires: perl(Encode::Locale) - Requires: perl(File::Basename) -Index: sqitch/lib/App/Sqitch/Plan/Change.pm -=================================================================== ---- sqitch.orig/lib/App/Sqitch/Plan/Change.pm -+++ sqitch/lib/App/Sqitch/Plan/Change.pm -@@ -149,8 +149,8 @@ has id => ( - lazy => 1, - default => sub { - my $content = encode_utf8 shift->info; -- require Digest::SHA1; -- return Digest::SHA1->new->add( -+ require Digest::SHA; -+ return Digest::SHA->new(1)->add( - 'change ' . length($content) . "\0" . $content - )->hexdigest; - } -@@ -178,8 +178,8 @@ has old_id => ( - lazy => 1, - default => sub { - my $content = encode_utf8 shift->old_info; -- require Digest::SHA1; -- return Digest::SHA1->new->add( -+ require Digest::SHA; -+ return Digest::SHA->new(1)->add( - 'change ' . length($content) . "\0" . $content - )->hexdigest; - } -Index: sqitch/lib/App/Sqitch/Plan/Tag.pm -=================================================================== ---- sqitch.orig/lib/App/Sqitch/Plan/Tag.pm -+++ sqitch/lib/App/Sqitch/Plan/Tag.pm -@@ -40,8 +40,8 @@ has id => ( - lazy => 1, - default => sub { - my $content = encode_utf8 shift->info; -- require Digest::SHA1; -- return Digest::SHA1->new->add( -+ require Digest::SHA; -+ return Digest::SHA->new(1)->add( - 'tag ' . length($content) . "\0" . $content - )->hexdigest; - } -@@ -72,8 +72,8 @@ has old_id => ( - lazy => 1, - default => sub { - my $content = encode_utf8 shift->old_info; -- require Digest::SHA1; -- return Digest::SHA1->new->add( -+ require Digest::SHA; -+ return Digest::SHA->new(1)->add( - 'tag ' . length($content) . "\0" . $content - )->hexdigest; - } -Index: sqitch/t/change.t -=================================================================== ---- sqitch.orig/t/change.t -+++ sqitch/t/change.t -@@ -15,7 +15,7 @@ use Locale::TextDomain qw(App-Sqitch); - use Test::Exception; - use Path::Class; - use File::Path qw(make_path remove_tree); --use Digest::SHA1; -+use Digest::SHA; - use Test::MockModule; - use URI; - -@@ -160,7 +160,7 @@ is $change->old_info, join("\n", - ), 'Old change info should be correct'; - is $change->old_id, do { - my $content = encode_utf8 $change->old_info; -- Digest::SHA1->new->add( -+ Digest::SHA->new(1)->add( - 'change ' . length($content) . "\0" . $content - )->hexdigest; - },'Old change ID should be correct'; -@@ -173,7 +173,7 @@ is $change->info, join("\n", - ), 'Change info should be correct'; - is $change->id, do { - my $content = encode_utf8 $change->info; -- Digest::SHA1->new->add( -+ Digest::SHA->new(1)->add( - 'change ' . length($content) . "\0" . $content - )->hexdigest; - },'Change ID should be correct'; -@@ -368,7 +368,7 @@ is $change2->old_info, join("\n", - - is $change2->old_id, do { - my $content = Encode::encode_utf8 $change2->old_info; -- Digest::SHA1->new->add( -+ Digest::SHA->new(1)->add( - 'change ' . length($content) . "\0" . $content - )->hexdigest; - },'Old change ID should be hashed from encoded UTF-8'; -@@ -383,7 +383,7 @@ is $change2->info, join("\n", - - is $change2->id, do { - my $content = Encode::encode_utf8 $change2->info; -- Digest::SHA1->new->add( -+ Digest::SHA->new(1)->add( - 'change ' . length($content) . "\0" . $content - )->hexdigest; - },'Change ID should be hashed from encoded UTF-8'; -Index: sqitch/t/tag.t -=================================================================== ---- sqitch.orig/t/tag.t -+++ sqitch/t/tag.t -@@ -11,7 +11,7 @@ use Path::Class; - use App::Sqitch; - use App::Sqitch::Plan; - use Test::MockModule; --use Digest::SHA1; -+use Digest::SHA; - use URI; - - my $CLASS; -@@ -141,7 +141,7 @@ is $tag->info, join("\n", - - is $tag->id, do { - my $content = $tag->info; -- Digest::SHA1->new->add( -+ Digest::SHA->new(1)->add( - 'tag ' . length($content) . "\0" . $content - )->hexdigest; - },'Tag ID should be correct'; -@@ -157,7 +157,7 @@ is $tag->old_info, join("\n", - - is $tag->old_id, do { - my $content = $tag->old_info; -- Digest::SHA1->new->add( -+ Digest::SHA->new(1)->add( - 'tag ' . length($content) . "\0" . $content - )->hexdigest; - },'Old tag ID should be correct'; -@@ -181,7 +181,7 @@ is $tag->info, join("\n", - - is $tag->id, do { - my $content = Encode::encode_utf8 $tag->info; -- Digest::SHA1->new->add( -+ Digest::SHA->new(1)->add( - 'tag ' . length($content) . "\0" . $content - )->hexdigest; - },'Tag ID should be hahsed from encoded UTF-8'; -@@ -197,7 +197,7 @@ is $tag->old_info, join("\n", - - is $tag->old_id, do { - my $content = Encode::encode_utf8 $tag->old_info; -- Digest::SHA1->new->add( -+ Digest::SHA->new(1)->add( - 'tag ' . length($content) . "\0" . $content - )->hexdigest; - },'Old tag ID should be hahsed from encoded UTF-8'; diff --git a/debian/patches/series b/debian/patches/series index 0f999a3..eae37e5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ fix-bad-whatis-man.patch -digest-sha.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/sqitch.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits