[SCM] matanza - a space ascii war game branch, master, updated. debian/0.13+ds1-1-5-g0fc6665

[Peter Pentchev]

The following commit has been merged in the master branch:
commit 2b83a116122f48ddc90c43003b6021ab8f4945ab
Author: Peter Pentchev <roam at ringlet.net>
Date:   Sun Oct 24 20:44:02 2010 +0300

    Use quilt for patch management.

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..36fa149
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,17 @@
+The matanza package uses quilt to maintain local changes
+to the matanza distribution.  The Debian-specific patches are
+maintained in the debian/patches/ directory.
+
+To apply all the patches, preparing the source for building, use:
+  debian/rules patch
+
+To revert the patches, preparing to build a source package, use:
+  debian/rules unpatch
+
+You do not need to manually execute these targets when building
+the package; they are part of the debian/rules target chain.
+
+For more information on the quilt integration with Debian packages,
+as well as editing, adding or removing patches, please see
+the quilt documentation; in recent versions of the Debian package of
+quilt, start at the /usr/share/doc/quilt/README.source file.
diff --git a/debian/changelog b/debian/changelog
index 36bdf7c..baf1b46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,11 +4,11 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low
   TODO: dpkg-buildflags
   TODO: debhelper 8
   TODO: DEP 5 copyright
-  TODO: DEP 3 patches
   TODO: Vcs-* tags
   TODO: appease lintian
 
   * New maintainer.  Closes: #442045
+  * Use quilt for patch management.
 
  -- Peter Pentchev <roam at ringlet.net>  Sun, 24 Oct 2010 18:56:37 +0300
 
diff --git a/debian/control b/debian/control
index 0eb54df..97151d9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Peter Pentchev <roam at ringlet.net>
-Build-Depends: debhelper (>= 5), autotools-dev, texlive-extra-utils, libpng12-dev
+Build-Depends: debhelper (>= 5), autotools-dev, texlive-extra-utils, libpng12-dev, quilt
 Standards-Version: 3.7.2
 Homepage: http://bachue.com/matanza/
 
diff --git a/debian/patches/01-fix-verbose-macro.patch b/debian/patches/01-fix-verbose-macro.patch
new file mode 100644
index 0000000..3c057a0
--- /dev/null
+++ b/debian/patches/01-fix-verbose-macro.patch
@@ -0,0 +1,30 @@
+Description: Fix a couple of compiler warnings.
+ - fix the definition of the VERBOSE macro to avoid many warnings
+ - fix an "array subscript is above array bounds" warning
+Forwarded: no
+Author: Frank Lichtenheld <djpig at debian.org>
+Last-Update: 2010-10-24
+
+--- a/matanza.w
++++ b/matanza.w
+@@ -6594,10 +6594,10 @@
+ 
+ @<Global variables@>=
+ #if MATANZA_VERBOSE
+-#define VERBOSE if (arg_verbose) printf
++#define VERBOSE(...) if (arg_verbose) printf(__VA_ARGS__)
+ int arg_verbose = 0;
+ #else
+-#define VERBOSE
++#define VERBOSE(...)
+ #endif
+ 
+ @
+@@ -9193,7 +9193,6 @@
+   free(mat_ship_palette[0]);
+   free(mat_ship_palette[1]);
+   free(mat_ship_palette[2]);
+-  free(mat_ship_palette[3]);
+ }
+ 
+ @
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a968180
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-fix-verbose-macro.patch
diff --git a/debian/rules b/debian/rules
index e9821cb..1fae102 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,10 @@ else
 	CFLAGS += -O2
 endif
 
+include /usr/share/quilt/quilt.make
+
 build: build-stamp
-build-stamp:
+build-stamp:	${QUILT_STAMPFN}
 	dh_testdir
 	cp -f /usr/share/misc/config.sub .
 	cp -f /usr/share/misc/config.guess .
@@ -27,6 +29,7 @@ clean:
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f matanza.c ai.c config.sub config.guess build-stamp
 	rm -f *.o
+	$(MAKE) -f debian/rules unpatch
 	dh_clean
 
 install: build
diff --git a/matanza.w b/matanza.w
index 0af23f7..fe938dc 100644
--- a/matanza.w
+++ b/matanza.w
@@ -6594,10 +6594,10 @@ then throw a lot of warnings during compilation, but will work.
 
 @<Global variables@>=
 #if MATANZA_VERBOSE
-#define VERBOSE(...) if (arg_verbose) printf(__VA_ARGS__)
+#define VERBOSE if (arg_verbose) printf
 int arg_verbose = 0;
 #else
-#define VERBOSE(...)
+#define VERBOSE
 #endif
 
 @
@@ -9193,6 +9193,7 @@ will be projected to col_min and the maximum to col_max.
   free(mat_ship_palette[0]);
   free(mat_ship_palette[1]);
   free(mat_ship_palette[2]);
+  free(mat_ship_palette[3]);
 }
 
 @

-- 
matanza - a space ascii war game