r4562 - packages/trunk/lincity-ng/debian

[Cyril Brulebois]

Author: kibi-guest
Date: 2007-11-05 21:38:51 +0000 (Mon, 05 Nov 2007)
New Revision: 4562

Modified:
   packages/trunk/lincity-ng/debian/changelog
   packages/trunk/lincity-ng/debian/rules
Log:
Use relative symlinks, per Policy 10.5. ACK the previous commit, the desktop file is now correct.

Modified: packages/trunk/lincity-ng/debian/changelog
===================================================================
--- packages/trunk/lincity-ng/debian/changelog	2007-11-05 21:29:24 UTC (rev 4561)
+++ packages/trunk/lincity-ng/debian/changelog	2007-11-05 21:38:51 UTC (rev 4562)
@@ -7,6 +7,8 @@
      - Add a find on *.desktop, piped into a sed command to delete the
        deprecated/obsoleted Encoding line.
      - Trim trailing whitespaces.
+     - Use relative symlinks from /usr/share/games/lincity-ng/fonts to
+       ../../../fonts/truetype/ttf-dejavu (Policy 10.5).
 
  -- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>  Mon, 05 Nov 2007 21:06:14 +0100
 

Modified: packages/trunk/lincity-ng/debian/rules
===================================================================
--- packages/trunk/lincity-ng/debian/rules	2007-11-05 21:29:24 UTC (rev 4561)
+++ packages/trunk/lincity-ng/debian/rules	2007-11-05 21:38:51 UTC (rev 4562)
@@ -69,10 +69,12 @@
 	rm -rf $(CURDIR)/debian/lincity-ng/usr/share/games
 
 	# Do not duplicate the Bitstream Vera font
+	# Symlinks target /usr/share/fonts/truetype/ttf-dejavu
+	# (and have to be relative, see Policy 10.5)
 	rm $(CURDIR)/debian/lincity-ng-data/usr/share/games/lincity-ng/fonts/*
-	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf $(CURDIR)/debian/lincity-ng-data/usr/share/games/lincity-ng/fonts/fixed.ttf
-	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf $(CURDIR)/debian/lincity-ng-data/usr/share/games/lincity-ng/fonts/sans.ttf
-	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf $(CURDIR)/debian/lincity-ng-data/usr/share/games/lincity-ng/fonts/serif.ttf
+	ln -s ../../../fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf $(CURDIR)/debian/lincity-ng-data/usr/share/games/lincity-ng/fonts/fixed.ttf
+	ln -s ../../../fonts/truetype/ttf-dejavu/DejaVuSans.ttf     $(CURDIR)/debian/lincity-ng-data/usr/share/games/lincity-ng/fonts/sans.ttf
+	ln -s ../../../fonts/truetype/ttf-dejavu/DejaVuSerif.ttf    $(CURDIR)/debian/lincity-ng-data/usr/share/games/lincity-ng/fonts/serif.ttf
 
 	# create a .xpm file because Debian menu system want it...
 	convert -geometry 32x32 ./debian/lincity-ng/usr/share/pixmaps/lincity-ng.png ./debian/lincity-ng/usr/share/pixmaps/lincity-ng.xpm