r15706 - packages/trunk/boswars/debian

Sun Jan 17 20:51:00 UTC 2016

Author: apo-guest
Date: 2016-01-17 20:51:00 +0000 (Sun, 17 Jan 2016)
New Revision: 15706

Modified:
   packages/trunk/boswars/debian/boswars-data.install
   packages/trunk/boswars/debian/boswars.dirs
   packages/trunk/boswars/debian/boswars.install
   packages/trunk/boswars/debian/changelog
   packages/trunk/boswars/debian/control
   packages/trunk/boswars/debian/copyright
   packages/trunk/boswars/debian/rules
Log:
Debian release 2.7+svn16010-1


Modified: packages/trunk/boswars/debian/boswars-data.install
===================================================================

--- packages/trunk/boswars/debian/boswars-data.install	2016-01-15 08:21:14 UTC (rev 15705)
+++ packages/trunk/boswars/debian/boswars-data.install	2016-01-17 20:51:00 UTC (rev 15706)
@@ -1,10 +1,10 @@
 campaigns           usr/share/games/boswars
+debian/boswars.xpm  usr/share/pixmaps
 graphics            usr/share/games/boswars
 intro               usr/share/games/boswars
 languages           usr/share/games/boswars
 maps                usr/share/games/boswars
+patches             usr/share/games/boswars
 scripts             usr/share/games/boswars
 sounds              usr/share/games/boswars
 units               usr/share/games/boswars
-patches             usr/share/games/boswars
-debian/boswars.xpm  usr/share/pixmaps

Modified: packages/trunk/boswars/debian/boswars.dirs
===================================================================
--- packages/trunk/boswars/debian/boswars.dirs	2016-01-15 08:21:14 UTC (rev 15705)
+++ packages/trunk/boswars/debian/boswars.dirs	2016-01-17 20:51:00 UTC (rev 15706)
@@ -1,3 +1,3 @@
 usr/games
+usr/share/applications
 usr/share/doc/boswars/html
-usr/share/applications

Modified: packages/trunk/boswars/debian/boswars.install
===================================================================
--- packages/trunk/boswars/debian/boswars.install	2016-01-15 08:21:14 UTC (rev 15705)
+++ packages/trunk/boswars/debian/boswars.install	2016-01-17 20:51:00 UTC (rev 15706)
@@ -1,4 +1,4 @@
 build/boswars          usr/games
-doc/*                  usr/share/doc/boswars/html
 debian/boswars.desktop usr/share/applications
 debian/boswars.png     usr/share/pixmaps
+doc/*                  usr/share/doc/boswars/html

Modified: packages/trunk/boswars/debian/changelog
===================================================================
--- packages/trunk/boswars/debian/changelog	2016-01-15 08:21:14 UTC (rev 15705)
+++ packages/trunk/boswars/debian/changelog	2016-01-17 20:51:00 UTC (rev 15706)
@@ -1,3 +1,15 @@
+boswars (2.7+svn160110-1) unstable; urgency=medium
+
+  * Team upload.
+  * Imported Upstream version 2.7+svn160110.
+    - Fixes various display issues with libpng16.
+  * wrap-and-sort -sa.
+  * Remove liblua5.1-dev from Build-Depends again.
+  * debian/rules: Convert clean target into dh_clean override and ensure the
+    package can be built twice in a row.
+
+ -- Markus Koschany <apo at debian.org>  Sun, 17 Jan 2016 21:01:53 +0100
+
 boswars (2.7-2) unstable; urgency=medium
 
   * Team upload.

Modified: packages/trunk/boswars/debian/control
===================================================================
--- packages/trunk/boswars/debian/control	2016-01-15 08:21:14 UTC (rev 15705)
+++ packages/trunk/boswars/debian/control	2016-01-17 20:51:00 UTC (rev 15706)
@@ -2,9 +2,20 @@
 Section: games
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Barry deFreese <bdefreese at debian.org>, Marc Dequènes (Duck) <Duck at DuckCorp.org>
-Build-Depends: debhelper (>= 9), scons, libpng-dev, libsdl1.2-dev, libvorbis-dev, liblua5.1-0-dev, pkg-config, libtheora-dev, liblua5.1-dev,
-Build-Depends-Indep: imagemagick
+Uploaders:
+ Barry deFreese <bdefreese at debian.org>,
+ Marc Dequènes (Duck) <Duck at DuckCorp.org>
+Build-Depends:
+ debhelper (>= 9),
+ liblua5.1-0-dev,
+ libpng-dev,
+ libsdl1.2-dev,
+ libtheora-dev,
+ libvorbis-dev,
+ pkg-config,
+ scons
+Build-Depends-Indep:
+ imagemagick
 Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/boswars/
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/boswars/
@@ -12,7 +23,10 @@
 
 Package: boswars
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, boswars-data (= ${source:Version})
+Depends:
+ boswars-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: futuristic real-time strategy game
  Bos Wars is a futuristic real-time strategy game. It is possible to play
  against human opponents over local network (LAN), internet, or against the
@@ -22,7 +36,8 @@
 
 Package: boswars-data
 Architecture: all
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends}
 Description: Images, data, and music files for Bos Wars
  This package includes the images, data files, and music for the Bos Wars
  real-time-strategy game.

Modified: packages/trunk/boswars/debian/copyright
===================================================================
--- packages/trunk/boswars/debian/copyright	2016-01-15 08:21:14 UTC (rev 15705)
+++ packages/trunk/boswars/debian/copyright	2016-01-17 20:51:00 UTC (rev 15706)
@@ -192,7 +192,7 @@
  |   units/hospital/sfx_hosp.select.wav
  |   units/medic/medic_action.wav
  |   units/medic/medic_attack.wav
- |   units/medic/medic_die.wav 
+ |   units/medic/medic_die.wav
  |   units/medic/medic.ready.wav
  |   units/medic/medic_select.wav
  |   units/medic/medic.underattack.wav
@@ -510,8 +510,8 @@
  | Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved.
  | Bitstream Vera is a trademark of Bitstream, Inc.
  |
- | Permission is hereby granted, free of charge, to any person obtaining a 
- | copy of the fonts accompanying this license ("Fonts") and associated 
+ | Permission is hereby granted, free of charge, to any person obtaining a
+ | copy of the fonts accompanying this license ("Fonts") and associated
  | documentation files (the "Font Software"), to reproduce and distribute
  | the Font Software, including without limitation the rights to use, copy,
  | merge, publish, distribute, and/or sell copies of the Font Software, and
@@ -549,7 +549,7 @@
  | otherwise to promote the sale, use or other dealings in this Font
  | Software without prior written authorization from the Gnome Foundation
  | or Bitstream Inc., respectively. For further information, contact:
- | fonts at gnome dot org. 
+ | fonts at gnome dot org.
 
 Files: debian/*
 Copyright: © 2007-2008 Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>

Modified: packages/trunk/boswars/debian/rules
===================================================================
--- packages/trunk/boswars/debian/rules	2016-01-15 08:21:14 UTC (rev 15705)
+++ packages/trunk/boswars/debian/rules	2016-01-17 20:51:00 UTC (rev 15706)
@@ -37,13 +37,15 @@
 	chmod a-x debian/boswars-data/usr/share/games/boswars/campaigns/swindler/*
 	chmod a-x debian/boswars-data/usr/share/games/boswars/maps/tokelau.map/presentation.smp
 
-clean:
+override_dh_clean:
+	dh_clean
 	scons -c
 	# Additional icon (see build-indep-stamp)
-	rm  -f debian/boswars.png
-	rm  -f debian/boswars.xpm
+	$(RM) debian/boswars.png
+	$(RM) debian/boswars.xpm
 	# Scons is stupid and leaves them behind no matter what.
-	rm  -f .sconsign.dblite
-	rm -rf .sconf_temp
-	rm  -f build_conf_cache.py build_options.py config.log
+	$(RM) .sconsign.dblite
+	$(RM) .sconf_temp
+	$(RM) build_conf_cache.py build_options.py config.log
+	$(RM) build/boswars
 


