r44583 - in /trunk/libcache-memcached-perl/debian: README.source changelog control patches/ patches/race.patch patches/series rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Mon Sep 21 20:56:15 2009
New Revision: 44583

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=44583
Log:
Add patch race.patch by Niko Tyni to fix/skip two tests that are timing
dependent (closes: #545626). Add quilt framework.

Added:
    trunk/libcache-memcached-perl/debian/README.source
    trunk/libcache-memcached-perl/debian/patches/
    trunk/libcache-memcached-perl/debian/patches/race.patch
    trunk/libcache-memcached-perl/debian/patches/series
Modified:
    trunk/libcache-memcached-perl/debian/changelog
    trunk/libcache-memcached-perl/debian/control
    trunk/libcache-memcached-perl/debian/rules

Added: trunk/libcache-memcached-perl/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcache-memcached-perl/debian/README.source?rev=44583&op=file
==============================================================================
--- trunk/libcache-memcached-perl/debian/README.source (added)
+++ trunk/libcache-memcached-perl/debian/README.source Mon Sep 21 20:56:15 2009
@@ -1,0 +1,6 @@
+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/libcache-memcached-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcache-memcached-perl/debian/changelog?rev=44583&op=diff
==============================================================================
--- trunk/libcache-memcached-perl/debian/changelog (original)
+++ trunk/libcache-memcached-perl/debian/changelog Mon Sep 21 20:56:15 2009
@@ -10,6 +10,10 @@
 
   [ Ryan Niebur ]
   * Update jawnsy's email address
+
+  [ gregor herrmann ]
+  * Add patch race.patch by Niko Tyni to fix/skip two tests that are timing
+    dependent (closes: #545626). Add quilt framework.
 
  -- Ryan Niebur <ryanryan52 at gmail.com>  Tue, 01 Sep 2009 21:18:06 -0700
 

Modified: trunk/libcache-memcached-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcache-memcached-perl/debian/control?rev=44583&op=diff
==============================================================================
--- trunk/libcache-memcached-perl/debian/control (original)
+++ trunk/libcache-memcached-perl/debian/control Mon Sep 21 20:56:15 2009
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jay Bonci <jaybonci at debian.org>, Jonathan Yu <jawnsy at cpan.org>
-Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: libstring-crc32-perl, perl
+Build-Depends: debhelper (>= 7.0.8), quilt (>= 0.46-7)
+Build-Depends-Indep: libstring-crc32-perl, perl, netbase
 Standards-Version: 3.8.1
 Homepage: http://search.cpan.org/dist/Cache-Memcached/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libcache-memcached-perl/

Added: trunk/libcache-memcached-perl/debian/patches/race.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcache-memcached-perl/debian/patches/race.patch?rev=44583&op=file
==============================================================================
--- trunk/libcache-memcached-perl/debian/patches/race.patch (added)
+++ trunk/libcache-memcached-perl/debian/patches/race.patch Mon Sep 21 20:56:15 2009
@@ -1,0 +1,35 @@
+Author: Niko Tyni <ntyni at debian.org>
+Bug: #545626
+Description: fix/skip timing dependent tests
+
+--- a/t/05_reconnect_timeout.t
++++ b/t/05_reconnect_timeout.t
+@@ -10,6 +10,9 @@
+ 
+ plan tests => 2;
+ 
++SKIP: {
++    skip "Skipping network tests for Debian builds", 2 if $ENV{DEBIAN_BUILD};
++
+ my $memd = Cache::Memcached->new({
+     servers   => [ $testaddr ],
+     namespace => "Cache::Memcached::t/$$/" . (time() % 100) . "/",
+@@ -26,3 +29,5 @@
+ $memd->set("key", "foo");
+ my $time3 = Time::HiRes::time();
+ ok($time3 - $time2 < .1, "Should return fast on retry");
++
++} # SKIP
+--- a/t/100_flush_bug.t
++++ b/t/100_flush_bug.t
+@@ -50,6 +50,10 @@
+     exit 0;
+ }
+ 
++# wait for the child to get the server ready
++# see http://bugs.debian.org/545626
++sleep 1;
++
+ my $memd = Cache::Memcached->new({ servers   => [ $testaddr ] });
+ 
+ for (@res) {

Added: trunk/libcache-memcached-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcache-memcached-perl/debian/patches/series?rev=44583&op=file
==============================================================================
--- trunk/libcache-memcached-perl/debian/patches/series (added)
+++ trunk/libcache-memcached-perl/debian/patches/series Mon Sep 21 20:56:15 2009
@@ -1,0 +1,1 @@
+race.patch

Modified: trunk/libcache-memcached-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcache-memcached-perl/debian/rules?rev=44583&op=diff
==============================================================================
--- trunk/libcache-memcached-perl/debian/rules (original)
+++ trunk/libcache-memcached-perl/debian/rules Mon Sep 21 20:56:15 2009
@@ -1,23 +1,7 @@
 #!/usr/bin/make -f
 
-build: build-stamp
-build-stamp:
-	dh build
-	touch $@
+# used by t/05_reconnect_timeout.t
+export DEBIAN_BUILD = 1
 
-clean:
-	dh $@
-
-install: install-stamp
-install-stamp: build-stamp
-	dh install
-	touch $@
-
-binary-arch:
-
-binary-indep: install
-	dh $@
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep install clean build
+%:
+	dh --with quilt $@