[SCM] Debian packaging of wesnoth branch, devel, updated. debian/1.9.8-1-3-g9f65c77

[Gerfried Fuchs]

The following commit has been merged in the devel branch:
commit 956d14844e9193339b2b2081775cf856063fc908
Author: Gerfried Fuchs <rhonda at debian.org>
Date:   Mon Sep 5 14:15:27 2011 +0200

    Switch to source format 3.0 (quilt).

diff --git a/debian/README.source b/debian/README.source
index 8fb4885..56540d9 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -8,18 +8,6 @@ file also require the same change in the corresponding *.in file.
 
 --------------------------------------------------------------------------
 
- Upstream ships their tarballs as .tar.bz2 files - which the Debian pool
-unfortunately doesn't like (yet). All I do with them is piping them
-through bzcat and gzip, like this for e.g. the 1.4.3 release:
-
-bzcat wesnoth-1.4.3.tar.bz2 | gzip > wesnoth-1.4_1.4.3.orig.tar.gz
-
- PLEASE NOTICE that the branch version is part of the source package
-name now, that is, wesnoth-1.4 as package name derived from the upstream
-version 1.4.3.
-
---------------------------------------------------------------------------
-
  If one wants to switch and upgrade to a new branch (like, from
 1.X.something 1.Y.something) several things need to be done:
 
@@ -27,3 +15,6 @@ version 1.4.3.
 
 -) Call "sh debian/branchcheck" to generate the rest of the files
 automatically.
+
+-) Get rid of the files that carry the old branchname below the debian
+   subdirectory.
diff --git a/debian/changelog b/debian/changelog
index c585aa0..5a33b9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 wesnoth-1.9 (1:1.9.9-1) unstable; urgency=low
 
   * New upstream devel release.
+  * Switch to source format 3.0 (quilt).  Adjust debian/README.source,
+    debian/rules and debian/control* for that change.
 
  -- 
 
diff --git a/debian/control b/debian/control
index 568ad1f..e736e9e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: wesnoth-1.9
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7), quilt, libsdl-image1.2-dev, libfreetype6-dev,
+Build-Depends: debhelper (>= 7), libsdl-image1.2-dev, libfreetype6-dev,
   libsdl-mixer1.2-dev, libsdl-net1.2-dev, libfribidi-dev, libsdl1.2-dev,
   libsdl-ttf2.0-dev (>= 2.0.8), python-support, libdbus-1-dev,
   libboost-iostreams-dev, libboost-test-dev, libboost-regex-dev,
diff --git a/debian/control.in b/debian/control.in
index cd97b5f..6e17107 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,7 +2,7 @@ Source: wesnoth-BRANCH
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7), quilt, libsdl-image1.2-dev, libfreetype6-dev,
+Build-Depends: debhelper (>= 7), libsdl-image1.2-dev, libfreetype6-dev,
   libsdl-mixer1.2-dev, libsdl-net1.2-dev, libfribidi-dev, libsdl1.2-dev,
   libsdl-ttf2.0-dev (>= 2.0.8), python-support, libdbus-1-dev,
   libboost-iostreams-dev, libboost-test-dev, libboost-regex-dev,
diff --git a/debian/rules b/debian/rules
index 9842e53..d32d4ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,13 +56,11 @@ clean:
 	rm -f debian/stamp-*
 	# Add here commands to clean up after the build process.
 	rm -rf build locale # locale doesn't get generated inside build ...
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean
 
 
 configure: debian/stamp-configure
 debian/stamp-configure:
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
 	mkdir -p build
 	cd build && \
 		cmake .. $(CMAKE_SWITCHES)
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)

-- 
Debian packaging of wesnoth