Author: alfie
Date: 2008-01-18 10:16:46 +0000 (Fri, 18 Jan 2008)
New Revision: 5453
Added:
packages/branches/wesnoth/experimental/debian/wesnoth-data.dirs
packages/branches/wesnoth/experimental/debian/wesnoth-editor.dirs
Modified:
packages/branches/wesnoth/experimental/debian/changelog
packages/branches/wesnoth/experimental/debian/control
packages/branches/wesnoth/experimental/debian/rules
Log:
Add wesnoth-{editor,data}.dirs file for making the symlink workaround possible
Do the symlink magic before the binary-common build to make it actually end up
in the package
Use $$i instead of $i to let the shell get that $
* Bump Replaces version on wesnoth-data to an epoched version (closes:
#456530)
Use patch-stamp directly to make the quilt snippet call non-.PHONY
Modified: packages/branches/wesnoth/experimental/debian/changelog
===================================================================
--- packages/branches/wesnoth/experimental/debian/changelog 2008-01-18
05:26:32 UTC (rev 5452)
+++ packages/branches/wesnoth/experimental/debian/changelog 2008-01-18
10:16:46 UTC (rev 5453)
@@ -11,6 +11,8 @@
(closes: #445550)
* Also create wesnoth-nolog.6.gz -> wesnoth.6.gz symlinks for translated
manpages.
+ * Bump Replaces version on wesnoth-data to an epoched version
+ (closes: #456530)
-- Gerfried Fuchs <[EMAIL PROTECTED]> Thu, 17 Jan 2008 18:38:17 +0100
Modified: packages/branches/wesnoth/experimental/debian/control
===================================================================
--- packages/branches/wesnoth/experimental/debian/control 2008-01-18
05:26:32 UTC (rev 5452)
+++ packages/branches/wesnoth/experimental/debian/control 2008-01-18
10:16:46 UTC (rev 5453)
@@ -14,7 +14,7 @@
Package: wesnoth
Architecture: any
Depends: ${shlibs:Depends}, wesnoth-data (= ${source:Version})
-Replaces: wesnoth-data (<< 1.3.8)
+Replaces: wesnoth-data (<< 1:1.3.9-3)
Suggests: wesnoth-all
Description: fantasy turn-based strategy game
Battle for control of villages, using variety of units which have advantages
Modified: packages/branches/wesnoth/experimental/debian/rules
===================================================================
--- packages/branches/wesnoth/experimental/debian/rules 2008-01-18 05:26:32 UTC
(rev 5452)
+++ packages/branches/wesnoth/experimental/debian/rules 2008-01-18 10:16:46 UTC
(rev 5453)
@@ -26,6 +26,7 @@
STABLE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION)
NEXT_VERSION = $(MAJOR_VERSION).$(shell echo $$(( $(MINOR_VERSION) + 1 )) )
+QUILT_STAMPFN = patch-stamp
include /usr/share/quilt/quilt.make
clean: unpatch
@@ -40,7 +41,7 @@
dh_clean
-config.status: configure patch
+config.status: configure patch-stamp
dh_testdir
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -131,28 +132,28 @@
# Build architecture independant packages using the common target.
binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
# 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); \
+ arphic/gkai00mp.ttf; do ln -s /usr/share/fonts/truetype/$$i \
+ debian/wesnoth-data/usr/share/games/wesnoth/fonts/`basename
$$i`; \
done
ln -s /usr/share/games/wesnoth/images/wesnoth-icon.png \
debian/wesnoth-data/usr/share/icons/wesnoth-icon.png
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
# Build architecture dependant packages using the common target.
binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
# 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
+ debian/wesnoth-editor/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; \
+ for i in debian/wesnoth/usr/share/man/*/man6/wesnoth.6; do \
+ ln -s wesnoth.6.gz `dirname $$i`/wesnoth-nolog.6.gz; \
done
+ $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
binary: binary-arch binary-indep
.PHONY: build clean binary-indep binary-arch binary install install-indep
install-arch
Added: packages/branches/wesnoth/experimental/debian/wesnoth-data.dirs
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth-data.dirs
(rev 0)
+++ packages/branches/wesnoth/experimental/debian/wesnoth-data.dirs
2008-01-18 10:16:46 UTC (rev 5453)
@@ -0,0 +1,2 @@
+/usr/share/games/wesnoth/fonts
+/usr/share/icons
Added: packages/branches/wesnoth/experimental/debian/wesnoth-editor.dirs
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth-editor.dirs
(rev 0)
+++ packages/branches/wesnoth/experimental/debian/wesnoth-editor.dirs
2008-01-18 10:16:46 UTC (rev 5453)
@@ -0,0 +1 @@
+/usr/share/icons
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
