r21658 - in /trunk/libswish-api-common-perl/debian: changelog control patches/00list patches/20swish-e_path.dpatch patches/20swish-e_path.patch patches/30fix-makefile-pl.dpatch patches/30fix-makefile-pl.patch patches/series rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sun Jun 15 17:17:50 2008
New Revision: 21658

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

Added:
    trunk/libswish-api-common-perl/debian/patches/20swish-e_path.patch
    trunk/libswish-api-common-perl/debian/patches/30fix-makefile-pl.patch
    trunk/libswish-api-common-perl/debian/patches/series
Removed:
    trunk/libswish-api-common-perl/debian/patches/00list
    trunk/libswish-api-common-perl/debian/patches/20swish-e_path.dpatch
    trunk/libswish-api-common-perl/debian/patches/30fix-makefile-pl.dpatch
Modified:
    trunk/libswish-api-common-perl/debian/changelog
    trunk/libswish-api-common-perl/debian/control
    trunk/libswish-api-common-perl/debian/rules

Modified: trunk/libswish-api-common-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/debian/changelog?rev=21658&op=diff
==============================================================================
--- trunk/libswish-api-common-perl/debian/changelog (original)
+++ trunk/libswish-api-common-perl/debian/changelog Sun Jun 15 17:17:50 2008
@@ -9,6 +9,7 @@
     <rafl at debianforum.de>); Florian Ragwitz <rafl at debianforum.de> moved
     to Uploaders.
   * Add debian/watch.
+  * Switch patch system from dpatch to quilt.
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 15 Jun 2008 17:22:24 +0200
 

Modified: trunk/libswish-api-common-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/debian/control?rev=21658&op=diff
==============================================================================
--- trunk/libswish-api-common-perl/debian/control (original)
+++ trunk/libswish-api-common-perl/debian/control Sun Jun 15 17:17:50 2008
@@ -1,7 +1,7 @@
 Source: libswish-api-common-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 4.0.2), dpatch
+Build-Depends: debhelper (>= 4.0.2), quilt (>= 0.40)
 Build-Depends-Indep: perl (>= 5.8.0-7), swish-e, libwww-perl, liblog-log4perl-perl, libsysadm-install-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Florian Ragwitz <rafl at debianforum.de>

Added: trunk/libswish-api-common-perl/debian/patches/20swish-e_path.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/debian/patches/20swish-e_path.patch?rev=21658&op=file
==============================================================================
--- trunk/libswish-api-common-perl/debian/patches/20swish-e_path.patch (added)
+++ trunk/libswish-api-common-perl/debian/patches/20swish-e_path.patch Sun Jun 15 17:17:50 2008
@@ -1,0 +1,14 @@
+Author: Florian Ragwitz <florian.ragwitz at s2004.tu-chemnitz.de>
+Description: Look for swish-e in the default path first.
+This should speed up looking for swish-e in the default case.
+--- libswish-api-common-perl.orig/lib/SWISH/API/Common.pm
++++ libswish-api-common-perl/lib/SWISH/API/Common.pm
+@@ -11,7 +11,7 @@
+ 
+ our $VERSION         = "0.03";
+ our $SWISH_EXE       = "swish-e";
+-our @SWISH_EXE_PATHS = qw(/usr/local/bin);
++our @SWISH_EXE_PATHS = qw(/usr/bin/ /usr/local/bin);
+ 
+ use SWISH::API;
+ use File::Path;

Added: trunk/libswish-api-common-perl/debian/patches/30fix-makefile-pl.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/debian/patches/30fix-makefile-pl.patch?rev=21658&op=file
==============================================================================
--- trunk/libswish-api-common-perl/debian/patches/30fix-makefile-pl.patch (added)
+++ trunk/libswish-api-common-perl/debian/patches/30fix-makefile-pl.patch Sun Jun 15 17:17:50 2008
@@ -1,0 +1,13 @@
+Author: <gwolf at debian.org>
+Description: No description.
+--- libswish-api-common-perl.orig/Makefile.PL
++++ libswish-api-common-perl/Makefile.PL
+@@ -57,7 +57,7 @@
+          #print "*** Temporary directory: $dir\n";
+          chdir $dir or die "Cannot chdir to $dir";
+          my $distro = "swish-e-2.4.3.tar.gz";
+-         (my $distrodir = $distro) =~ s/\.tar.\gz$//g;
++         (my $distrodir = $distro) =~ s/\.tar\.gz$//g;
+          print "Downloading $distro ...\n";
+ #File::Copy::copy("/tmp/$distro", "$dir/$distro");
+          LWP::Simple::getstore(

Added: trunk/libswish-api-common-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/debian/patches/series?rev=21658&op=file
==============================================================================
--- trunk/libswish-api-common-perl/debian/patches/series (added)
+++ trunk/libswish-api-common-perl/debian/patches/series Sun Jun 15 17:17:50 2008
@@ -1,0 +1,2 @@
+20swish-e_path.patch
+30fix-makefile-pl.patch

Modified: trunk/libswish-api-common-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libswish-api-common-perl/debian/rules?rev=21658&op=diff
==============================================================================
--- trunk/libswish-api-common-perl/debian/rules (original)
+++ trunk/libswish-api-common-perl/debian/rules Sun Jun 15 17:17:50 2008
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 export PERL_MM_USE_DEFAULT=1
 
@@ -13,7 +13,7 @@
 TMP     =$(CURDIR)/debian/$(PACKAGE)
 
 build: build-stamp
-build-stamp: patch-stamp
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE) OPTIMIZE="-Wall -O2 -g"