r4023 - packages/trunk/lincity-ng/debian

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-09-01 02:09:06 +0000 (Sat, 01 Sep 2007)
New Revision: 4023

Modified:
   packages/trunk/lincity-ng/debian/changelog
   packages/trunk/lincity-ng/debian/rules
Log:
+   - the hyphen-used-as-minus-sign typo in the manpage is fixed upstream,
+     remove the fix from debian/rules



Modified: packages/trunk/lincity-ng/debian/changelog
===================================================================
--- packages/trunk/lincity-ng/debian/changelog	2007-08-31 23:16:27 UTC (rev 4022)
+++ packages/trunk/lincity-ng/debian/changelog	2007-09-01 02:09:06 UTC (rev 4023)
@@ -3,6 +3,8 @@
   * new upstream release (Closes: #439034)
    - remove patches merged in upstream: gcc-4.3.diff and
      remove-Application-section-from-desktopfile.diff
+   - the hyphen-used-as-minus-sign typo in the manpage is fixed upstream,
+     remove the fix from debian/rules
   * update the changelog
   * install the official icon instead of debian/lincity-ng.xpm
 

Modified: packages/trunk/lincity-ng/debian/rules
===================================================================
--- packages/trunk/lincity-ng/debian/rules	2007-08-31 23:16:27 UTC (rev 4022)
+++ packages/trunk/lincity-ng/debian/rules	2007-09-01 02:09:06 UTC (rev 4023)
@@ -59,18 +59,14 @@
 
 	jam -sprefix=$(CURDIR)/debian/lincity-ng/usr install
 	
-	# Fix the hyphen-used-as-minus-sign typo
-	sed -e 's/ -S 1024x768/ \\-S 1024x768/' \
-	 < $(CURDIR)/doc/lincity-ng.6 \
-	 > $(CURDIR)/debian/lincity-ng.6
-
 	# Build a separate arch independant data package
 	mkdir -p $(CURDIR)/debian/lincity-ng-data/usr/share/games
 	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/pixmaps $(CURDIR)/debian/lincity-ng-data/usr/share/
+	mv $(CURDIR)/debian/lincity-ng/usr/share/games/* $(CURDIR)/debian/lincity-ng/usr/share
+	rm -rf $(CURDIR)/debian/lincity-ng/usr/share/games
 
 	# Prune the docs installed by "jam install", they'll be added the debhelper
-	rm -rf $(CURDIR)/debian/lincity-ng/usr/share
+	# rm -rf $(CURDIR)/debian/lincity-ng/usr/share
 	
 	# Do not duplicate the Bitstream Vera font
 	rm $(CURDIR)/debian/lincity-ng-data/usr/share/games/lincity-ng/fonts/*
@@ -89,14 +85,11 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-#	dh_install debian/lincity-ng.xpm /usr/share/pixmaps
-	dh_install lincity-ng.png /usr/share/pixmaps
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installexamples
 	dh_installmenu
-	# Not installing ./doc/lincity-ng.6 directly since it is a bit buggy
-	dh_installman $(CURDIR)/debian/lincity-ng.6
+	dh_installman ./doc/lincity-ng.6
 	dh_link
 	dh_strip
 	dh_compress