r2388 - in packages/trunk/wormux/debian: . patches

[Jean Parpaillon]

Author: artefact-guest
Date: 2007-02-09 19:50:56 +0100 (Fri, 09 Feb 2007)
New Revision: 2388

Added:
   packages/trunk/wormux/debian/patches/
   packages/trunk/wormux/debian/patches/000_disable_autopackage.patch
Removed:
   packages/trunk/wormux/debian/wormux-data.links
Modified:
   packages/trunk/wormux/debian/changelog
   packages/trunk/wormux/debian/rules
   packages/trunk/wormux/debian/wormux-data.install
Log:
[wormux]
  Disable USE_AUTOPACKAGE
  Add music datas



Modified: packages/trunk/wormux/debian/changelog
===================================================================
--- packages/trunk/wormux/debian/changelog	2007-02-09 14:42:22 UTC (rev 2387)
+++ packages/trunk/wormux/debian/changelog	2007-02-09 18:50:56 UTC (rev 2388)
@@ -1,16 +1,15 @@
-wormux (0.7.9-2) UNRELEASED; urgency=high
+wormux (0.7.9-2) unstable; urgency=high
 
+  [ Eddy Petrișor ]
   * urgency high since it fixes a serious bug (even if it doesn't matter since
     we're in freeze)
-  * move the DejaVu-Sans.ttf file out of the data source directory before
-    configure so is not accounted as a file in the target and place it back
-    before clean; this way /usr/share/games/wormux/font/DejaVuSans.ttf should
-    no longer be searched for (unfortunately, it still does :-( )
-  * install also a symlink where the game searches the font as a temporary
-    workaround until I pin the origin of problem (Closes: #410272)
 
- -- Eddy Petrișor <eddy.petrisor at gmail.com>  Fri,  9 Feb 2007 16:33:40 +0200
+  [ Jean Parpaillon (artefact) ]
+  * Disable autopackage and load correct font file (Closes: #410272)
+  * Add music in wormux-data
 
+ -- Jean Parpaillon (artefact) <artefact at altern.org>  Fri,  9 Feb 2007 18:13:14 +0100
+
 wormux (0.7.9-1) unstable; urgency=low
 
   [ Eddy Petrișor ]

Added: packages/trunk/wormux/debian/patches/000_disable_autopackage.patch
===================================================================
--- packages/trunk/wormux/debian/patches/000_disable_autopackage.patch	2007-02-09 14:42:22 UTC (rev 2387)
+++ packages/trunk/wormux/debian/patches/000_disable_autopackage.patch	2007-02-09 18:50:56 UTC (rev 2388)
@@ -0,0 +1,12 @@
+diff -Npur a/src/game/config.cpp b/src/game/config.cpp
+--- a/src/game/config.cpp	2007-01-28 15:03:47.000000000 +0100
++++ b/src/game/config.cpp	2007-02-09 18:06:40.946582336 +0100
+@@ -23,8 +23,6 @@
+ 
+ #include "config.h"
+ 
+-#define USE_AUTOPACKAGE
+-
+ #include <sstream>
+ #include <string>
+ #include <iostream>

Modified: packages/trunk/wormux/debian/rules
===================================================================
--- packages/trunk/wormux/debian/rules	2007-02-09 14:42:22 UTC (rev 2387)
+++ packages/trunk/wormux/debian/rules	2007-02-09 18:50:56 UTC (rev 2388)
@@ -5,22 +5,18 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 FONT_PATH = $(shell fc-match --verbose 'DejaVu Sans' | grep 'file:' | sed -e 's/.*file: "\(.*\)"(s)/\1/')
 DEB_CONFIGURE_EXTRA_FLAGS += --bindir=\$${prefix}/games --with-datadir-name=\$${prefix}/share/games/wormux --with-localedir-name=\$${prefix}/share/locale --with-font-path=$(FONT_PATH)
 DEB_DH_INSTALL_SOURCEDIR = debian/tmp
 
-makebuilddir::
-	# move the font out of the way not to account it
-	[ -f DejaVuSans.ttf ] || mv data/font/DejaVuSans.ttf .
-
-cleanbuilddir::
-	# move the font back
-	[ -f DejaVuSans.ttf ] && mv DejaVuSans.ttf data/font || true
-
-build/wormux-data::
+install/wormux-data::
 	mkdir -p debian/tmp/usr/share/pixmaps
 	cp debian/wormux_*.xpm debian/tmp/usr/share/pixmaps
 	mkdir -p debian/tmp/usr/share/applications
 	cp debian/wormux.desktop debian/tmp/usr/share/applications
+	rm -r debian/tmp/usr/share/games/wormux/font
+	rm debian/tmp/usr/share/games/wormux/*.xpm
+	rm debian/tmp/usr/share/games/wormux/*.svg
+	rm debian/tmp/usr/share/games/wormux/*.png

Modified: packages/trunk/wormux/debian/wormux-data.install
===================================================================
--- packages/trunk/wormux/debian/wormux-data.install	2007-02-09 14:42:22 UTC (rev 2387)
+++ packages/trunk/wormux/debian/wormux-data.install	2007-02-09 18:50:56 UTC (rev 2388)
@@ -1,12 +1,2 @@
-usr/share/games/wormux/body/
-usr/share/games/wormux/game_mode/
-usr/share/games/wormux/gfx/
-usr/share/games/wormux/interface/
-usr/share/games/wormux/map/
-usr/share/games/wormux/menu/
-usr/share/games/wormux/object/
-usr/share/games/wormux/sound/
-usr/share/games/wormux/team/
-usr/share/games/wormux/weapon/
-usr/share/games/wormux/*.xml
+usr/share/games/wormux/
 usr/share/locale/

Deleted: packages/trunk/wormux/debian/wormux-data.links
===================================================================
--- packages/trunk/wormux/debian/wormux-data.links	2007-02-09 14:42:22 UTC (rev 2387)
+++ packages/trunk/wormux/debian/wormux-data.links	2007-02-09 18:50:56 UTC (rev 2388)
@@ -1 +0,0 @@
-/var/lib/defoma/fontconfig.d/D/DejaVu-Sans.ttf usr/share/games/wormux/font/DejaVuSans.ttf