[Python-modules-commits] r7913 - in packages/pyexiv2/trunk/debian (7 files)

[nijel at users.alioth.debian.org]

    Date: Wednesday, March 18, 2009 @ 14:41:07
  Author: nijel
Revision: 7913

Switch from dpatch to quilt.

Added:
  packages/pyexiv2/trunk/debian/patches/boost-lib-name.patch
    (from rev 7786, packages/pyexiv2/trunk/debian/patches/03_boost-lib-name.dpatch)
  packages/pyexiv2/trunk/debian/patches/series
    (from rev 7906, packages/pyexiv2/trunk/debian/patches/00list)
Modified:
  packages/pyexiv2/trunk/debian/changelog
  packages/pyexiv2/trunk/debian/control
  packages/pyexiv2/trunk/debian/rules
Deleted:
  packages/pyexiv2/trunk/debian/patches/00list
  packages/pyexiv2/trunk/debian/patches/03_boost-lib-name.dpatch

Modified: packages/pyexiv2/trunk/debian/changelog
===================================================================
--- packages/pyexiv2/trunk/debian/changelog	2009-03-18 14:39:17 UTC (rev 7912)
+++ packages/pyexiv2/trunk/debian/changelog	2009-03-18 14:41:07 UTC (rev 7913)
@@ -15,8 +15,9 @@
   * Bump to policy 3.8.1 (no changes needed).
   * Upload to experimental because this requires new exiv2.
   * Update debian/copyright (years, link to GPL-2).
+  * Switch from dpatch to quilt.
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 18 Mar 2009 15:39:03 +0100
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Wed, 18 Mar 2009 15:40:59 +0100
 
 pyexiv2 (0.1.2-4) unstable; urgency=low
 

Modified: packages/pyexiv2/trunk/debian/control
===================================================================
--- packages/pyexiv2/trunk/debian/control	2009-03-18 14:39:17 UTC (rev 7912)
+++ packages/pyexiv2/trunk/debian/control	2009-03-18 14:41:07 UTC (rev 7913)
@@ -10,7 +10,7 @@
     scons, 
     libexiv2-dev (>= 0.18), 
     libboost-python1.37-dev,
-    dpatch
+    quilt (>= 0.40)
 Standards-Version: 3.8.1
 XS-Python-Version: all
 Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/pyexiv2/trunk

Deleted: packages/pyexiv2/trunk/debian/patches/00list
===================================================================
--- packages/pyexiv2/trunk/debian/patches/00list	2009-03-18 14:39:17 UTC (rev 7912)
+++ packages/pyexiv2/trunk/debian/patches/00list	2009-03-18 14:41:07 UTC (rev 7913)
@@ -1 +0,0 @@
-03_boost-lib-name

Deleted: packages/pyexiv2/trunk/debian/patches/03_boost-lib-name.dpatch
===================================================================
--- packages/pyexiv2/trunk/debian/patches/03_boost-lib-name.dpatch	2009-03-18 14:39:17 UTC (rev 7912)
+++ packages/pyexiv2/trunk/debian/patches/03_boost-lib-name.dpatch	2009-03-18 14:41:07 UTC (rev 7913)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_boost-lib-name.dpatch by Michal ÄŒihaÅ™ <nijel at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make boost library name configurable.
-
- at DPATCH@
-diff -urNad pyexiv2-0.1.2~/src/SConscript pyexiv2-0.1.2/src/SConscript
---- pyexiv2-0.1.2~/src/SConscript	2008-02-18 23:32:00.000000000 +0100
-+++ pyexiv2-0.1.2/src/SConscript	2008-04-26 12:36:56.000000000 +0200
-@@ -11,7 +11,7 @@
- env.Append(CPPPATH=[python_inc_path])
- 
- #Â Libraries to link against
--libs = ['boost_python', 'exiv2']
-+libs = [ARGUMENTS.get('BOOSTLIB'), 'exiv2']
- env.Append(LIBS=libs)
- 
- # Build shared library libpyexiv2

Copied: packages/pyexiv2/trunk/debian/patches/boost-lib-name.patch (from rev 7786, packages/pyexiv2/trunk/debian/patches/03_boost-lib-name.dpatch)
===================================================================
--- packages/pyexiv2/trunk/debian/patches/boost-lib-name.patch	                        (rev 0)
+++ packages/pyexiv2/trunk/debian/patches/boost-lib-name.patch	2009-03-18 14:41:07 UTC (rev 7913)
@@ -0,0 +1,15 @@
+Make boost library name configurable.
+
+ at DPATCH@
+diff -urNad pyexiv2-0.1.2~/src/SConscript pyexiv2-0.1.2/src/SConscript
+--- pyexiv2-0.1.2~/src/SConscript	2008-02-18 23:32:00.000000000 +0100
++++ pyexiv2-0.1.2/src/SConscript	2008-04-26 12:36:56.000000000 +0200
+@@ -11,7 +11,7 @@
+ env.Append(CPPPATH=[python_inc_path])
+ 
+ #Â Libraries to link against
+-libs = ['boost_python', 'exiv2']
++libs = [ARGUMENTS.get('BOOSTLIB'), 'exiv2']
+ env.Append(LIBS=libs)
+ 
+ # Build shared library libpyexiv2

Copied: packages/pyexiv2/trunk/debian/patches/series (from rev 7906, packages/pyexiv2/trunk/debian/patches/00list)
===================================================================
--- packages/pyexiv2/trunk/debian/patches/series	                        (rev 0)
+++ packages/pyexiv2/trunk/debian/patches/series	2009-03-18 14:41:07 UTC (rev 7913)
@@ -0,0 +1 @@
+boost-lib-name.patch

Modified: packages/pyexiv2/trunk/debian/rules
===================================================================
--- packages/pyexiv2/trunk/debian/rules	2009-03-18 14:39:17 UTC (rev 7912)
+++ packages/pyexiv2/trunk/debian/rules	2009-03-18 14:41:07 UTC (rev 7913)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -9,7 +9,7 @@
 
 build: build-stamp
 
-build-stamp: patch-stamp
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 	# Build  modules