r6158 - in packages/trunk/airstrike/debian: . patches

[Barry deFreese]

Author: bddebian-guest
Date: 2008-03-18 02:20:27 +0000 (Tue, 18 Mar 2008)
New Revision: 6158

Modified:
   packages/trunk/airstrike/debian/airstrike-common.install
   packages/trunk/airstrike/debian/airstrike.install
   packages/trunk/airstrike/debian/changelog
   packages/trunk/airstrike/debian/menu
   packages/trunk/airstrike/debian/patches/series
   packages/trunk/airstrike/debian/rules
Log:
    + airstrikerc.diff - Fix path to data.
  * Remove unneeded dirs file.
  * Install desktop and icon file in .install file.
  * Add call to dh_desktop.
Refresh changelog to prepare for upload.


Modified: packages/trunk/airstrike/debian/airstrike-common.install
===================================================================
--- packages/trunk/airstrike/debian/airstrike-common.install	2008-03-17 23:38:06 UTC (rev 6157)
+++ packages/trunk/airstrike/debian/airstrike-common.install	2008-03-18 02:20:27 UTC (rev 6158)
@@ -1 +1,2 @@
-usr/share/games/airstrike
+debian/tmp/usr/share/games/airstrike/* usr/share/games/airstrike/
+

Modified: packages/trunk/airstrike/debian/airstrike.install
===================================================================
--- packages/trunk/airstrike/debian/airstrike.install	2008-03-17 23:38:06 UTC (rev 6157)
+++ packages/trunk/airstrike/debian/airstrike.install	2008-03-18 02:20:27 UTC (rev 6158)
@@ -1,2 +1,5 @@
-usr/games
-etc
+debian/tmp/usr/games/* usr/games/
+debian/tmp/etc/* etc/
+debian/airstrike.desktop usr/share/applications/
+debian/airstrike.xpm usr/share/pixmaps/
+

Modified: packages/trunk/airstrike/debian/changelog
===================================================================
--- packages/trunk/airstrike/debian/changelog	2008-03-17 23:38:06 UTC (rev 6157)
+++ packages/trunk/airstrike/debian/changelog	2008-03-18 02:20:27 UTC (rev 6158)
@@ -1,4 +1,4 @@
-airstrike (0.99+1.0pre6a-4) UNRELEASED; urgency=low
+airstrike (0.99+1.0pre6a-4) unstable; urgency=low
 
   [ Ansgar Burchardt ]
   * Remove deprecated Encoding key from .desktop file
@@ -13,13 +13,17 @@
   * Move old source changes to patches.
     + fix_paths.diff - Fix paths in Makefile, config.h, and airstrike.c.
     + manpage.diff - Add .SH section to manpage.
+    + airstrikerc.diff - Fix path to data.
   * fix-spawn-level.diff. (Closes: #470471).
     + Start planes at same height.
   * Fix copyright encoding to UTF-8.
+  * Remove unneeded dirs file.
+  * Install desktop and icon file in .install file.
+  * Add call to dh_desktop.
   * Bump Standards Version to 3.7.3.
     + Menu policy transition.
 
- -- Ansgar Burchardt <ansgar at 43-1.org>  Fri, 29 Feb 2008 03:08:21 +0100
+ -- Barry deFreese <bddebian at comcast.net>  Mon, 17 Mar 2008 21:05:57 -0400
 
 airstrike (0.99+1.0pre6a-3.1) unstable; urgency=low
 

Modified: packages/trunk/airstrike/debian/menu
===================================================================
--- packages/trunk/airstrike/debian/menu	2008-03-17 23:38:06 UTC (rev 6157)
+++ packages/trunk/airstrike/debian/menu	2008-03-18 02:20:27 UTC (rev 6158)
@@ -1,2 +1,2 @@
-?package(airstrike):needs=X11 section=Games/Action\
+?package(airstrike):needs="X11" section="Games/Action"\
   title="Airstrike" command="/usr/games/airstrike"

Modified: packages/trunk/airstrike/debian/patches/series
===================================================================
--- packages/trunk/airstrike/debian/patches/series	2008-03-17 23:38:06 UTC (rev 6157)
+++ packages/trunk/airstrike/debian/patches/series	2008-03-18 02:20:27 UTC (rev 6158)
@@ -1,4 +1,5 @@
 fix_paths.diff
+airstrikerc.diff
 manpage.diff
 fix-buffer-overflow.diff
 fix-red-baron-has-unlimited-bombs.diff

Modified: packages/trunk/airstrike/debian/rules
===================================================================
--- packages/trunk/airstrike/debian/rules	2008-03-17 23:38:06 UTC (rev 6157)
+++ packages/trunk/airstrike/debian/rules	2008-03-18 02:20:27 UTC (rev 6158)
@@ -40,23 +40,18 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-	# install desktop file
-	cp debian/airstrike.desktop debian/airstrike/usr/share/applications/
-	# and icon
-	cp debian/airstrike.xpm debian/airstrike/usr/share/pixmaps/
+	#Remove empty dir
+	rm -rf debian/tmp/usr/share/games/airstrike/sound
 
-
 binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs -i
-#	dh_installmenu -i
 	dh_installchangelogs -i ChangeLog
-	dh_install -i --sourcedir=debian/tmp
+	dh_install -i
 	dh_link -i
 	dh_strip -i
 	dh_fixperms -i
@@ -72,10 +67,11 @@
 	dh_testdir
 	dh_testroot
 	dh_installdocs -a
-#	dh_installmenu -a
+	dh_installmenu -a
 	dh_installman -a doc/airstrike.6
 	dh_installchangelogs -a ChangeLog
-	dh_install -a --sourcedir=debian/tmp
+	dh_desktop -a
+	dh_install -a
 	dh_link -a
 	dh_strip -a
 	dh_fixperms -a