[SCM] Debian packaging of libarchive-zip-perl branch, master, updated. debian/1.30-6-9-g4223fa6

gregor herrmann gregoa at debian.org
Wed Jun 12 15:36:48 UTC 2013


The following commit has been merged in the master branch:
commit a3bb34a0da27a53c7fadb8d59ea36598abad5539
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed Jun 12 17:27:42 2013 +0200

    Put test file jar.zip into debian/ instead of creating it with quilt.
    
    Newer versions of patch don't apply git binary patches.
    
    Thanks: Jakub Wilk for the bug report.
    Closes: #711951

diff --git a/debian/source/include-binaries b/debian/clean
similarity index 100%
copy from debian/source/include-binaries
copy to debian/clean
diff --git a/debian/patches/0002-TODO-test-for-rt.cpan.org-73797-deflated-empty-file-.patch b/debian/patches/0002-TODO-test-for-rt.cpan.org-73797-deflated-empty-file-.patch
index 0c643b5..b986d23 100644
--- a/debian/patches/0002-TODO-test-for-rt.cpan.org-73797-deflated-empty-file-.patch
+++ b/debian/patches/0002-TODO-test-for-rt.cpan.org-73797-deflated-empty-file-.patch
@@ -58,20 +58,6 @@ index 0000000..9280d84
 +    local $TODO = "deflated empty files/directories corrupt the output";
 +is( $status, 0, "output zip isn't corrupted" );
 +}
-diff --git a/t/data/jar.zip b/t/data/jar.zip
-new file mode 100644
-index 0000000000000000000000000000000000000000..a58c356035743874f2d61b2e4fbaf240f8e9b73d
-GIT binary patch
-literal 427
-zcmWIWW at Zs#-~d9YA}t37B*4kQ!r<!~;;8HC=cfPf6axb at Lx49s2S^1IR9OH{%_2Y*
-zaLvAsex7cw!6ACSZl8V6oc8h7)w{^+t*dqJ%=yhh23L$9JT21m^40P5y;!=6g>%MB
-z$s^J;H8NPHKhyk?rY8PWJX~!0l4oMt70*;(XMQUBSi}f+NWSGHR(GH^APjN{7uZpP
-zXue<uik7772Y53wi7=pg6y^(%M^ORX<sfgPYelvf<V^&y1v24Ukvt7Dfr|mR`w%7^
-W12Vy`Wn}{iG6Uf{ApIP~VE_PkdPo=m
-
-literal 0
-HcmV?d00001
-
 -- 
 1.7.8.2
 
diff --git a/debian/rules b/debian/rules
index 0bf1871..b1490a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,11 @@
 #!/usr/bin/make -f
 
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
+
 %:
 	dh $@
 
 override_dh_auto_test:
+	cp $(CURDIR)/debian/t/data/jar.zip $(CURDIR)/t/data/
 	AUTOMATED_TESTING=1 dh_auto_test
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index 1925c5f..851d9c0 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1 +1 @@
-t/data/jar.zip
+debian/t/data/jar.zip
diff --git a/t/data/jar.zip b/debian/t/data/jar.zip
similarity index 100%
rename from t/data/jar.zip
rename to debian/t/data/jar.zip

-- 
Debian packaging of libarchive-zip-perl



More information about the Pkg-perl-cvs-commits mailing list