[Pkg-cli-apps-commits] [SCM] podsleuth branch, master, updated. debian/0.6.5-2-4-g41886df

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 41886dfe47ea47a832c31e7178760d5b3e4cec2e
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Wed Jan 27 13:19:02 2010 +0800

    Get rid of quilt things
    
    * debian/rules, debian/control:
      + Get rid of quilt things, since we no longer have patches

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 8646078..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,57 +0,0 @@
-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
-        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/changelog b/debian/changelog
index 63168d2..6a8f87e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,11 @@ podsleuth (0.6.6-1) UNRELEASED; urgency=low
   * New upstream release
   * debian/patches/*:
     + Drop all patches, applied upstream already
-  * debian/rules:
+  * debian/rules, debian/control, debian/README.source:
     + Specify D-Bus system.d directory (/etc/dbus-1/system.d)
+    + Get rid of quilt things, since we no longer have patches
 
- -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 27 Jan 2010 13:12:23 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 27 Jan 2010 13:19:14 +0800
 
 podsleuth (0.6.5-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 59025a4..f88ee85 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.
 Uploaders: Sebastian Dröge <slomo at debian.org>,
            Chow Loong Jin <hyperair at ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50),
-               quilt (>= 0.46-7~),
                cli-common-dev (>= 0.5.7),
                autoconf (>= 2.13),
                automake (>= 1.9),
diff --git a/debian/rules b/debian/rules
index 3cdc592..4c9e430 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/cli-common/cli.make
-include /usr/share/quilt/quilt.make
 
 override_dh_auto_configure:
 	autoreconf -vfi -I m4
@@ -12,9 +11,9 @@ override_dh_auto_configure:
 
 clean:
 	[ ! -f Makefile ] || $(MAKE) maintainer-clean
-	dh --with=quilt $@
+	dh $@
 
 %:
-	dh --with=quilt $@
+	dh $@
 
 .PHONY: clean

-- 
podsleuth