r1334 - ! dirs' list truncated !

[Jean Parpaillon]

Author: artefact-guest
Date: 2006-08-10 15:44:58 +0000 (Thu, 10 Aug 2006)
New Revision: 1334

Modified:
   packages/branches/wormux/sarge/wormux-0.7.3/debian/changelog
   packages/branches/wormux/sarge/wormux-0.7.3/debian/control
   packages/branches/wormux/sarge/wormux-0.7.3/debian/rules
Log:
Put back ttf-dejavu dependency as it exists in backports



Modified: packages/branches/wormux/sarge/wormux-0.7.3/debian/changelog
===================================================================
--- packages/branches/wormux/sarge/wormux-0.7.3/debian/changelog	2006-08-10 15:41:05 UTC (rev 1333)
+++ packages/branches/wormux/sarge/wormux-0.7.3/debian/changelog	2006-08-10 15:44:58 UTC (rev 1334)
@@ -1,7 +1,6 @@
-wormux (0.7.3-0sarge1) unstable; urgency=low
+wormux (0.7.3-0bpo1) UNRELEASED; urgency=low
 
-  * Backport Wormux to Sarge: wormux-data includes font DejaVuSans and does not
-    depend anymore on package ttf-dejavu
+  * Backport Wormux to Sarge
 
  -- Jean Parpaillon (artefact) <artefact at altern.org>  Thu, 10 Aug 2006 11:23:19 +0200
 

Modified: packages/branches/wormux/sarge/wormux-0.7.3/debian/control
===================================================================
--- packages/branches/wormux/sarge/wormux-0.7.3/debian/control	2006-08-10 15:41:05 UTC (rev 1333)
+++ packages/branches/wormux/sarge/wormux-0.7.3/debian/control	2006-08-10 15:44:58 UTC (rev 1334)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Jean Parpaillon (artefact) <artefact at altern.org>, Eddy Petrişor <eddy.petrisor at gmail.com>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl-ttf2.0-dev, libsdl-gfx1.2-dev (>= 2.0.13), libxml++2.6-dev
-Standards-Version: 3.6.1.1
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libsdl-ttf2.0-dev, libsdl-gfx1.2-dev (>= 2.0.13), libxml++2.6-dev, fontconfig, ttf-dejavu
+Standards-Version: 3.7.2
 
 Package: wormux
 Architecture: any
@@ -25,6 +25,7 @@
 
 Package: wormux-data
 Architecture: all
+Depends: ttf-dejavu
 Recommends: wormux (>= ${Source-Version})
 Description: data files for the game wormux
  Wormux  is  a  free game where funny animals fight on a 2D map with funny

Modified: packages/branches/wormux/sarge/wormux-0.7.3/debian/rules
===================================================================
--- packages/branches/wormux/sarge/wormux-0.7.3/debian/rules	2006-08-10 15:41:05 UTC (rev 1333)
+++ packages/branches/wormux/sarge/wormux-0.7.3/debian/rules	2006-08-10 15:44:58 UTC (rev 1334)
@@ -4,7 +4,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --bindir=\$${prefix}/games --with-datadir-name=\$${prefix}/share/games/wormux --with-localedir-name=\$${prefix}/share/locale --with-font-path=\$${prefix}/share/games/wormux/font/DejaVuSans.ttf
+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
 
 build/wormux::