r11761 - in /trunk/liblocale-maketext-lexicon-perl/debian: changelog control patches/00list patches/01needs_chomp patches/01needs_chomp.dpatch patches/02ignore_nonexistant patches/02ignore_nonexistant.dpatch patches/series rules

ntyni at users.alioth.debian.org ntyni at users.alioth.debian.org
Thu Dec 27 20:23:18 UTC 2007


Author: ntyni
Date: Thu Dec 27 20:23:17 2007
New Revision: 11761

URL: http://svn.debian.org/wsvn/?sc=1&rev=11761
Log:
* Migrate from dpatch to quilt for patch management.

Added:
    trunk/liblocale-maketext-lexicon-perl/debian/patches/01needs_chomp   (with props)
    trunk/liblocale-maketext-lexicon-perl/debian/patches/02ignore_nonexistant
      - copied, changed from r11760, trunk/liblocale-maketext-lexicon-perl/debian/patches/02ignore_nonexistant.dpatch
    trunk/liblocale-maketext-lexicon-perl/debian/patches/series
      - copied, changed from r11760, trunk/liblocale-maketext-lexicon-perl/debian/patches/00list
Removed:
    trunk/liblocale-maketext-lexicon-perl/debian/patches/00list
    trunk/liblocale-maketext-lexicon-perl/debian/patches/01needs_chomp.dpatch
    trunk/liblocale-maketext-lexicon-perl/debian/patches/02ignore_nonexistant.dpatch
Modified:
    trunk/liblocale-maketext-lexicon-perl/debian/changelog
    trunk/liblocale-maketext-lexicon-perl/debian/control
    trunk/liblocale-maketext-lexicon-perl/debian/rules

Modified: trunk/liblocale-maketext-lexicon-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/liblocale-maketext-lexicon-perl/debian/changelog?rev=11761&op=diff
==============================================================================
--- trunk/liblocale-maketext-lexicon-perl/debian/changelog (original)
+++ trunk/liblocale-maketext-lexicon-perl/debian/changelog Thu Dec 27 20:23:17 2007
@@ -3,6 +3,7 @@
   NEEDS INVESTIGATION: 
   + 372124 (02ignore_nonexistant.dpatch) seems to be fixed in upstream 0.63?
 
+  [ gregor herrmann ]
   * New upstream release.
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
     field (source stanza); Homepage field (source stanza). Removed: XS-
@@ -16,7 +17,10 @@
     before configure, call dh_clean before make distclean, remove
     dh_installman.
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Wed, 26 Dec 2007 01:29:01 +0100
+  [ Niko Tyni ]
+  * Migrate from dpatch to quilt for patch management.
+
+ -- Niko Tyni <ntyni at debian.org>  Thu, 27 Dec 2007 20:59:16 +0200
 
 liblocale-maketext-lexicon-perl (0.62-2) unstable; urgency=low
 

Modified: trunk/liblocale-maketext-lexicon-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/liblocale-maketext-lexicon-perl/debian/control?rev=11761&op=diff
==============================================================================
--- trunk/liblocale-maketext-lexicon-perl/debian/control (original)
+++ trunk/liblocale-maketext-lexicon-perl/debian/control Thu Dec 27 20:23:17 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Niko Tyni <ntyni at iki.fi>
-Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>= 5), quilt (>= 0.40-1)
 Build-Depends-Indep: perl (>= 5.8.0), liblocale-maketext-perl
 Standards-Version: 3.7.3
 Homepage: http://search.cpan.org/dist/Locale-Maketext-Lexicon/

Added: trunk/liblocale-maketext-lexicon-perl/debian/patches/01needs_chomp
URL: http://svn.debian.org/wsvn/trunk/liblocale-maketext-lexicon-perl/debian/patches/01needs_chomp?rev=11761&op=file
==============================================================================
--- trunk/liblocale-maketext-lexicon-perl/debian/patches/01needs_chomp (added)
+++ trunk/liblocale-maketext-lexicon-perl/debian/patches/01needs_chomp Thu Dec 27 20:23:17 2007
@@ -1,0 +1,15 @@
+## 01needs_chomp by  <sjq at debian.org>
+##
+## Fix for "::Run -f option non-working", bug#307777
+## Thanks to Damyan Ivanov for the patch.
+
+--- liblocale-maketext-lexicon-perl-0.53~/lib/Locale/Maketext/Extract/Run.pm	2005-12-05 03:37:26.000000000 +0000
++++ liblocale-maketext-lexicon-perl-0.53/lib/Locale/Maketext/Extract/Run.pm	2006-02-10 14:54:55.000000000 +0000
+@@ -40,6 +40,7 @@
+     foreach my $file (@{$opts{f}||[]}) {
+         open FILE, $file or die "Cannot open $file: $!";
+         while (<FILE>) {
++            chomp;
+             push @ARGV, $_ if -r and !-d;
+         }
+     }

Propchange: trunk/liblocale-maketext-lexicon-perl/debian/patches/01needs_chomp
------------------------------------------------------------------------------
    svn:executable = *

Copied: trunk/liblocale-maketext-lexicon-perl/debian/patches/02ignore_nonexistant (from r11760, trunk/liblocale-maketext-lexicon-perl/debian/patches/02ignore_nonexistant.dpatch)
URL: http://svn.debian.org/wsvn/trunk/liblocale-maketext-lexicon-perl/debian/patches/02ignore_nonexistant?rev=11761&op=diff
==============================================================================
--- trunk/liblocale-maketext-lexicon-perl/debian/patches/02ignore_nonexistant.dpatch (original)
+++ trunk/liblocale-maketext-lexicon-perl/debian/patches/02ignore_nonexistant Thu Dec 27 20:23:17 2007
@@ -1,13 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02ignore_nonexistant.dpatch by  <sjq at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: 
-## DP: Fix for "fails on non-existent PO files", bug#372124
-## DP: Thanks to Niko Tyni for the patch.
+## 02ignore_nonexistant by  <sjq at debian.org>
+## Fix for "fails on non-existent PO files", bug#372124
+## Thanks to Niko Tyni for the patch.
 
- at DPATCH@
-diff -urNad liblocale-maketext-lexicon-perl~/lib/Locale/Maketext/Lexicon.pm liblocale-maketext-lexicon-perl/lib/Locale/Maketext/Lexicon.pm
 --- liblocale-maketext-lexicon-perl~/lib/Locale/Maketext/Lexicon.pm	2007-12-26 01:14:54.000000000 +0100
 +++ liblocale-maketext-lexicon-perl/lib/Locale/Maketext/Lexicon.pm	2007-12-26 01:15:41.000000000 +0100
 @@ -298,6 +298,7 @@

Copied: trunk/liblocale-maketext-lexicon-perl/debian/patches/series (from r11760, trunk/liblocale-maketext-lexicon-perl/debian/patches/00list)
URL: http://svn.debian.org/wsvn/trunk/liblocale-maketext-lexicon-perl/debian/patches/series?rev=11761&op=diff
==============================================================================
    (empty)

Modified: trunk/liblocale-maketext-lexicon-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/liblocale-maketext-lexicon-perl/debian/rules?rev=11761&op=diff
==============================================================================
--- trunk/liblocale-maketext-lexicon-perl/debian/rules (original)
+++ trunk/liblocale-maketext-lexicon-perl/debian/rules Thu Dec 27 20:23:17 2007
@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 PACKAGE=$(shell dh_listpackages)
 
@@ -14,7 +14,7 @@
 TMP     =$(CURDIR)/debian/$(PACKAGE)
 
 configure: configure-stamp
-configure-stamp: $(DPATCH_STAMPFN)
+configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 	$(PERL) Makefile.PL verbose INSTALLDIRS=vendor




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