[airstrike] 06/33: + 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.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository airstrike.

commit fbc45640a951c55331327a48c903cc05def5fdf2
Author: Barry deFreese <bddebian at comcast.net>
Date:   Tue Mar 18 02:20:27 2008 +0000

        + 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.
---
 debian/airstrike-common.install |  3 ++-
 debian/airstrike.install        |  7 +++++--
 debian/changelog                |  8 ++++++--
 debian/menu                     |  2 +-
 debian/patches/series           |  1 +
 debian/rules                    | 16 ++++++----------
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/debian/airstrike-common.install b/debian/airstrike-common.install
index b519087..a5f972e 100644
--- a/debian/airstrike-common.install
+++ b/debian/airstrike-common.install
@@ -1 +1,2 @@
-usr/share/games/airstrike
+debian/tmp/usr/share/games/airstrike/* usr/share/games/airstrike/
+
diff --git a/debian/airstrike.install b/debian/airstrike.install
index 4e35382..9b83f73 100644
--- a/debian/airstrike.install
+++ b/debian/airstrike.install
@@ -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/
+
diff --git a/debian/changelog b/debian/changelog
index acc13ad..e48cf81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 @@ airstrike (0.99+1.0pre6a-4) UNRELEASED; urgency=low
   * 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
 
diff --git a/debian/menu b/debian/menu
index a0a25a8..6fc069d 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
-?package(airstrike):needs=X11 section=Games/Action\
+?package(airstrike):needs="X11" section="Games/Action"\
   title="Airstrike" command="/usr/games/airstrike"
diff --git a/debian/patches/series b/debian/patches/series
index b57e4ec..38c7d32 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 fix_paths.diff
+airstrikerc.diff
 manpage.diff
 fix-buffer-overflow.diff
 fix-red-baron-has-unlimited-bombs.diff
diff --git a/debian/rules b/debian/rules
index 347f1fa..5b35022 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,23 +40,18 @@ install: build
 	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 @@ binary-arch: build install
 	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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/airstrike.git