[libgit-pureperl-perl] 03/04: Remove my-oh-my.patch, applied by upstream
Lucas Kanashiro
kanashiro at moszumanska.debian.org
Thu Jul 21 21:38:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
kanashiro pushed a commit to branch master
in repository libgit-pureperl-perl.
commit d5ea0847f7f2e5137dc9ee0471190d27b69c475d
Author: Lucas Kanashiro <kanashiro at debian.org>
Date: Thu Jul 21 18:21:45 2016 -0300
Remove my-oh-my.patch, applied by upstream
---
debian/changelog | 1 +
debian/patches/my-oh-my.patch | 28 ----------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 29 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 218b221..c250576 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libgit-pureperl-perl (0.52-1) UNRELEASED; urgency=medium
[ Lucas Kanashiro ]
* Import upstream version 0.52.
+ * Remove my-oh-my.patch, applied by upstream
-- gregor herrmann <gregoa at debian.org> Wed, 29 Jun 2016 11:37:20 +0200
diff --git a/debian/patches/my-oh-my.patch b/debian/patches/my-oh-my.patch
deleted file mode 100644
index 5a420e6..0000000
--- a/debian/patches/my-oh-my.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: fix 'Can't redeclare "my" in "my" ...' error in 5.24
-Origin: vendor
-Bug-Debian: https://bugs.debian.org/825525
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2016-06-05
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=106772
-Bug: https://rt.cpan.org/Ticket/Display.html?id=106772
-
---- a/lib/Git/PurePerl.pm
-+++ b/lib/Git/PurePerl.pm
-@@ -156,7 +156,7 @@
- foreach my $line ( $packed_refs->slurp( chomp => 1 ) ) {
- next if $line =~ /^#/;
- next if $line =~ /^\^/;
-- my ( $sha1, my $name ) = split ' ', $line;
-+ my ( $sha1, $name ) = split ' ', $line;
- push @names, $name;
- }
- }
-@@ -202,7 +202,7 @@
- my $last_sha1;
- foreach my $line ( $packed_refs->slurp( chomp => 1 ) ) {
- next if $line =~ /^#/;
-- my ( $sha1, my $name ) = split ' ', $line;
-+ my ( $sha1, $name ) = split ' ', $line;
- $sha1 =~ s/^\^//;
- $name ||= $last_name;
-
diff --git a/debian/patches/series b/debian/patches/series
index 57724d0..cf4be3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
disable_test.patch
-my-oh-my.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libgit-pureperl-perl.git
More information about the Pkg-perl-cvs-commits
mailing list