r5430 - in packages/branches/wesnoth/experimental: . debian
Gerfried Fuchs
alfie at alioth.debian.org
Thu Jan 17 17:48:23 UTC 2008
Author: alfie
Date: 2008-01-17 17:48:22 +0000 (Thu, 17 Jan 2008)
New Revision: 5430
Removed:
packages/branches/wesnoth/experimental/debian/wesnoth-data.links
packages/branches/wesnoth/experimental/debian/wesnoth-editor.links
Modified:
packages/branches/wesnoth/experimental/
packages/branches/wesnoth/experimental/debian/changelog
packages/branches/wesnoth/experimental/debian/control
packages/branches/wesnoth/experimental/debian/rules
packages/branches/wesnoth/experimental/debian/wesnoth-data.install
Log:
* New upstream release.
* configure with --enable-python-install from now on as upstream suggests.
* Add Suggests on ttf-arphic-gkai00mp for Chinese support, and the font
symlink in wesnoth-data.
* Add images/footsteps to wesnoth-data.install, noticed by Andreas Tille,
thanks!
* 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/branches/wesnoth/experimental
___________________________________________________________________
Name: svn-bp:origUrl
+ http://pkg-games.alioth.debian.org/tarballs/wesnoth_1.3.14.orig.tar.gz
Modified: packages/branches/wesnoth/experimental/debian/changelog
===================================================================
--- packages/branches/wesnoth/experimental/debian/changelog 2008-01-17 16:59:45 UTC (rev 5429)
+++ packages/branches/wesnoth/experimental/debian/changelog 2008-01-17 17:48:22 UTC (rev 5430)
@@ -1,3 +1,19 @@
+wesnoth (1:1.3.14-1) experimental; urgency=low
+
+ * New upstream release.
+ * configure with --enable-python-install from now on as upstream suggests.
+ * Add Suggests on ttf-arphic-gkai00mp for Chinese support, and the font
+ symlink in wesnoth-data.
+ * Add images/footsteps to wesnoth-data.install, noticed by Andreas Tille,
+ thanks!
+ * 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.3.13-1) experimental; urgency=low
* The "happy new year" new upstream release.
Modified: packages/branches/wesnoth/experimental/debian/control
===================================================================
--- packages/branches/wesnoth/experimental/debian/control 2008-01-17 16:59:45 UTC (rev 5429)
+++ packages/branches/wesnoth/experimental/debian/control 2008-01-17 17:48:22 UTC (rev 5430)
@@ -48,7 +48,7 @@
Architecture: all
Depends: ttf-dejavu
Recommends: wesnoth-music
-Suggests: ttf-sazanami-gothic
+Suggests: ttf-sazanami-gothic, ttf-arphic-gkai00mp
Description: data files for Wesnoth
This package contains the sound files and graphics for Wesnoth.
.
Modified: packages/branches/wesnoth/experimental/debian/rules
===================================================================
--- packages/branches/wesnoth/experimental/debian/rules 2008-01-17 16:59:45 UTC (rev 5429)
+++ packages/branches/wesnoth/experimental/debian/rules 2008-01-17 17:48:22 UTC (rev 5430)
@@ -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)
@@ -41,7 +49,7 @@
--with-localedir=\$${prefix}/share/locale \
--with-fifodir=/var/run/wesnothd --datadir=\$${prefix}/share/games \
--enable-editor --enable-server --enable-python --with-fribidi \
- CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+ --enable-python-install CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
#Architecture
@@ -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 \
+ arphic/gkai00mp.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.
Modified: packages/branches/wesnoth/experimental/debian/wesnoth-data.install
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth-data.install 2008-01-17 16:59:45 UTC (rev 5429)
+++ packages/branches/wesnoth/experimental/debian/wesnoth-data.install 2008-01-17 17:48:22 UTC (rev 5430)
@@ -23,6 +23,7 @@
debian/tmp/usr/share/games/wesnoth/images/cursors-bw
debian/tmp/usr/share/games/wesnoth/images/dialogs
debian/tmp/usr/share/games/wesnoth/images/flags
+debian/tmp/usr/share/games/wesnoth/images/footsteps
debian/tmp/usr/share/games/wesnoth/images/icons
debian/tmp/usr/share/games/wesnoth/images/misc
debian/tmp/usr/share/games/wesnoth/images/tools
Deleted: packages/branches/wesnoth/experimental/debian/wesnoth-data.links
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth-data.links 2008-01-17 16:59:45 UTC (rev 5429)
+++ packages/branches/wesnoth/experimental/debian/wesnoth-data.links 2008-01-17 17:48:22 UTC (rev 5430)
@@ -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/branches/wesnoth/experimental/debian/wesnoth-editor.links
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth-editor.links 2008-01-17 16:59:45 UTC (rev 5429)
+++ packages/branches/wesnoth/experimental/debian/wesnoth-editor.links 2008-01-17 17:48:22 UTC (rev 5430)
@@ -1 +0,0 @@
-usr/share/games/wesnoth/images/wesnoth_editor-icon.png usr/share/icons/wesnoth_editor-icon.png
More information about the Pkg-games-commits
mailing list