r21655 - in /trunk/libnet-xmpp-perl/debian: changelog control patches/00list patches/disable_networking_tests.dpatch patches/disable_networking_tests.patch patches/series rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sun Jun 15 17:15:34 2008
New Revision: 21655

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=21655
Log:
Switch patch system from dpatch to quilt.

Added:
    trunk/libnet-xmpp-perl/debian/patches/disable_networking_tests.patch
    trunk/libnet-xmpp-perl/debian/patches/series
Removed:
    trunk/libnet-xmpp-perl/debian/patches/00list
    trunk/libnet-xmpp-perl/debian/patches/disable_networking_tests.dpatch
Modified:
    trunk/libnet-xmpp-perl/debian/changelog
    trunk/libnet-xmpp-perl/debian/control
    trunk/libnet-xmpp-perl/debian/rules

Modified: trunk/libnet-xmpp-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-xmpp-perl/debian/changelog?rev=21655&op=diff
==============================================================================
--- trunk/libnet-xmpp-perl/debian/changelog (original)
+++ trunk/libnet-xmpp-perl/debian/changelog Sun Jun 15 17:15:34 2008
@@ -9,6 +9,7 @@
     <rafl at debian.org>); Florian Ragwitz <rafl at debian.org> moved to
     Uploaders.
   * Add debian/watch.
+  * Switch patch system from dpatch to quilt.
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 15 Jun 2008 16:39:06 +0200
 

Modified: trunk/libnet-xmpp-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-xmpp-perl/debian/control?rev=21655&op=diff
==============================================================================
--- trunk/libnet-xmpp-perl/debian/control (original)
+++ trunk/libnet-xmpp-perl/debian/control Sun Jun 15 17:15:34 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Florian Ragwitz <rafl at debian.org>
-Build-Depends: debhelper (>= 5.0.0), dpatch
+Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.40)
 Build-Depends-Indep: perl, libxml-stream-perl (>= 1.22), libdigest-sha1-perl, libauthen-sasl-perl
 Standards-Version: 3.7.2
 Homepage: http://search.cpan.org/dist/Net-XMPP/

Added: trunk/libnet-xmpp-perl/debian/patches/disable_networking_tests.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-xmpp-perl/debian/patches/disable_networking_tests.patch?rev=21655&op=file
==============================================================================
--- trunk/libnet-xmpp-perl/debian/patches/disable_networking_tests.patch (added)
+++ trunk/libnet-xmpp-perl/debian/patches/disable_networking_tests.patch Sun Jun 15 17:15:34 2008
@@ -1,0 +1,24 @@
+Author: Florian Ragwitz <rafl at debian.org>
+Description: Disable tests which require a network connection
+--- libnet-xmpp-perl.orig/t/2_client_jabberd1.4.t
++++ libnet-xmpp-perl/t/2_client_jabberd1.4.t
+@@ -1,5 +1,7 @@
+ use lib "t/lib";
+-use Test::More tests=>5;
++use Test::More;
++
++plan skip_all => 'Disabled for the Debian build';
+ 
+ BEGIN{ use_ok( "Net::XMPP" ); }
+ 
+--- libnet-xmpp-perl.orig/t/3_client_jabberd2.t
++++ libnet-xmpp-perl/t/3_client_jabberd2.t
+@@ -1,5 +1,7 @@
+ use lib "t/lib";
+-use Test::More tests=>5;
++use Test::More;
++
++plan skip_all => 'Disabled for the Debian build';
+ 
+ BEGIN{ use_ok( "Net::XMPP" ); }
+ 

Added: trunk/libnet-xmpp-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-xmpp-perl/debian/patches/series?rev=21655&op=file
==============================================================================
--- trunk/libnet-xmpp-perl/debian/patches/series (added)
+++ trunk/libnet-xmpp-perl/debian/patches/series Sun Jun 15 17:15:34 2008
@@ -1,0 +1,1 @@
+disable_networking_tests.patch

Modified: trunk/libnet-xmpp-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-xmpp-perl/debian/rules?rev=21655&op=diff
==============================================================================
--- trunk/libnet-xmpp-perl/debian/rules (original)
+++ trunk/libnet-xmpp-perl/debian/rules Sun Jun 15 17:15:34 2008
@@ -49,14 +49,14 @@
 	dh_md5sums
 	dh_builddeb
 
-patch: patch-stamp
-patch-stamp:
+patch: $(QUILT_STAMPFN)
+$(QUILT_STAMPFN):
 	dpatch apply-all
-	touch patch-stamp
+	touch $(QUILT_STAMPFN)
 
 unpatch:
 	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
+	rm -rf $(QUILT_STAMPFN) debian/patched
 
 source diff:                                                                  
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false