[Pkg-cli-libs-commits] [SCM] webkit-sharp branch, master, updated. debian/0.3-3-7-gf7ab58b

Fri Jul 15 10:02:13 UTC 2011

The following commit has been merged in the master branch:
commit 37cd01a0f1b7596ec155a8e829e927b3359b6be9
Author: Iain Lane <laney at debian.org>
Date:   Fri Jul 15 10:19:53 2011 +0100

    Use quilt for patching

diff --git a/debian/README.source b/debian/README.source
index 3070a10..5dde0bf 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,31 +1,58 @@
-cecil for Debian
-----------------
-
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
+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.
 
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+                break
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
 
-    debian/rules patch
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
 
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
 
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
 
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
+To remove an existing patch from the list of patches that will be applied,
+run:
 
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
+    quilt delete <patch>
 
- -- David Paleino <d.paleino at gmail.com>  Sat, 07 Feb 2009 21:22:18 +0100
+You may need to run quilt pop -a to unapply patches first before running
+this command.
diff --git a/debian/control b/debian/control
index 226561a..80c4d4c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: cli-mono
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey at debian.org>, Jo Shields <directhex at apebox.org>
-Build-Depends: debhelper (>= 7), dpatch
+Build-Depends: debhelper (>= 7), quilt (>= 0.46-7~)
 Build-Depends-Indep: cli-common-dev (>= 0.5.7),
  mono-devel (>= 2.4.2.3),
  pkg-config,
diff --git a/debian/patches/fix_dllmap.dpatch b/debian/patches/fix_dllmap
old mode 100755
new mode 100644
similarity index 59%
rename from debian/patches/fix_dllmap.dpatch
rename to debian/patches/fix_dllmap
index bb50bbd..6d50b53
--- a/debian/patches/fix_dllmap.dpatch
+++ b/debian/patches/fix_dllmap
@@ -5,9 +5,10 @@
 ## DP: Tweak dllmap to better reflect the actual filename to bind to
 
 @DPATCH@
-diff -urNad webkit-sharp-0.2~/sources/webkit-sharp.dll.config.in webkit-sharp-0.2/sources/webkit-sharp.dll.config.in
---- webkit-sharp-0.2~/sources/webkit-sharp.dll.config.in	2008-05-13 16:05:23.000000000 +0200
-+++ webkit-sharp-0.2/sources/webkit-sharp.dll.config.in	2008-06-15 18:16:00.000000000 +0200
+Index: webkit-sharp/sources/webkit-sharp.dll.config.in
+===================================================================
+--- webkit-sharp.orig/sources/webkit-sharp.dll.config.in	2011-07-15 10:26:53.638141412 +0100
++++ webkit-sharp/sources/webkit-sharp.dll.config.in	2011-07-15 10:26:59.761901874 +0100
 @@ -1,3 +1,3 @@
  <configuration>
 -  <dllmap dll="webkit-1.0" target="webkit-1.0 at LIB_PREFIX@.2 at LIB_SUFFIX@"/>
diff --git a/debian/patches/fix_pkg-config_paths.dpatch b/debian/patches/fix_pkg-config_paths
old mode 100755
new mode 100644
similarity index 64%
rename from debian/patches/fix_pkg-config_paths.dpatch
rename to debian/patches/fix_pkg-config_paths
index f115694..26546d7
--- a/debian/patches/fix_pkg-config_paths.dpatch
+++ b/debian/patches/fix_pkg-config_paths
@@ -5,9 +5,10 @@
 ## DP: Alter pkgconfig file to match Debian-specific location for library
 
 @DPATCH@
-diff -urNad webkit-sharp-0.2~/sources/webkit-sharp.pc.in webkit-sharp-0.2/sources/webkit-sharp.pc.in
---- webkit-sharp-0.2~/sources/webkit-sharp.pc.in	2008-06-12 00:05:19.000000000 +0200
-+++ webkit-sharp-0.2/sources/webkit-sharp.pc.in	2008-06-15 18:07:36.000000000 +0200
+Index: webkit-sharp/sources/webkit-sharp.pc.in
+===================================================================
+--- webkit-sharp.orig/sources/webkit-sharp.pc.in	2011-07-15 10:26:55.222079455 +0100
++++ webkit-sharp/sources/webkit-sharp.pc.in	2011-07-15 10:26:57.070007171 +0100
 @@ -6,4 +6,4 @@
  Description: @ASSEMBLY_DESCRIPTION@
  Version: @VERSION@
diff --git a/debian/patches/00list b/debian/patches/series
similarity index 100%
rename from debian/patches/00list
rename to debian/patches/series
diff --git a/debian/rules b/debian/rules
index e7a0084..aeda3c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,8 @@ DEB_CLI_ABI_VERSION = 1.1
 DEB_CLI_API_VERSION = 0.3
 
 include /usr/share/cli-common/cli.make
-include /usr/share/dpatch/dpatch.make
 
-build: patch-stamp
+build: 
 	dh $@ --before configure
 	./configure CSC=/usr/bin/mono-csc --prefix=/usr
 	dh $@ --after configure
@@ -26,11 +25,9 @@ binary-indep: install
 	dh_makeclilibs -i -m $(DEB_CLI_API_VERSION)
 	dh $@ --after dh_makeclilibs
 
-clean: unpatch
-	dh $@
 
 %:
-	dh $@
+	dh $@ --with quilt
 
 BASE_NAME = webkit-sharp
 TARBALL_NAME = $(BASE_NAME).tar.gz

-- 
webkit-sharp

