r15855 - in packages/trunk/liquidwar/debian: . patches source

Sun Aug 21 13:37:34 UTC 2016

Author: apo
Date: 2016-08-21 13:37:34 +0000 (Sun, 21 Aug 2016)
New Revision: 15855

Added:
   packages/trunk/liquidwar/debian/patches/man-page-has-errors.patch
   packages/trunk/liquidwar/debian/source/
   packages/trunk/liquidwar/debian/source/format
Modified:
   packages/trunk/liquidwar/debian/changelog
   packages/trunk/liquidwar/debian/compat
   packages/trunk/liquidwar/debian/control
   packages/trunk/liquidwar/debian/copyright
   packages/trunk/liquidwar/debian/liquidwar-data.install
   packages/trunk/liquidwar/debian/liquidwar.dirs
   packages/trunk/liquidwar/debian/patches/010_doc.diff
   packages/trunk/liquidwar/debian/patches/020_misc.diff
   packages/trunk/liquidwar/debian/patches/030_desktop.diff
   packages/trunk/liquidwar/debian/patches/040_nostrip.diff
   packages/trunk/liquidwar/debian/patches/050_binutils-gold.diff
   packages/trunk/liquidwar/debian/patches/series
   packages/trunk/liquidwar/debian/rules
Log:
Release liquidwar 5.6.4-5



Modified: packages/trunk/liquidwar/debian/changelog
===================================================================

--- packages/trunk/liquidwar/debian/changelog	2016-08-21 05:59:41 UTC (rev 15854)
+++ packages/trunk/liquidwar/debian/changelog	2016-08-21 13:37:34 UTC (rev 15855)
@@ -1,3 +1,17 @@
+liquidwar (5.6.4-5) unstable; urgency=medium
+
+  * Team upload.
+  * Use compat level 9 and require debhelper >= 9.
+  * wrap-and-sort -sa.
+  * Switch to source format 3.0 (quilt).
+  * Declare compliance with Debian Policy 3.9.8.
+  * Vcs-Browser: Use https.
+  * Build-depend on liballegro4-dev instead of virtual liballegro4.2-dev.
+    (Closes: #831436)
+  * Add man-page-has-errors.patch and fix errors in liquidwar-server manpage.
+
+ -- Markus Koschany <apo at debian.org>  Sun, 21 Aug 2016 15:23:04 +0200
+
 liquidwar (5.6.4-4) unstable; urgency=low
 
   * Team upload.

Modified: packages/trunk/liquidwar/debian/compat
===================================================================
--- packages/trunk/liquidwar/debian/compat	2016-08-21 05:59:41 UTC (rev 15854)
+++ packages/trunk/liquidwar/debian/compat	2016-08-21 13:37:34 UTC (rev 15855)
@@ -1 +1 @@
-5
+9

Modified: packages/trunk/liquidwar/debian/control
===================================================================
--- packages/trunk/liquidwar/debian/control	2016-08-21 05:59:41 UTC (rev 15854)
+++ packages/trunk/liquidwar/debian/control	2016-08-21 13:37:34 UTC (rev 15855)
@@ -2,50 +2,64 @@
 Section: games
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Barry deFreese <bdefreese at debian.org>, Eduard Bloch <blade at debian.org>
-Build-Depends: liballegro4.2-dev, debhelper (>= 5), autotools-dev, quilt, python (>= 2.4)
-Standards-Version: 3.8.2
+Uploaders:
+ Barry deFreese <bdefreese at debian.org>,
+ Eduard Bloch <blade at debian.org>
+Build-Depends:
+ autotools-dev,
+ debhelper (>= 9),
+ liballegro4-dev,
+ python (>= 2.4),
+ quilt
+Standards-Version: 3.9.8
 Homepage: http://www.ufoot.org/liquidwar/v5
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/liquidwar/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/liquidwar/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/liquidwar/
 
 Package: liquidwar
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, liquidwar-data (= ${source:Version}),
- liquidwar-server (= ${binary:Version})
+Depends:
+ liquidwar-data (= ${source:Version}),
+ liquidwar-server (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: truly original multiplayer wargame
  Liquid War is an original multiplayer wargame. There are no weapons, the only
  thing you have to do is to move a cursor in a 2-D battlefield. This cursor is
- followed by your army, which is composed by a  great many little fighters, 
+ followed by your army, which is composed by a  great many little fighters,
  represented by small colored squares. When fighters from different teams meet,
  they eat each other, it is as simple as that.
  .
- A single player mode is available, but the game is definitely designed to be 
+ A single player mode is available, but the game is definitely designed to be
  multiplayer, and has network support.
- 
+
 Package: liquidwar-data
 Architecture: all
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends}
 Description: data files for Liquid War
  Liquid War is an original multiplayer wargame. There are no weapons, the only
  thing you have to do is to move a cursor in a 2-D battlefield. This cursor is
- followed by your army, which is composed by a  great many little fighters, 
+ followed by your army, which is composed by a  great many little fighters,
  represented by small colored squares. When fighters from different teams meet,
  they eat each other, it is as simple as that.
  .
- This package holds the data files necessary to play Liquid War, an original 
+ This package holds the data files necessary to play Liquid War, an original
  multiplayer wargame.
 
 Package: liquidwar-server
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: liquidwar (<< 5.6.2-2)
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Replaces:
+ liquidwar (<< 5.6.2-2)
 Description: Liquid War server
  Liquid War is an original multiplayer wargame. There are no weapons, the only
  thing you have to do is to move a cursor in a 2-D battlefield. This cursor is
- followed by your army, which is composed by a  great many little fighters, 
+ followed by your army, which is composed by a  great many little fighters,
  represented by small colored squares. When fighters from different teams meet,
  they eat each other, it is as simple as that.
  .
- Liquid War is an original multiplayer wargame. This package contains the 
+ Liquid War is an original multiplayer wargame. This package contains the
  server for Liquid War game.

Modified: packages/trunk/liquidwar/debian/copyright
===================================================================
--- packages/trunk/liquidwar/debian/copyright	2016-08-21 05:59:41 UTC (rev 15854)
+++ packages/trunk/liquidwar/debian/copyright	2016-08-21 13:37:34 UTC (rev 15855)
@@ -9,9 +9,9 @@
 utils/snprintf/snprintf.c: Copyright 1999 Mark Martinec
 utils/lwmapgen/*: Copyright 2003 David Redick, Chris Guirl, Christian Mauduit
 All others: Copyright 1998-2007 Christian Mauduit
- 
-License: 
 
+License:
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -26,5 +26,5 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-On Debian systems, the complete text of the GNU General Public License 
-can be found in /usr/share/common-licenses/GPL
+On Debian systems, the complete text of the GNU General Public License
+can be found in /usr/share/common-licenses/GPL-2

Modified: packages/trunk/liquidwar/debian/liquidwar-data.install
===================================================================
--- packages/trunk/liquidwar/debian/liquidwar-data.install	2016-08-21 05:59:41 UTC (rev 15854)
+++ packages/trunk/liquidwar/debian/liquidwar-data.install	2016-08-21 13:37:34 UTC (rev 15855)
@@ -1,2 +1,2 @@
-usr/share/games			usr/share/
-usr/share/doc/liquidwar/html	usr/share/doc/liquidwar-data/
+usr/share/doc/liquidwar/html    usr/share/doc/liquidwar-data/
+usr/share/games                 usr/share/

Modified: packages/trunk/liquidwar/debian/liquidwar.dirs
===================================================================
--- packages/trunk/liquidwar/debian/liquidwar.dirs	2016-08-21 05:59:41 UTC (rev 15854)
+++ packages/trunk/liquidwar/debian/liquidwar.dirs	2016-08-21 13:37:34 UTC (rev 15855)
@@ -1,4 +1,4 @@
 usr/games
+usr/share/applications
 usr/share/doc
 usr/share/pixmaps
-usr/share/applications

Modified: packages/trunk/liquidwar/debian/patches/010_doc.diff
===================================================================
--- packages/trunk/liquidwar/debian/patches/010_doc.diff	2016-08-21 05:59:41 UTC (rev 15854)
+++ packages/trunk/liquidwar/debian/patches/010_doc.diff	2016-08-21 13:37:34 UTC (rev 15855)
@@ -1,8 +1,17 @@
-Index: liquidwar-5.6.4/doc/html/index.html.in
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sat, 20 Aug 2016 03:03:34 +0200
+Subject: _doc
+
 ===================================================================
---- liquidwar-5.6.4.orig/doc/html/index.html.in	2008-09-16 19:39:58.000000000 -0400
-+++ liquidwar-5.6.4/doc/html/index.html.in	2008-09-16 19:40:19.000000000 -0400
-@@ -17,8 +17,6 @@
+---
+ doc/html/index.html.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/doc/html/index.html.in b/doc/html/index.html.in
+index 60ca662..3a67d34 100644
+--- a/doc/html/index.html.in
++++ b/doc/html/index.html.in
+@@ -17,8 +17,6 @@ should help you to understand and use Liquid War.
  It is also available:
  <UL>
  <LI>Online, on <A HREF="http://www.ufoot.org/liquidwar/v5">www.ufoot.org/liquidwar/v5</A>.

Modified: packages/trunk/liquidwar/debian/patches/020_misc.diff
===================================================================
--- packages/trunk/liquidwar/debian/patches/020_misc.diff	2016-08-21 05:59:41 UTC (rev 15854)
+++ packages/trunk/liquidwar/debian/patches/020_misc.diff	2016-08-21 13:37:34 UTC (rev 15855)
@@ -1,6 +1,15 @@
-diff -Nur liquidwar-5.6.3.orig/misc/liquidwar_32x32.xpm liquidwar-5.6.3/misc/liquidwar_32x32.xpm
---- liquidwar-5.6.3.orig/misc/liquidwar_32x32.xpm	2005-11-27 21:09:56.000000000 +0100
-+++ liquidwar-5.6.3/misc/liquidwar_32x32.xpm	2006-10-26 01:00:17.000000000 +0200
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sat, 20 Aug 2016 03:03:34 +0200
+Subject: _misc
+
+---
+ misc/liquidwar_32x32.xpm | 425 ++++++-----------------------------------------
+ 1 file changed, 47 insertions(+), 378 deletions(-)
+
+diff --git a/misc/liquidwar_32x32.xpm b/misc/liquidwar_32x32.xpm
+index 7c57dc9..6070e5b 100644
+--- a/misc/liquidwar_32x32.xpm
++++ b/misc/liquidwar_32x32.xpm
 @@ -1,380 +1,49 @@
  /* XPM */
  static char * liquidwar_32x32_xpm[] = {

Modified: packages/trunk/liquidwar/debian/patches/030_desktop.diff
===================================================================
--- packages/trunk/liquidwar/debian/patches/030_desktop.diff	2016-08-21 05:59:41 UTC (rev 15854)
+++ packages/trunk/liquidwar/debian/patches/030_desktop.diff	2016-08-21 13:37:34 UTC (rev 15855)
@@ -1,7 +1,16 @@
-Index: liquidwar-5.6.4/misc/liquidwar.desktop
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sat, 20 Aug 2016 03:03:34 +0200
+Subject: _desktop
+
 ===================================================================
---- liquidwar-5.6.4.orig/misc/liquidwar.desktop	2008-09-16 19:42:05.000000000 -0400
-+++ liquidwar-5.6.4/misc/liquidwar.desktop	2008-09-16 19:48:50.000000000 -0400
+---
+ misc/liquidwar.desktop | 15 +++------------
+ 1 file changed, 3 insertions(+), 12 deletions(-)
+
+diff --git a/misc/liquidwar.desktop b/misc/liquidwar.desktop
+index 08c89f6..e05215f 100644
+--- a/misc/liquidwar.desktop
++++ b/misc/liquidwar.desktop
 @@ -1,19 +1,10 @@
  [Desktop Entry]
 +Type=Application

Modified: packages/trunk/liquidwar/debian/patches/040_nostrip.diff
===================================================================
--- packages/trunk/liquidwar/debian/patches/040_nostrip.diff	2016-08-21 05:59:41 UTC (rev 15854)
+++ packages/trunk/liquidwar/debian/patches/040_nostrip.diff	2016-08-21 13:37:34 UTC (rev 15855)
@@ -1,8 +1,17 @@
-Index: liquidwar-5.6.4/Makefile.in
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sat, 20 Aug 2016 03:03:35 +0200
+Subject: _nostrip
+
 ===================================================================
---- liquidwar-5.6.4.orig/Makefile.in	2008-09-16 22:45:43.000000000 -0400
-+++ liquidwar-5.6.4/Makefile.in	2008-09-16 22:50:49.000000000 -0400
-@@ -109,9 +109,9 @@
+---
+ Makefile.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index d2beb28..9898541 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -109,9 +109,9 @@ install_nolink: install_bin install_data install_custom_map install_custom_textu
  install_bin: src/liquidwar src/liquidwar-server src/liquidwar-mapgen
  	@echo "Installing liquidwar binaries in $(GAMEDIR)."
  	@install -d $(DESTDIR)$(GAMEDIR)

Modified: packages/trunk/liquidwar/debian/patches/050_binutils-gold.diff
===================================================================
--- packages/trunk/liquidwar/debian/patches/050_binutils-gold.diff	2016-08-21 05:59:41 UTC (rev 15854)
+++ packages/trunk/liquidwar/debian/patches/050_binutils-gold.diff	2016-08-21 13:37:34 UTC (rev 15855)
@@ -1,6 +1,16 @@
---- liquidwar-5.6.4.orig/src/Makefile.in
-+++ liquidwar-5.6.4/src/Makefile.in
-@@ -250,7 +250,7 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sat, 20 Aug 2016 03:03:35 +0200
+Subject: _binutils-gold
+
+---
+ src/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index e3a84b8..3df0421 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -250,7 +250,7 @@ liquidwar-server: $(OBJ_FILES_SRV)
  
  liquidwar-mapgen: $(OBJ_FILES_MAPGEN)
  	@echo "Linking $@ (target=$(TARGET), debug=$(DEBUG), static=$(STATIC))"

Added: packages/trunk/liquidwar/debian/patches/man-page-has-errors.patch
===================================================================
--- packages/trunk/liquidwar/debian/patches/man-page-has-errors.patch	                        (rev 0)
+++ packages/trunk/liquidwar/debian/patches/man-page-has-errors.patch	2016-08-21 13:37:34 UTC (rev 15855)
@@ -0,0 +1,38 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 20 Aug 2016 04:48:16 +0200
+Subject: man page has errors
+
+---
+ doc/xml/bugs.xml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/doc/xml/bugs.xml b/doc/xml/bugs.xml
+index 478710d..7a768cd 100644
+--- a/doc/xml/bugs.xml
++++ b/doc/xml/bugs.xml
+@@ -154,7 +154,7 @@
+     </part>
+     <part title="Hack Allegro...">
+       <text>
+-	...to implement wavetable midi on OSS :-)
++	to implement wavetable midi on OSS :-)
+       </text>
+       <text>
+ 	and for the rest of us...
+@@ -162,14 +162,14 @@
+     </part>
+     <part title="Use Allegro's DIGMID midi driver...">
+       <text>
+-	...which creates audio from MIDI using a set of patches 
++	which creates audio from MIDI using a set of patches 
+ 	(more info here: "http://www.talula.demon.co.uk/allegro/digmid.html") 
+ 	and plays back through your sound card's audio.
+       </text>
+     </part>
+     <part title="Get an FM driver up and running..."> 
+       <text>
+-	...Which is comprised of the following steps:
++	Which is comprised of the following steps:
+       </text>
+       <list>
+ 	<elem>

Modified: packages/trunk/liquidwar/debian/patches/series
===================================================================
--- packages/trunk/liquidwar/debian/patches/series	2016-08-21 05:59:41 UTC (rev 15854)
+++ packages/trunk/liquidwar/debian/patches/series	2016-08-21 13:37:34 UTC (rev 15855)
@@ -1,5 +1,6 @@
-010_doc.diff -p1
-020_misc.diff -p1
+010_doc.diff
+020_misc.diff
 030_desktop.diff
 040_nostrip.diff
 050_binutils-gold.diff
+man-page-has-errors.patch

Modified: packages/trunk/liquidwar/debian/rules
===================================================================
--- packages/trunk/liquidwar/debian/rules	2016-08-21 05:59:41 UTC (rev 15854)
+++ packages/trunk/liquidwar/debian/rules	2016-08-21 13:37:34 UTC (rev 15855)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode. 
+# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # This has to be exported to make some magic below work.
@@ -33,7 +33,7 @@
 configure: configure-stamp
 configure-stamp: autotools
 	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	dh_quilt_patch
 	./configure $(confflags) \
 	--prefix=/usr --mandir=\$${prefix}/share/man \
 	--infodir=\$${prefix}/share/info \
@@ -51,13 +51,12 @@
 	-rm -f config.sub config.guess
 	ln -s /usr/share/misc/config.sub config.sub
 	ln -s /usr/share/misc/config.guess config.guess
-	
+
 	touch autotools
 
 build-indep: build-indep-stamp
 build-indep-stamp: configure
 	dh_testdir -i
-
 	$(MAKE) build_data
 	cd doc; make html_yes
 
@@ -77,9 +76,9 @@
 clean:
 	dh_testdir
 	dh_testroot
-	
+
 	[ ! -f Makefile ] || $(MAKE) distclean
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	dh_quilt_unpatch
 
 	rm -f build-arch-stamp build-indep-stamp configure-stamp autotools
 	rm -f config.sub config.guess
@@ -91,17 +90,17 @@
 install-indep: build-indep
 	dh_testdir -i
 	dh_testroot -i
-	dh_clean -i -k
+	dh_prep -i
 	dh_installdirs -i
-	
+
 	$(MAKE) install_nolink DESTDIR=$(CURDIR)/debian/tmp
 
 install-arch: build-arch
 	dh_testdir -i
 	dh_testroot -i
-	dh_clean -k
+	dh_prep
 	dh_installdirs
-	
+
 	$(MAKE) install_bin install_doc DESTDIR=$(CURDIR)/debian/tmp
 
 install: install-indep install-arch

Added: packages/trunk/liquidwar/debian/source/format
===================================================================
--- packages/trunk/liquidwar/debian/source/format	                        (rev 0)
+++ packages/trunk/liquidwar/debian/source/format	2016-08-21 13:37:34 UTC (rev 15855)
@@ -0,0 +1 @@
+3.0 (quilt)


