[SCM] Packaging ofParse::Debcontrol in Debian branch, master, updated. debian/2.005-3-6-g220e70a
gregor herrmann
gregoa at debian.org
Fri Aug 3 11:47:43 UTC 2012
The following commit has been merged in the master branch:
commit 09c2e6891e91001df8cd5eb023e09d8c05efbf02
Author: gregor herrmann <gregoa at debian.org>
Date: Fri Aug 3 13:39:52 2012 +0200
refresh patches
Git-Dch: Ignore
diff --git a/debian/patches/0001-Parse-DebControl-error-handling.patch b/debian/patches/0001-Parse-DebControl-error-handling.patch
index b360cb4..e3dfafb 100644
--- a/debian/patches/0001-Parse-DebControl-error-handling.patch
+++ b/debian/patches/0001-Parse-DebControl-error-handling.patch
@@ -12,8 +12,6 @@ return value
4 files changed, 131 insertions(+), 59 deletions(-)
create mode 100644 lib/Parse/DebControl/Error.pm
-diff --git a/lib/Parse/DebControl.pm b/lib/Parse/DebControl.pm
-index 1034dad..d51a2d2 100644
--- a/lib/Parse/DebControl.pm
+++ b/lib/Parse/DebControl.pm
@@ -13,6 +13,7 @@ use strict;
@@ -217,9 +215,6 @@ index 1034dad..d51a2d2 100644
1;
__END__
-diff --git a/lib/Parse/DebControl/Error.pm b/lib/Parse/DebControl/Error.pm
-new file mode 100644
-index 0000000..2bc11de
--- /dev/null
+++ b/lib/Parse/DebControl/Error.pm
@@ -0,0 +1,104 @@
@@ -327,8 +322,6 @@ index 0000000..2bc11de
+}
+
+1;
-diff --git a/t/30parse.t b/t/30parse.t
-index b9129be..bd08304 100644
--- a/t/30parse.t
+++ b/t/30parse.t
@@ -1,6 +1,7 @@
@@ -350,8 +343,6 @@ index b9129be..bd08304 100644
#Single item (no ending newline) parsing - 8 tests
-diff --git a/t/40write.t b/t/40write.t
-index 1da4f2e..ecaf593 100644
--- a/t/40write.t
+++ b/t/40write.t
@@ -1,7 +1,8 @@
@@ -377,7 +368,7 @@ index 1da4f2e..ecaf593 100644
ok($writer->write_mem({'foo' => 'bar'}) eq "foo: bar\n", "write_* should translate simple items correctly");
-@@ -54,7 +55,3 @@ ok($warnings eq "", "Writing blank hashrefs doesn't throw warnings"); #Version 1
+@@ -54,7 +55,3 @@ ok($warnings eq "", "Writing blank hashr
$mem = $writer->write_mem([]);
ok($warnings eq "", "Writing blank arrayrefs doesn't throw warnings"); #Version 1.9 fix
@@ -385,4 +376,3 @@ index 1da4f2e..ecaf593 100644
-$mem = $writer->write_mem();
-ok($warnings eq "", "Writing blank arrayrefs doesn't throw warnings"); #Version 1.9 fix
-
---
diff --git a/debian/patches/0002-Strict-parse.patch b/debian/patches/0002-Strict-parse.patch
index 1726d0f..65e9dba 100644
--- a/debian/patches/0002-Strict-parse.patch
+++ b/debian/patches/0002-Strict-parse.patch
@@ -25,8 +25,6 @@ Currently follwing formats are available:
create mode 100644 t/testfiles/strict3.source
create mode 100644 t/testfiles/strict4.binary
-diff --git a/lib/Parse/DebControl.pm b/lib/Parse/DebControl.pm
-index d51a2d2..a899d7a 100644
--- a/lib/Parse/DebControl.pm
+++ b/lib/Parse/DebControl.pm
@@ -14,10 +14,135 @@ use IO::Scalar;
@@ -296,9 +294,6 @@ index d51a2d2..a899d7a 100644
=back
=over 4
-diff --git a/t/34strict.t b/t/34strict.t
-new file mode 100644
-index 0000000..0fad5dc
--- /dev/null
+++ b/t/34strict.t
@@ -0,0 +1,92 @@
@@ -394,9 +389,6 @@ index 0000000..0fad5dc
+ {strict => 1, type => '.dsc'}
+ )
+} "Error not thrown when local fields is used";
-diff --git a/t/testfiles/strict1.changes b/t/testfiles/strict1.changes
-new file mode 100644
-index 0000000..4667888
--- /dev/null
+++ b/t/testfiles/strict1.changes
@@ -0,0 +1,43 @@
@@ -443,9 +435,6 @@ index 0000000..4667888
+ 48ea11ea1a2cf1df823c56014bde906b 1312 perl optional libparse-debcontrol-perl_2.005-3.dsc
+ 5b1813a6d4ef35f45a53432c8fa47ddf 8715 perl optional libparse-debcontrol-perl_2.005-3.diff.gz
+ f0b93bdfe997dab7bc47437d970e644d 24352 perl optional libparse-debcontrol-perl_2.005-3_all.deb
-diff --git a/t/testfiles/strict2.dsc b/t/testfiles/strict2.dsc
-new file mode 100644
-index 0000000..292a408
--- /dev/null
+++ b/t/testfiles/strict2.dsc
@@ -0,0 +1,16 @@
@@ -465,9 +454,6 @@ index 0000000..292a408
+Files:
+ 4fbf2e0b28a471a5e94394615303daf6 11414 libparse-debcontrol-perl_2.005.orig.tar.gz
+ 1eab49874a689857f8458457081fbe86 1783 libparse-debcontrol-perl_2.005-2.diff.gz
-diff --git a/t/testfiles/strict3.source b/t/testfiles/strict3.source
-new file mode 100644
-index 0000000..d057916
--- /dev/null
+++ b/t/testfiles/strict3.source
@@ -0,0 +1,29 @@
@@ -500,9 +486,6 @@ index 0000000..d057916
+ (because there are a lot of files in this format), but merely handles
+ the format. It can handle simple control files, or files hundreds of lines
+ long efficiently and easily.
-diff --git a/t/testfiles/strict4.binary b/t/testfiles/strict4.binary
-new file mode 100644
-index 0000000..3985532
--- /dev/null
+++ b/t/testfiles/strict4.binary
@@ -0,0 +1,23 @@
@@ -529,4 +512,3 @@ index 0000000..3985532
+ (because there are a lot of files in this format), but merely handles
+ the format. It can handle simple control files, or files hundreds of lines
+ long efficiently and easily.
---
diff --git a/debian/patches/0003-Parse-DebControl-Patch.patch b/debian/patches/0003-Parse-DebControl-Patch.patch
index 57d59f6..fa8d557 100644
--- a/debian/patches/0003-Parse-DebControl-Patch.patch
+++ b/debian/patches/0003-Parse-DebControl-Patch.patch
@@ -16,9 +16,6 @@ Easy OO parsing of debian patch file metadata (DEP3) data
create mode 100644 t/testfiles/patch2.diff
create mode 100644 t/testfiles/patch3.diff
-diff --git a/lib/Parse/DebControl/Patch.pm b/lib/Parse/DebControl/Patch.pm
-new file mode 100644
-index 0000000..7a02b30
--- /dev/null
+++ b/lib/Parse/DebControl/Patch.pm
@@ -0,0 +1,221 @@
@@ -243,9 +240,6 @@ index 0000000..7a02b30
+}
+
+1;
-diff --git a/t/35patch.t b/t/35patch.t
-new file mode 100644
-index 0000000..37e660d
--- /dev/null
+++ b/t/35patch.t
@@ -0,0 +1,95 @@
@@ -344,9 +338,6 @@ index 0000000..37e660d
+ok( exists $data->{Forwarded}, "Exists Forwarded field");
+ok( $data->{Forwarded}, "Forwarded is true");
+is( $data->{Forwarded}, 'http://www.example.com/patches?id=42', "Forwarded is set to \"http://www.example.com/patches?id=42\"");
-diff --git a/t/testfiles/patch1.diff b/t/testfiles/patch1.diff
-new file mode 100644
-index 0000000..af4935a
--- /dev/null
+++ b/t/testfiles/patch1.diff
@@ -0,0 +1,26 @@
@@ -376,9 +367,6 @@ index 0000000..af4935a
+ 2009-01-05 Martin Schwidefsky <schwidefsky at de.ibm.com>
+
+ * sysdeps/unix/sysv/linux/s390/bits/libc-vdso.h: New file.
-diff --git a/t/testfiles/patch2.diff b/t/testfiles/patch2.diff
-new file mode 100644
-index 0000000..6c4f054
--- /dev/null
+++ b/t/testfiles/patch2.diff
@@ -0,0 +1,4 @@
@@ -386,9 +374,6 @@ index 0000000..6c4f054
+Author: Someone Cool
+Subject: Bla bla bla
+Forwarded: not-needed
-diff --git a/t/testfiles/patch3.diff b/t/testfiles/patch3.diff
-new file mode 100644
-index 0000000..e52de96
--- /dev/null
+++ b/t/testfiles/patch3.diff
@@ -0,0 +1,4 @@
@@ -396,4 +381,3 @@ index 0000000..e52de96
+Author: Someone Cool
+Subject: Bla bla bla
+Forwarded: http://www.example.com/patches?id=42
---
diff --git a/debian/patches/0004-Manpage-spelling-fixes.patch b/debian/patches/0004-Manpage-spelling-fixes.patch
index 991a5de..1fdca4f 100644
--- a/debian/patches/0004-Manpage-spelling-fixes.patch
+++ b/debian/patches/0004-Manpage-spelling-fixes.patch
@@ -6,8 +6,6 @@ Subject: Manpage spelling fixes
lib/Parse/DebControl.pm | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/lib/Parse/DebControl.pm b/lib/Parse/DebControl.pm
-index a899d7a..20f8019 100644
--- a/lib/Parse/DebControl.pm
+++ b/lib/Parse/DebControl.pm
@@ -672,7 +672,7 @@ above
@@ -28,4 +26,3 @@ index a899d7a..20f8019 100644
on verbose C<warn()>ings. Calling it with a false parameter turns it off.
It is useful for nailing down any format or internal problems.
---
diff --git a/debian/patches/0005-More-thorough-comment-parsing.patch b/debian/patches/0005-More-thorough-comment-parsing.patch
index fb9bc24..9368063 100644
--- a/debian/patches/0005-More-thorough-comment-parsing.patch
+++ b/debian/patches/0005-More-thorough-comment-parsing.patch
@@ -1,7 +1,5 @@
-Index: libparse-debcontrol-perl/t/31stripcomments.t
-===================================================================
---- libparse-debcontrol-perl.orig/t/31stripcomments.t 2012-08-02 17:30:19.000000000 -0700
-+++ libparse-debcontrol-perl/t/31stripcomments.t 2012-08-02 17:40:23.000000000 -0700
+--- a/t/31stripcomments.t
++++ b/t/31stripcomments.t
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
@@ -10,7 +8,7 @@ Index: libparse-debcontrol-perl/t/31stripcomments.t
BEGIN {
chdir 't' if -d 't';
-@@ -54,3 +54,23 @@
+@@ -54,3 +54,23 @@ my $mod = "Parse::DebControl";
ok($data->[0]->{Key1} eq "value", "...first value is correct");
ok($data->[0]->{Key2} eq "value2", "...second value is correct");
@@ -34,11 +32,9 @@ Index: libparse-debcontrol-perl/t/31stripcomments.t
+ $data->[0]->{Key1} =~ s/^\s*//mg;# strip leading whitespace
+ $data->[0]->{Key1} =~ s/\n//g; # collapse newlines
+ ok($data->[0]->{Key1} eq $val_ref, "...value is correct");
-Index: libparse-debcontrol-perl/lib/Parse/DebControl.pm
-===================================================================
---- libparse-debcontrol-perl.orig/lib/Parse/DebControl.pm 2012-08-02 17:30:31.000000000 -0700
-+++ libparse-debcontrol-perl/lib/Parse/DebControl.pm 2012-08-02 17:39:45.000000000 -0700
-@@ -390,9 +390,19 @@
+--- a/lib/Parse/DebControl.pm
++++ b/lib/Parse/DebControl.pm
+@@ -390,9 +390,19 @@ sub _parseDataHandle
next if $line =~ /^\#/;
}
} elsif( $options->{stripComments} ){
diff --git a/debian/patches/0006-Better-line-number-tracking.patch b/debian/patches/0006-Better-line-number-tracking.patch
index 82d42db..d401775 100644
--- a/debian/patches/0006-Better-line-number-tracking.patch
+++ b/debian/patches/0006-Better-line-number-tracking.patch
@@ -1,8 +1,6 @@
-Index: libparse-debcontrol-perl/lib/Parse/DebControl.pm
-===================================================================
---- libparse-debcontrol-perl.orig/lib/Parse/DebControl.pm 2012-08-02 17:23:47.000000000 -0700
-+++ libparse-debcontrol-perl/lib/Parse/DebControl.pm 2012-08-02 17:24:02.000000000 -0700
-@@ -379,6 +379,8 @@
+--- a/lib/Parse/DebControl.pm
++++ b/lib/Parse/DebControl.pm
+@@ -379,6 +379,8 @@ sub _parseDataHandle
foreach my $line (<$handle>)
{
@@ -11,7 +9,7 @@ Index: libparse-debcontrol-perl/lib/Parse/DebControl.pm
#Sometimes with IO::Scalar, lines may have a newline at the end
#$line =~ s/\r??\n??$//; #CRLF fix, but chomp seems to clean it
-@@ -406,7 +408,6 @@
+@@ -406,7 +408,6 @@ sub _parseDataHandle
$line =~ s/\#\#/\#/;
}
--
Packaging ofParse::Debcontrol in Debian
More information about the Pkg-perl-cvs-commits
mailing list