[SCM] collaborative maintenance of the dopewars package branch, master, updated. debian/1.5.12-9-3-gccffa90

[Francois Marier]

The following commit has been merged in the master branch:
commit ccffa90184da1b30133c52faae8dd0ea237aaa36
Author: Francois Marier <francois at debian.org>
Date:   Thu Feb 11 09:30:01 2010 +1300

    Switch to 3.0 (quilt) source format
    
    * Switch to 3.0 (quilt) source format
    * Remove dpatch
    * Convert patches to DEP-3

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 3aa44a1..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,8 +0,0 @@
-README.source
--------------
-
- The Debian package uses dpatch(1) for the modifications of the upstream source.
- If you want to change something it is best to use the quilt approach as documented
- in /usr/share/doc/dpatch/README.source.gz
-
- -- Francois Marier <francois at debian.org>  Sat, 07 Nov 2009 16:47:18 +1300
diff --git a/debian/changelog b/debian/changelog
index 2db7911..7a545e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,11 @@ dopewars (1.5.12-10) unstable; urgency=low
   * Bump Standards-Version to 3.8.4
   * Add dependency on ${misc:Depends}
 
- -- Francois Marier <francois at debian.org>  Thu, 11 Feb 2010 09:08:59 +1300
+  * Switch to 3.0 (quilt) source format
+  * Remove dpatch
+  * Convert patches to DEP-3
+
+ -- Francois Marier <francois at debian.org>  Thu, 11 Feb 2010 09:28:22 +1300
 
 dopewars (1.5.12-9) unstable; urgency=high
 
diff --git a/debian/control b/debian/control
index 0f27d73..a74c9fc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: dopewars
 Section: games
 Priority: extra
-Build-Depends: libgtk2.0-dev, libglib2.0-dev, pkg-config, libncurses5-dev, debhelper (>= 7), libsdl1.2-dev, libesd0-dev, autotools-dev, libaudiofile-dev, chrpath, dpatch
+Build-Depends: libgtk2.0-dev, libglib2.0-dev, pkg-config, libncurses5-dev, debhelper (>= 7), libsdl1.2-dev, libesd0-dev, autotools-dev, libaudiofile-dev, chrpath
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Francois Marier <francois at debian.org>
 Standards-Version: 3.8.4
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1054b9e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-buy_sell_quantities.dpatch
-CVE-2009-3591.dpatch
diff --git a/debian/patches/CVE-2009-3591.dpatch b/debian/patches/CVE-2009-3591.patch
similarity index 62%
rename from debian/patches/CVE-2009-3591.dpatch
rename to debian/patches/CVE-2009-3591.patch
index 3094350..5f7897d 100755
--- a/debian/patches/CVE-2009-3591.dpatch
+++ b/debian/patches/CVE-2009-3591.patch
@@ -1,10 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## CVE-2009-3591.dpatch by Francois Marier <francois at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: http://dopewars.svn.sourceforge.net/viewvc/dopewars/dopewars/trunk/src/serverside.c?r1=1023&r2=1033&pathrev=1033
+Author: Ben Webb <benwebb at users.sf.net>
+Description: Fix for a Denial of Service against the server
+Origin: upstream, http://dopewars.svn.sourceforge.net/viewvc/dopewars/dopewars/trunk/src/serverside.c?r1=1023&r2=1033&pathrev=1033
+Bug-Debian: http://bugs.debian.org/550913
 
- at DPATCH@
 --- a/src/serverside.c	2008/08/20 16:33:30	1023
 +++ b/src/serverside.c	2009/10/05 04:11:32	1033
 @@ -504,6 +504,12 @@
diff --git a/debian/patches/buy_sell_quantities.dpatch b/debian/patches/buy_sell_quantities.patch
similarity index 80%
rename from debian/patches/buy_sell_quantities.dpatch
rename to debian/patches/buy_sell_quantities.patch
index 752569c..cec5188 100755
--- a/debian/patches/buy_sell_quantities.dpatch
+++ b/debian/patches/buy_sell_quantities.patch
@@ -1,10 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## buy_sell_quantities.dpatch by Francois Marier <francois at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: http://sourceforge.net/tracker/?func=detail&aid=2787591&group_id=11128&atid=111128
+Author: Francois Marier <francois at debian.org>
+Description: Fix buy/sell quantity selectors
+Bug: http://sourceforge.net/tracker/?func=detail&aid=2787591&group_id=11128&atid=111128
+Bug-Debian: http://bugs.debian.org/526235
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/dopewars/+bug/372498
 
- at DPATCH@
 --- a/src/gui_client/gtk_client.c
 +++ b/src/gui_client/gtk_client.c
 @@ -1570,8 +1570,8 @@ static void UpdateDealDialog(void)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6ac70ac
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+buy_sell_quantities.patch
+CVE-2009-3591.patch
diff --git a/debian/rules b/debian/rules
index 61ec256..643ac96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,6 @@
 
 export SED=sed # work-around for broken libtool
 
-include /usr/share/dpatch/dpatch.make
-
 # Stuff taken from autotools-dev
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -28,8 +26,7 @@ build-stamp:
 
 	touch build-stamp
 
-clean: clean1 unpatch
-clean1:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -47,7 +44,7 @@ clean1:
 	-test -r /usr/share/misc/config.guess && \
 		cp -f /usr/share/misc/config.guess config.guess
 
-install: patch-stamp build
+install: build
 	dh_testdir
 	dh_testroot
 	dh_prep
@@ -91,4 +88,4 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean1
+.PHONY: build clean binary-indep binary-arch binary install
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)

-- 
collaborative maintenance of the dopewars package