r1982 - in packages/tags/wormux/0.7.4-2: . debian

[Eddy Petrisor]

Author: eddyp-guest
Date: 2006-11-13 21:21:34 +0100 (Mon, 13 Nov 2006)
New Revision: 1982

Added:
   packages/tags/wormux/0.7.4-2/debian/patches/
Removed:
   packages/tags/wormux/0.7.4-2/src/
Modified:
   packages/tags/wormux/0.7.4-2/debian/changelog
   packages/tags/wormux/0.7.4-2/debian/control
   packages/tags/wormux/0.7.4-2/debian/rules
Log:
merge r1980:1981 from trunk

Modified: packages/tags/wormux/0.7.4-2/debian/changelog
===================================================================
--- packages/tags/wormux/0.7.4-2/debian/changelog	2006-11-13 20:10:21 UTC (rev 1981)
+++ packages/tags/wormux/0.7.4-2/debian/changelog	2006-11-13 20:21:34 UTC (rev 1982)
@@ -5,9 +5,12 @@
   * fix the problem with extreemly large angles for the gnu,
     many thanks to upstream (Laurent DEFERT SIMONNEAU) for
     tracking down the core of the problem (Closes: #392774)
+  * added patchutils as a build dependency since we need patches
   * wrote my name with the correct diacritic in control file
+  * doesn't crash if default resolution is unavailable, thanks
+    Hanna Ollila (Closes: #395217)
 
- -- Eddy Petrișor <eddy.petrisor at gmail.com>  Fri, 10 Nov 2006 21:57:24 +0200
+ -- Eddy Petrișor <eddy.petrisor at gmail.com>  Mon, 13 Nov 2006 18:48:03 +0200
 
 wormux (0.7.4-1) unstable; urgency=low
 

Modified: packages/tags/wormux/0.7.4-2/debian/control
===================================================================
--- packages/tags/wormux/0.7.4-2/debian/control	2006-11-13 20:10:21 UTC (rev 1981)
+++ packages/tags/wormux/0.7.4-2/debian/control	2006-11-13 20:21:34 UTC (rev 1982)
@@ -3,7 +3,7 @@
 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-ttf1.2-dev | libsdl-ttf2.0-dev, libsdl-gfx1.2-dev (>= 2.0.13), libxml++2.6-dev, fontconfig, ttf-dejavu
+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-ttf1.2-dev | libsdl-ttf2.0-dev, libsdl-gfx1.2-dev (>= 2.0.13), libxml++2.6-dev, fontconfig, ttf-dejavu, patchutils
 Standards-Version: 3.7.2
 
 Package: wormux

Copied: packages/tags/wormux/0.7.4-2/debian/patches (from rev 1981, packages/trunk/wormux/debian/patches)

Modified: packages/tags/wormux/0.7.4-2/debian/rules
===================================================================
--- packages/tags/wormux/0.7.4-2/debian/rules	2006-11-13 20:10:21 UTC (rev 1981)
+++ packages/tags/wormux/0.7.4-2/debian/rules	2006-11-13 20:21:34 UTC (rev 1982)
@@ -3,6 +3,7 @@
 
 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
 
 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)