r13183 - in non-free/packages/trunk/assaultcube/debian: . scripts

[Martin Werner]

Author: arand-guest
Date: 2012-01-24 16:04:55 +0000 (Tue, 24 Jan 2012)
New Revision: 13183

Modified:
   non-free/packages/trunk/assaultcube/debian/assaultcube.install
   non-free/packages/trunk/assaultcube/debian/rules
   non-free/packages/trunk/assaultcube/debian/scripts/assaultcube
   non-free/packages/trunk/assaultcube/debian/scripts/assaultcube-server
Log:
Install binaries with icon-matching names

Modified: non-free/packages/trunk/assaultcube/debian/assaultcube.install
===================================================================
--- non-free/packages/trunk/assaultcube/debian/assaultcube.install	2012-01-24 15:32:41 UTC (rev 13182)
+++ non-free/packages/trunk/assaultcube/debian/assaultcube.install	2012-01-24 16:04:55 UTC (rev 13183)
@@ -1,5 +1,5 @@
-source/src/ac_client /usr/lib/games/assaultcube
-source/src/ac_server /usr/lib/games/assaultcube
+usr/lib/games/assaultcube/assaultcube
+usr/lib/games/assaultcube/assaultcube-server
 debian/scripts/assaultcube /usr/games
 debian/scripts/assaultcube-server /usr/games
 debian/assaultcube.desktop /usr/share/applications

Modified: non-free/packages/trunk/assaultcube/debian/rules
===================================================================
--- non-free/packages/trunk/assaultcube/debian/rules	2012-01-24 15:32:41 UTC (rev 13182)
+++ non-free/packages/trunk/assaultcube/debian/rules	2012-01-24 16:04:55 UTC (rev 13183)
@@ -8,6 +8,12 @@
 %:
 	dh $@ --sourcedirectory=source/src
 
+override_dh_auto_install:
+	install -D source/src/ac_client \
+		debian/tmp/usr/lib/games/assaultcube/assaultcube
+	install -D source/src/ac_server \
+		debian/tmp/usr/lib/games/assaultcube/assaultcube-server
+
 VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-+]+).*,\1,p')
 DEB_VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 DIR=assaultcube-$(VER).orig

Modified: non-free/packages/trunk/assaultcube/debian/scripts/assaultcube
===================================================================
--- non-free/packages/trunk/assaultcube/debian/scripts/assaultcube	2012-01-24 15:32:41 UTC (rev 13182)
+++ non-free/packages/trunk/assaultcube/debian/scripts/assaultcube	2012-01-24 16:04:55 UTC (rev 13183)
@@ -9,5 +9,4 @@
 
 AC_OPTIONS="--home=${HOME}/.assaultcube_v1.104 --init"
 cd /usr/lib/games/assaultcube
-exec ./ac_client ${AC_OPTIONS} ${1+"$@"}
-# ${1+"$@"} is a portability hack, keyword "wrapper script"
+exec ./assaultcube ${AC_OPTIONS} ${1+"$@"}

Modified: non-free/packages/trunk/assaultcube/debian/scripts/assaultcube-server
===================================================================
--- non-free/packages/trunk/assaultcube/debian/scripts/assaultcube-server	2012-01-24 15:32:41 UTC (rev 13182)
+++ non-free/packages/trunk/assaultcube/debian/scripts/assaultcube-server	2012-01-24 16:04:55 UTC (rev 13183)
@@ -9,5 +9,4 @@
 
 AC_OPTIONS=""
 cd /usr/lib/games/assaultcube
-exec ./ac_server ${AC_OPTIONS} ${1+"$@"}
-# ${1+"$@"} is a portability hack, keyword "wrapper script"
+exec ./assaultcube-server ${AC_OPTIONS} ${1+"$@"}