[Pkg-wmaker-commits] [wmsun] 18/73: Imported Debian patch 1.03+1-2

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmsun.

commit acfeb8219a2a6863b91b4d4962425069d2127683
Author: Denis Briand <denis at narcan.fr>
Date:   Sun Mar 14 18:02:23 2010 +0100

    Imported Debian patch 1.03+1-2
---
 debian/README.source | 58 ----------------------------------------------------
 debian/changelog     |  8 ++++++++
 debian/control       |  6 +++---
 debian/rules         | 12 ++---------
 debian/source/format |  1 +
 5 files changed, 14 insertions(+), 71 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 5dde0bf..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,58 +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
-                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/changelog b/debian/changelog
index b219d47..eb0aee9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wmsun (1.03+1-2) unstable; urgency=low
+
+  * Bump standards version to 3.8.4.
+  * Switch to dpkg-source 3.0 (quilt) format.
+  * Add ${misc:Depends} to the binary dependencies.
+
+ -- Denis Briand <denis at narcan.fr>  Sun, 14 Mar 2010 18:02:23 +0100
+
 wmsun (1.03+1-1) unstable; urgency=low
 
   * Use a clean upstream sources tarball.
diff --git a/debian/control b/debian/control
index a4d6a7e..6027f36 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: x11
 Priority: optional
 Maintainer: Denis Briand <denis at narcan.fr>
 DM-Upload-Allowed: yes
-Build-Depends: libx11-dev, libxext-dev, libxpm-dev, quilt (>= 0.46-7~), debhelper (>= 7)
-Standards-Version: 3.8.3
+Build-Depends: libx11-dev, libxext-dev, libxpm-dev, debhelper (>= 7)
+Standards-Version: 3.8.4
 
 Package: wmsun
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: wmmoonclock, wmaker | afterstep
 Description: Dockable WindowMaker SunRise/SunSet App
  wmSun displays the current day's Sun Rise and Set Times. You have to
diff --git a/debian/rules b/debian/rules
index 7e85a25..094546a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,22 +8,14 @@ else
 endif
 export CFLAGS
 
-clean: unpatch
+clean:
 	dh_testdir
 	[ ! -f wmSun/Makefile ] || $(MAKE) -C wmSun clean
 	dh_clean
 	rm -f build-stamp
 
-patch: patch-stamp
-patch-stamp:
-	dh_quilt_patch
-	touch patch-stamp
-
-unpatch:
-	dh_quilt_unpatch
-
 build:  build-stamp
-build-stamp: patch
+build-stamp:
 	dh_testdir
 	$(MAKE) -C wmSun
 	touch build-stamp
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmsun.git