r52521 - in /trunk/libio-compress-perl/debian: README.source changelog control patches/ patches/disable-zlib-version-test patches/series rules

mxey-guest at users.alioth.debian.org mxey-guest at users.alioth.debian.org
Thu Feb 11 08:39:28 UTC 2010


Author: mxey-guest
Date: Thu Feb 11 08:39:20 2010
New Revision: 52521

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=52521
Log:
Add patch to disable zlib version tests (Closes: #564352)

Added:
    trunk/libio-compress-perl/debian/README.source
    trunk/libio-compress-perl/debian/patches/
    trunk/libio-compress-perl/debian/patches/disable-zlib-version-test
    trunk/libio-compress-perl/debian/patches/series
Modified:
    trunk/libio-compress-perl/debian/changelog
    trunk/libio-compress-perl/debian/control
    trunk/libio-compress-perl/debian/rules

Added: trunk/libio-compress-perl/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-perl/debian/README.source?rev=52521&op=file
==============================================================================
--- trunk/libio-compress-perl/debian/README.source (added)
+++ trunk/libio-compress-perl/debian/README.source Thu Feb 11 08:39:20 2010
@@ -1,0 +1,5 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.

Modified: trunk/libio-compress-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-perl/debian/changelog?rev=52521&op=diff
==============================================================================
--- trunk/libio-compress-perl/debian/changelog (original)
+++ trunk/libio-compress-perl/debian/changelog Thu Feb 11 08:39:20 2010
@@ -9,6 +9,9 @@
 
   [ gregor herrmann ]
   * Fix Homepage field in debian/control.
+
+  [ Maximilian Gass ]
+  * Add patch to disable zlib version tests (Closes: #564352)
 
  -- Jonathan Yu <jawnsy at cpan.org>  Tue, 10 Nov 2009 14:43:15 -0500
 

Modified: trunk/libio-compress-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-perl/debian/control?rev=52521&op=diff
==============================================================================
--- trunk/libio-compress-perl/debian/control (original)
+++ trunk/libio-compress-perl/debian/control Thu Feb 11 08:39:20 2010
@@ -1,7 +1,7 @@
 Source: libio-compress-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7.0.50)
+Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7~)
 Build-Depends-Indep: perl, libcompress-raw-bzip2-perl (>= 2.023),
  libcompress-raw-zlib-perl (>= 2.023), libtest-pod-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>

Added: trunk/libio-compress-perl/debian/patches/disable-zlib-version-test
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-perl/debian/patches/disable-zlib-version-test?rev=52521&op=file
==============================================================================
--- trunk/libio-compress-perl/debian/patches/disable-zlib-version-test (added)
+++ trunk/libio-compress-perl/debian/patches/disable-zlib-version-test Thu Feb 11 08:39:20 2010
@@ -1,0 +1,98 @@
+Description: Disable zlib version if TEST_SKIP_VERSION_CHECK is set
+Author: Maximilian Gass <mxey at cloudconnected.org>
+Forwarded: https://rt.cpan.org/Ticket/Display.html?id=54510
+--- a/t/cz-01version.t
++++ b/t/cz-01version.t
+@@ -25,18 +25,20 @@
+ 
+ # Check zlib_version and ZLIB_VERSION are the same.
+ 
+-my $zlib_h = ZLIB_VERSION ;
+-my $libz   = Compress::Zlib::zlib_version;
++SKIP: {
++    skip "TEST_SKIP_VERSION_CHECK is set", 1 if $ENV{TEST_SKIP_VERSION_CHECK};
++    my $zlib_h = ZLIB_VERSION ;
++    my $libz   = Compress::Zlib::zlib_version;
+ 
+-is($zlib_h, $libz, "ZLIB_VERSION ($zlib_h) matches Compress::Zlib::zlib_version")
+-    or diag <<EOM;
++    is($zlib_h, $libz, "ZLIB_VERSION ($zlib_h) matches Compress::Zlib::zlib_version")
++        or diag <<EOM;
+ 
+ The version of zlib.h does not match the version of libz
+  
+ You have zlib.h version $zlib_h
+-     and libz   version $libz
++	 and libz   version $libz
+  
+ You probably have two versions of zlib installed on your system.
+ Try removing the one you don't want to use and rebuild.
+ EOM
+-
++}
+--- a/t/cz-03zlib-v1.t
++++ b/t/cz-03zlib-v1.t
+@@ -47,8 +47,11 @@
+ my $len   = length $hello ;
+ 
+ # Check zlib_version and ZLIB_VERSION are the same.
+-is Compress::Zlib::zlib_version, ZLIB_VERSION, 
+-    "ZLIB_VERSION matches Compress::Zlib::zlib_version" ;
++SKIP: {
++    skip "TEST_SKIP_VERSION_CHECK is set", 1 if $ENV{TEST_SKIP_VERSION_CHECK};
++    is Compress::Zlib::zlib_version, ZLIB_VERSION, 
++        "ZLIB_VERSION matches Compress::Zlib::zlib_version" ;
++}
+ 
+ # generate a long random string
+ my $contents = '' ;
+--- a/t/cz-06gzsetp.t
++++ b/t/cz-06gzsetp.t
+@@ -42,8 +42,11 @@
+ plan tests => 51 + $extra ;
+ 
+ # Check zlib_version and ZLIB_VERSION are the same.
+-is Compress::Zlib::zlib_version, ZLIB_VERSION,
+-    "ZLIB_VERSION matches Compress::Zlib::zlib_version" ;
++SKIP: {
++    skip "TEST_SKIP_VERSION_CHECK is set", 1 if $ENV{TEST_SKIP_VERSION_CHECK};
++    is Compress::Zlib::zlib_version, ZLIB_VERSION,
++        "ZLIB_VERSION matches Compress::Zlib::zlib_version" ;
++}
+  
+ {
+     # gzsetparams
+--- a/t/cz-08encoding.t
++++ b/t/cz-08encoding.t
+@@ -37,8 +37,11 @@
+ 
+ 
+ # Check zlib_version and ZLIB_VERSION are the same.
+-is Compress::Zlib::zlib_version, ZLIB_VERSION, 
+-    "ZLIB_VERSION matches Compress::Zlib::zlib_version" ;
++SKIP: {
++    skip "TEST_SKIP_VERSION_CHECK is set", 1 if $ENV{TEST_SKIP_VERSION_CHECK};
++    is Compress::Zlib::zlib_version, ZLIB_VERSION, 
++        "ZLIB_VERSION matches Compress::Zlib::zlib_version" ;
++}
+ 
+ 
+ {
+--- a/t/cz-14gzopen.t
++++ b/t/cz-14gzopen.t
+@@ -27,9 +27,12 @@
+ }
+ 
+ {
+-    # Check zlib_version and ZLIB_VERSION are the same.
+-    is Compress::Zlib::zlib_version, ZLIB_VERSION,
+-        "ZLIB_VERSION matches Compress::Zlib::zlib_version" ;
++    SKIP: {
++        skip "TEST_SKIP_VERSION_CHECK is set", 1 if $ENV{TEST_SKIP_VERSION_CHECK};
++        # Check zlib_version and ZLIB_VERSION are the same.
++        is Compress::Zlib::zlib_version, ZLIB_VERSION,
++            "ZLIB_VERSION matches Compress::Zlib::zlib_version" ;
++    }
+ }
+  
+ {

Added: trunk/libio-compress-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-perl/debian/patches/series?rev=52521&op=file
==============================================================================
--- trunk/libio-compress-perl/debian/patches/series (added)
+++ trunk/libio-compress-perl/debian/patches/series Thu Feb 11 08:39:20 2010
@@ -1,0 +1,1 @@
+disable-zlib-version-test

Modified: trunk/libio-compress-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libio-compress-perl/debian/rules?rev=52521&op=diff
==============================================================================
--- trunk/libio-compress-perl/debian/rules (original)
+++ trunk/libio-compress-perl/debian/rules Thu Feb 11 08:39:20 2010
@@ -4,10 +4,13 @@
 TMP     = $(CURDIR)/debian/$(PACKAGE)
 
 %:
-	dh $@
+	dh --with quilt $@
 
 override_dh_auto_configure:
 	dh_auto_configure -- INST_LIB='blib/lib'
+
+override_dh_auto_test:
+	dh_auto_test -- TEST_SKIP_VERSION_CHECK=1
 
 override_dh_auto_install:
 	dh_auto_install




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