r4561 - packages/trunk/lincity-ng/debian

[Cyril Brulebois]

Author: kibi-guest
Date: 2007-11-05 21:29:24 +0000 (Mon, 05 Nov 2007)
New Revision: 4561

Modified:
   packages/trunk/lincity-ng/debian/changelog
   packages/trunk/lincity-ng/debian/rules
Log:
Add (untested) find/sed on desktop file. Trim trailing whitespaces

Modified: packages/trunk/lincity-ng/debian/changelog
===================================================================
--- packages/trunk/lincity-ng/debian/changelog	2007-11-05 20:55:45 UTC (rev 4560)
+++ packages/trunk/lincity-ng/debian/changelog	2007-11-05 21:29:24 UTC (rev 4561)
@@ -3,6 +3,10 @@
   * New upstream release.
   * Move the homepage from the long description to a source field.
   * Add Vcs-Browser and Vcs-Svn fields.
+  * debian/rules:
+     - Add a find on *.desktop, piped into a sed command to delete the
+       deprecated/obsoleted Encoding line.
+     - Trim trailing whitespaces.
 
  -- 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 20:55:45 UTC (rev 4560)
+++ packages/trunk/lincity-ng/debian/rules	2007-11-05 21:29:24 UTC (rev 4561)
@@ -54,11 +54,11 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_clean -k
 	dh_installdirs
 
 	jam -sprefix=$(CURDIR)/debian/lincity-ng/usr install
-	
+
 	# Prune the docs installed by "jam install", they'll be added the debhelper
 	rm -rf $(CURDIR)/debian/lincity-ng/usr/share/games/doc
 
@@ -67,16 +67,19 @@
 	mv $(CURDIR)/debian/lincity-ng/usr/share/games/lincity-ng $(CURDIR)/debian/lincity-ng-data/usr/share/games
 	mv $(CURDIR)/debian/lincity-ng/usr/share/games/* $(CURDIR)/debian/lincity-ng/usr/share
 	rm -rf $(CURDIR)/debian/lincity-ng/usr/share/games
-		
+
 	# Do not duplicate the Bitstream Vera font
 	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
-	
+
 	# 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
 
+	# Adjust the desktop file until upstream fixes it
+	find $(CURDIR)/debian/lincity-ng -name '*.desktop' -exec \
+		sed -i -e '/^Encoding=/d' {} ';'
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -111,4 +114,4 @@
 	dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install