r5431 - in packages/trunk/wesnoth: . debian

[Gerfried Fuchs]

Author: alfie
Date: 2008-01-17 17:56:16 +0000 (Thu, 17 Jan 2008)
New Revision: 5431

Removed:
   packages/trunk/wesnoth/debian/wesnoth-data.links
   packages/trunk/wesnoth/debian/wesnoth-editor.links
Modified:
   packages/trunk/wesnoth/
   packages/trunk/wesnoth/debian/changelog
   packages/trunk/wesnoth/debian/control
   packages/trunk/wesnoth/debian/rules
Log:
 * Bumped Standards-Version to 3.7.3, no further changes needed.
 * Compile with -g and support DEB_BUILD_OPTIONS=noopt (closes: #459755)
 * Create the fonts and icon links on our own instead of relying on dh_link
   (closes: #445550)
 * Also create wesnoth-nolog.6.gz -> wesnoth.6.gz symlinks for translated
   manpages.



Property changes on: packages/trunk/wesnoth
___________________________________________________________________
Name: svn-bp:origUrl
   + http://pkg-games.alioth.debian.org/tarballs/wesnoth_1.2.8.orig.tar.gz


Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog	2008-01-17 17:48:22 UTC (rev 5430)
+++ packages/trunk/wesnoth/debian/changelog	2008-01-17 17:56:16 UTC (rev 5431)
@@ -1,3 +1,14 @@
+wesnoth (1:1.2.8-2) unstable; urgency=low
+
+  * Bumped Standards-Version to 3.7.3, no further changes needed.
+  * Compile with -g and support DEB_BUILD_OPTIONS=noopt (closes: #459755)
+  * Create the fonts and icon links on our own instead of relying on dh_link
+    (closes: #445550)
+  * Also create wesnoth-nolog.6.gz -> wesnoth.6.gz symlinks for translated
+    manpages.
+
+ -- Gerfried Fuchs <rhonda at debian.at>  Thu, 17 Jan 2008 18:38:17 +0100
+
 wesnoth (1:1.2.8-1) unstable; urgency=medium
 
   * New upstream release with a fix for a directory traversal problem in the

Modified: packages/trunk/wesnoth/debian/control
===================================================================
--- packages/trunk/wesnoth/debian/control	2008-01-17 17:48:22 UTC (rev 5430)
+++ packages/trunk/wesnoth/debian/control	2008-01-17 17:56:16 UTC (rev 5431)
@@ -5,7 +5,7 @@
 Build-Depends: debhelper (>= 5), quilt, libsdl-image1.2-dev, libfreetype6-dev,
   libsdl-mixer1.2-dev, libsdl-net1.2-dev, libfribidi-dev, libsdl1.2-dev,
   python-dev (>= 2.3)
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 Uploaders: Cyril Bouthors <cyril at bouthors.org>, Gerfried Fuchs <rhonda at debian.at>
 Homepage: http://wesnoth.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/wesnoth/

Modified: packages/trunk/wesnoth/debian/rules
===================================================================
--- packages/trunk/wesnoth/debian/rules	2008-01-17 17:48:22 UTC (rev 5430)
+++ packages/trunk/wesnoth/debian/rules	2008-01-17 17:56:16 UTC (rev 5431)
@@ -12,6 +12,14 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+CFLAGS = -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+        CFLAGS += -O0
+else
+        CFLAGS += -O2
+endif
+
+
 # calculate the version strings
 MAJOR_VERSION = $(shell dpkg-parsechangelog | grep "^Version:" | cut -d" " -f2 | cut -d. -f1)
 MINOR_VERSION = $(shell dpkg-parsechangelog | grep "^Version:" | cut -d" " -f2 | cut -d. -f2)
@@ -61,6 +69,7 @@
 
 
 install: install-indep install-arch
+
 install-indep:
 	dh_testdir
 	dh_testroot
@@ -78,6 +87,15 @@
 		$(MAKE) -C po install \
 			localedir=/usr/share/locale
 
+	# workaround for dh_link (mis)behavior, see BTS#445550
+	for i in ttf-dejavu/DejaVuSans.ttf sazanami/sazanami-gothic.ttf; do \
+		ln -s /usr/share/fonts/truetype/$i
+	       	debian/wesnoth-data/usr/share/games/wesnoth/fonts/$(shell basename $i); \
+		done
+	ln -s /usr/share/games/wesnoth/images/wesnoth-icon.png \
+		debian/wesnoth-data/usr/share/icons/wesnoth-icon.png
+
+
 	dh_install -i
 
 
@@ -93,7 +111,16 @@
 		$(MAKE) install-exec
 	DESTDIR=$(CURDIR)/debian/tmp \
 		$(MAKE) -C doc/man install
+
+	# workaround for dh_link (mis)behavior, see BTS#445550
+	ln -s /usr/share/games/wesnoth/images/wesnoth_editor-icon.png \
+		debian/wesnoth-data/usr/share/icons/wesnoth_editor-icon.png
+
+	for i in debian/wesnoth/usr/share/man/*/man6/wesnoth.6.gz; do \
+		ln -s wesnoth.6.gz $(shell dirname $i)/wesnoth-nolog.6.gz; \
+		done
 	dh_install -s
+
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
 # in another 'make' thread.

Deleted: packages/trunk/wesnoth/debian/wesnoth-data.links
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-data.links	2008-01-17 17:48:22 UTC (rev 5430)
+++ packages/trunk/wesnoth/debian/wesnoth-data.links	2008-01-17 17:56:16 UTC (rev 5431)
@@ -1,4 +0,0 @@
-usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/games/wesnoth/fonts/DejaVuSans.ttf
-usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/games/wesnoth/fonts/DejaVuSans.ttf
-/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf usr/share/games/wesnoth/fonts/sazanami-gothic.ttf
-usr/share/games/wesnoth/images/wesnoth-icon.png usr/share/icons/wesnoth-icon.png

Deleted: packages/trunk/wesnoth/debian/wesnoth-editor.links
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-editor.links	2008-01-17 17:48:22 UTC (rev 5430)
+++ packages/trunk/wesnoth/debian/wesnoth-editor.links	2008-01-17 17:56:16 UTC (rev 5431)
@@ -1 +0,0 @@
-usr/share/games/wesnoth/images/wesnoth_editor-icon.png usr/share/icons/wesnoth_editor-icon.png