r4135 - packages/trunk/lincity-ng/debian

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-09-08 22:49:25 +0000 (Sat, 08 Sep 2007)
New Revision: 4135

Modified:
   packages/trunk/lincity-ng/debian/changelog
   packages/trunk/lincity-ng/debian/control
   packages/trunk/lincity-ng/debian/rules
Log:
+  * install the official icon instead of debian/lincity-ng.xpm and use
+    convert from imagemagick to create a .xpm file for Debian menu system
+  * rules: add a dh_desktop call to launch update-desktop-database
fix some stuff in the install process


Modified: packages/trunk/lincity-ng/debian/changelog
===================================================================
--- packages/trunk/lincity-ng/debian/changelog	2007-09-08 19:41:44 UTC (rev 4134)
+++ packages/trunk/lincity-ng/debian/changelog	2007-09-08 22:49:25 UTC (rev 4135)
@@ -6,7 +6,9 @@
    - 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
+  * install the official icon instead of debian/lincity-ng.xpm and use
+    convert from imagemagick to create a .xpm file for Debian menu system
+  * rules: add a dh_desktop call to launch update-desktop-database
 
  -- Gonéri Le Bouder <goneri at rulezlan.org>  Wed, 22 Aug 2007 00:09:56 +0200
 

Modified: packages/trunk/lincity-ng/debian/control
===================================================================
--- packages/trunk/lincity-ng/debian/control	2007-09-08 19:41:44 UTC (rev 4134)
+++ packages/trunk/lincity-ng/debian/control	2007-09-08 22:49:25 UTC (rev 4135)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>, Gonéri Le Bouder <goneri at rulezlan.org>
-Build-Depends: debhelper (>= 5), autotools-dev, jam, pkg-config, libsdl1.2-dev (>= 1.2.5), libsdl-mixer1.2-dev (>= 1.2), libsdl-image1.2-dev (>= 1.2), libsdl-ttf2.0-dev (>= 2.0), libphysfs-dev (>= 0.1.9), zlib1g-dev, libxml2-dev (>= 2.6.1), libsdl-gfx1.2-dev (>= 2.0.13), quilt
+Build-Depends: debhelper (>= 5), autotools-dev, jam, pkg-config, libsdl1.2-dev (>= 1.2.5), libsdl-mixer1.2-dev (>= 1.2), libsdl-image1.2-dev (>= 1.2), libsdl-ttf2.0-dev (>= 2.0), libphysfs-dev (>= 0.1.9), zlib1g-dev, libxml2-dev (>= 2.6.1), libsdl-gfx1.2-dev (>= 2.0.13), quilt, imagemagick
 Standards-Version: 3.7.2
 
 Package: lincity-ng

Modified: packages/trunk/lincity-ng/debian/rules
===================================================================
--- packages/trunk/lincity-ng/debian/rules	2007-09-08 19:41:44 UTC (rev 4134)
+++ packages/trunk/lincity-ng/debian/rules	2007-09-08 22:49:25 UTC (rev 4135)
@@ -59,24 +59,25 @@
 
 	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
+
 	# 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/* $(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
-	
+		
 	# 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-bitstream-vera/VeraMono.ttf $(CURDIR)/debian/lincity-ng-data/usr/share/games/lincity-ng/fonts/fixed.ttf
 	ln -s /usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf $(CURDIR)/debian/lincity-ng-data/usr/share/games/lincity-ng/fonts/sans.ttf
 	ln -s /usr/share/fonts/truetype/ttf-bitstream-vera/VeraSe.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
 
 
-
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -90,6 +91,7 @@
 	dh_installexamples
 	dh_installmenu
 	dh_installman ./doc/lincity-ng.6
+	dh_desktop
 	dh_link
 	dh_strip
 	dh_compress