[Pkg-cli-apps-commits] [SCM] docky branch, master, updated. debian/2.0.3.1-1-6-gc51ac71

[Iain Lane]

The following commit has been merged in the master branch:
commit cddab566cc07bb440a4fa7cbf528fd3ada89dc83
Author: Iain Lane <laney at ubuntu.com>
Date:   Fri May 14 09:01:45 2010 +0100

    Add quilt patchsys

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..5dde0bf
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,58 @@
+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 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.
+
+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:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(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 remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+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 d225c9c..3cc88dc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Christopher James Halse Rogers <raof at ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50~),
+ quilt (>= 0.46-7~),
  autotools-dev,
  intltool,
  python-support (>= 0.9),
diff --git a/scripts/docky/__init__.py b/debian/patches/series
old mode 100755
new mode 100644
similarity index 100%
copy from scripts/docky/__init__.py
copy to debian/patches/series
diff --git a/debian/rules b/debian/rules
index 606c933..a055b64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
 #export DH_VERBOSE=1
 
 include /usr/share/cli-common/cli.make
+include /usr/share/quilt/quilt.make
 
 override_dh_pysupport:
 # Don't byte compile helpers — causes broken ones to also show up in prefs
@@ -24,4 +25,4 @@ override_dh_makeclilibs:
 	dh_makeclilibs -X usr/lib/docky/*
 
 %:
-	dh  $@
+	dh --with quilt $@

-- 
docky