r5483 - in packages/branches/wesnoth/experimental/debian: . overrides

[Gerfried Fuchs]

Author: alfie
Date: 2008-01-21 18:50:14 +0000 (Mon, 21 Jan 2008)
New Revision: 5483

Added:
   packages/branches/wesnoth/experimental/debian/overrides/wesnoth-editor
Removed:
   packages/branches/wesnoth/experimental/debian/wesnoth.links
Modified:
   packages/branches/wesnoth/experimental/debian/changelog
   packages/branches/wesnoth/experimental/debian/overrides/wesnoth-data
   packages/branches/wesnoth/experimental/debian/rules
   packages/branches/wesnoth/experimental/debian/wesnoth-editor.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.
Rework quilt integration a bit to make configure being called only once during build process.


Modified: packages/branches/wesnoth/experimental/debian/changelog
===================================================================
--- packages/branches/wesnoth/experimental/debian/changelog	2008-01-21 18:49:25 UTC (rev 5482)
+++ packages/branches/wesnoth/experimental/debian/changelog	2008-01-21 18:50:14 UTC (rev 5483)
@@ -7,14 +7,16 @@
   * 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)
+  * 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.
   * Bump Replaces version on wesnoth-data to an epoched version
     (closes: #456530)
 
- -- Gerfried Fuchs <rhonda at debian.at>  Thu, 17 Jan 2008 18:38:17 +0100
+ -- Gerfried Fuchs <rhonda at debian.at>  Fri, 18 Jan 2008 16:29:25 +0100
 
 wesnoth (1:1.3.13-1) experimental; urgency=low
 

Modified: packages/branches/wesnoth/experimental/debian/overrides/wesnoth-data
===================================================================
--- packages/branches/wesnoth/experimental/debian/overrides/wesnoth-data	2008-01-21 18:49:25 UTC (rev 5482)
+++ packages/branches/wesnoth/experimental/debian/overrides/wesnoth-data	2008-01-21 18:50:14 UTC (rev 5483)
@@ -1 +1,5 @@
 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/games/wesnoth/fonts/gkai00mp.ttf /usr/share/fonts/truetype/arphic/gkai00mp.ttf
+wesnoth-data: symlink-should-be-relative usr/share/icons/wesnoth-icon.png /usr/share/games/wesnoth/images/wesnoth-icon.png

Added: packages/branches/wesnoth/experimental/debian/overrides/wesnoth-editor
===================================================================
--- packages/branches/wesnoth/experimental/debian/overrides/wesnoth-editor	                        (rev 0)
+++ packages/branches/wesnoth/experimental/debian/overrides/wesnoth-editor	2008-01-21 18:50:14 UTC (rev 5483)
@@ -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/branches/wesnoth/experimental/debian/rules
===================================================================
--- packages/branches/wesnoth/experimental/debian/rules	2008-01-21 18:49:25 UTC (rev 5482)
+++ packages/branches/wesnoth/experimental/debian/rules	2008-01-21 18:50:14 UTC (rev 5483)
@@ -118,7 +118,6 @@
 #	dh_python
 	dh_installinit
 	dh_installman
-	dh_link
 	dh_strip
 	dh_compress 
 	dh_fixperms
@@ -151,6 +150,7 @@
 	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
 

Modified: packages/branches/wesnoth/experimental/debian/wesnoth-editor.install
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth-editor.install	2008-01-21 18:49:25 UTC (rev 5482)
+++ packages/branches/wesnoth/experimental/debian/wesnoth-editor.install	2008-01-21 18:50:14 UTC (rev 5483)
@@ -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

Deleted: packages/branches/wesnoth/experimental/debian/wesnoth.links
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth.links	2008-01-21 18:49:25 UTC (rev 5482)
+++ packages/branches/wesnoth/experimental/debian/wesnoth.links	2008-01-21 18:50:14 UTC (rev 5483)
@@ -1 +0,0 @@
-usr/share/man/man6/wesnoth.6.gz usr/share/man/man6/wesnoth-nolog.6.gz