Author: alfie
Date: 2008-01-21 18:49:25 +0000 (Mon, 21 Jan 2008)
New Revision: 5482
Added:
packages/trunk/wesnoth/debian/overrides/wesnoth-editor
packages/trunk/wesnoth/debian/wesnoth-data.dirs
packages/trunk/wesnoth/debian/wesnoth-editor.dirs
Removed:
packages/trunk/wesnoth/debian/overrides/wesnoth
packages/trunk/wesnoth/debian/wesnoth.links
Modified:
packages/trunk/wesnoth/debian/changelog
packages/trunk/wesnoth/debian/control
packages/trunk/wesnoth/debian/overrides/wesnoth-data
packages/trunk/wesnoth/debian/rules
packages/trunk/wesnoth/debian/wesnoth-data.install
packages/trunk/wesnoth/debian/wesnoth-editor.install
packages/trunk/wesnoth/debian/wesnoth.install
Log:
Get rid of dh_link alltogether to be able to fix #445550, add overrides for it.
Move the manual linking into the appropriate order, and also add
wesnoth-nolog manpage symlinks for translated manual pages.
* Moved wesnoth-icon.xpm to wesnoth package itself, removed overrides and
added versioned Replaces on wesnoth-data for that.
Rework quilt integration a bit to make configure being called only once during
build process.
Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog 2008-01-21 08:45:51 UTC (rev
5481)
+++ packages/trunk/wesnoth/debian/changelog 2008-01-21 18:49:25 UTC (rev
5482)
@@ -2,12 +2,16 @@
* 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)
+ * Create the links on our own instead of relying on dh_link which is removed
+ now completely (closes: #445550). dh_link is severily braindead enforcing
+ a should policy entry here on links it doesn't even create itself.
+ * Add lintian overrides for that.
* Also create wesnoth-nolog.6.gz -> wesnoth.6.gz symlinks for translated
manpages.
+ * Moved wesnoth-icon.xpm to wesnoth package itself, removed overrides and
+ added versioned Replaces on wesnoth-data for that.
- -- Gerfried Fuchs <[EMAIL PROTECTED]> Thu, 17 Jan 2008 18:38:17 +0100
+ -- Gerfried Fuchs <[EMAIL PROTECTED]> Fri, 18 Jan 2008 16:29:25 +0100
wesnoth (1:1.2.8-1) unstable; urgency=medium
Modified: packages/trunk/wesnoth/debian/control
===================================================================
--- packages/trunk/wesnoth/debian/control 2008-01-21 08:45:51 UTC (rev
5481)
+++ packages/trunk/wesnoth/debian/control 2008-01-21 18:49:25 UTC (rev
5482)
@@ -14,6 +14,7 @@
Package: wesnoth
Architecture: any
Depends: ${shlibs:Depends}, wesnoth-data (= ${source:Version})
+Replaces: wesnoth-data (<< 1:1.2.8-2)
Suggests: wesnoth-all
Description: fantasy turn-based strategy game
Battle for control of villages, using variety of units which have advantages
Deleted: packages/trunk/wesnoth/debian/overrides/wesnoth
===================================================================
--- packages/trunk/wesnoth/debian/overrides/wesnoth 2008-01-21 08:45:51 UTC
(rev 5481)
+++ packages/trunk/wesnoth/debian/overrides/wesnoth 2008-01-21 18:49:25 UTC
(rev 5482)
@@ -1 +0,0 @@
-wesnoth: menu-icon-missing /usr/share/pixmaps/wesnoth-icon.xpm
Modified: packages/trunk/wesnoth/debian/overrides/wesnoth-data
===================================================================
--- packages/trunk/wesnoth/debian/overrides/wesnoth-data 2008-01-21
08:45:51 UTC (rev 5481)
+++ packages/trunk/wesnoth/debian/overrides/wesnoth-data 2008-01-21
18:49:25 UTC (rev 5482)
@@ -1 +1,4 @@
wesnoth-data: extra-license-file usr/share/games/wesnoth/data/COPYING.txt
+wesnoth-data: symlink-should-be-relative
usr/share/games/wesnoth/fonts/DejaVuSans.ttf
/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
+wesnoth-data: symlink-should-be-relative
usr/share/games/wesnoth/fonts/sazanami-gothic.ttf
/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
+wesnoth-data: symlink-should-be-relative usr/share/icons/wesnoth-icon.png
/usr/share/games/wesnoth/images/wesnoth-icon.png
Added: packages/trunk/wesnoth/debian/overrides/wesnoth-editor
===================================================================
--- packages/trunk/wesnoth/debian/overrides/wesnoth-editor
(rev 0)
+++ packages/trunk/wesnoth/debian/overrides/wesnoth-editor 2008-01-21
18:49:25 UTC (rev 5482)
@@ -0,0 +1 @@
+wesnoth-editor: symlink-should-be-relative
usr/share/icons/wesnoth_editor-icon.png
/usr/share/games/wesnoth/images/wesnoth_editor-icon.png
Modified: packages/trunk/wesnoth/debian/rules
===================================================================
--- packages/trunk/wesnoth/debian/rules 2008-01-21 08:45:51 UTC (rev 5481)
+++ packages/trunk/wesnoth/debian/rules 2008-01-21 18:49:25 UTC (rev 5482)
@@ -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) \
@@ -117,7 +118,6 @@
# dh_python
dh_installinit
dh_installman
- dh_link
dh_strip
dh_compress
dh_fixperms
@@ -131,28 +131,29 @@
# 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; do \
- ln -s /usr/share/fonts/truetype/$i
- debian/wesnoth-data/usr/share/games/wesnoth/fonts/$(shell
basename $i); \
+ 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/`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
+ ln -s wesnoth.6.gz debian/wesnoth/usr/share/man/man6/wesnoth-nolog.6.gz
+ $(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/trunk/wesnoth/debian/wesnoth-data.dirs
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-data.dirs
(rev 0)
+++ packages/trunk/wesnoth/debian/wesnoth-data.dirs 2008-01-21 18:49:25 UTC
(rev 5482)
@@ -0,0 +1,2 @@
+/usr/share/games/wesnoth/fonts
+/usr/share/icons
Modified: packages/trunk/wesnoth/debian/wesnoth-data.install
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-data.install 2008-01-21 08:45:51 UTC
(rev 5481)
+++ packages/trunk/wesnoth/debian/wesnoth-data.install 2008-01-21 18:49:25 UTC
(rev 5482)
@@ -1,3 +1,6 @@
+debian/overrides/wesnoth-data /usr/share/lintian/overrides
+debian/tmp/usr/share/games/wesnoth/data/*.cfg
+debian/tmp/usr/share/games/wesnoth/data/COPYING.txt
debian/tmp/usr/share/games/wesnoth/data/factions/
debian/tmp/usr/share/games/wesnoth/data/languages/
debian/tmp/usr/share/games/wesnoth/data/themes/default.cfg
@@ -6,8 +9,6 @@
debian/tmp/usr/share/games/wesnoth/data/themes/macros.cfg
debian/tmp/usr/share/games/wesnoth/data/terrain-graphics
debian/tmp/usr/share/games/wesnoth/data/units
-debian/tmp/usr/share/games/wesnoth/data/*.cfg
-debian/tmp/usr/share/games/wesnoth/data/COPYING.txt
debian/tmp/usr/share/games/wesnoth/images/wesnoth-icon.png
debian/tmp/usr/share/games/wesnoth/images/attacks
debian/tmp/usr/share/games/wesnoth/images/buttons
@@ -27,9 +28,7 @@
debian/tmp/usr/share/games/wesnoth/data/maps/multiplayer
debian/tmp/usr/share/games/wesnoth/sounds
debian/tmp/usr/share/games/wesnoth/data/tutorial
-debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth.mo
-debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth-tutorial.mo
-debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth-lib.mo
debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth-editor.mo
-debian/wesnoth-icon.xpm /usr/share/pixmaps
-debian/overrides/wesnoth-data /usr/share/lintian/overrides
+debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth-lib.mo
+debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth-tutorial.mo
+debian/tmp/usr/share/locale/*/LC_MESSAGES/wesnoth.mo
Added: packages/trunk/wesnoth/debian/wesnoth-editor.dirs
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-editor.dirs
(rev 0)
+++ packages/trunk/wesnoth/debian/wesnoth-editor.dirs 2008-01-21 18:49:25 UTC
(rev 5482)
@@ -0,0 +1 @@
+/usr/share/icons
Modified: packages/trunk/wesnoth/debian/wesnoth-editor.install
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-editor.install 2008-01-21
08:45:51 UTC (rev 5481)
+++ packages/trunk/wesnoth/debian/wesnoth-editor.install 2008-01-21
18:49:25 UTC (rev 5482)
@@ -1,3 +1,4 @@
+debian/overrides/wesnoth-editor /usr/share/lintian/overrides
debian/tmp/usr/games/wesnoth_editor
debian/tmp/usr/share/man/man6/wesnoth_editor.6
debian/tmp/usr/share/man/*/man6/wesnoth_editor.6
Modified: packages/trunk/wesnoth/debian/wesnoth.install
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth.install 2008-01-21 08:45:51 UTC
(rev 5481)
+++ packages/trunk/wesnoth/debian/wesnoth.install 2008-01-21 18:49:25 UTC
(rev 5482)
@@ -2,5 +2,5 @@
debian/wesnoth-nolog /usr/games
debian/tmp/usr/share/man/man6/wesnoth.6
debian/tmp/usr/share/man/*/man6/wesnoth.6
-debian/overrides/wesnoth /usr/share/lintian/overrides
icons/wesnoth.desktop /usr/share/applications
+debian/wesnoth-icon.xpm /usr/share/pixmaps
Deleted: packages/trunk/wesnoth/debian/wesnoth.links
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth.links 2008-01-21 08:45:51 UTC (rev
5481)
+++ packages/trunk/wesnoth/debian/wesnoth.links 2008-01-21 18:49:25 UTC (rev
5482)
@@ -1 +0,0 @@
-usr/share/man/man6/wesnoth.6.gz usr/share/man/man6/wesnoth-nolog.6.gz
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
