r15293 - in packages/trunk/0ad/debian: . patches

[Vincent Cheng]

Author: vcheng
Date: 2014-10-14 03:55:31 +0000 (Tue, 14 Oct 2014)
New Revision: 15293

Added:
   packages/trunk/0ad/debian/patches/fix-bindir.patch
Modified:
   packages/trunk/0ad/debian/changelog
   packages/trunk/0ad/debian/patches/series
Log:
0ad: Add fix-bindir.patch


Modified: packages/trunk/0ad/debian/changelog
===================================================================
--- packages/trunk/0ad/debian/changelog	2014-10-14 03:27:45 UTC (rev 15292)
+++ packages/trunk/0ad/debian/changelog	2014-10-14 03:55:31 UTC (rev 15293)
@@ -4,6 +4,7 @@
     - Drop debian/patches/{support_miniupnpc_1.9.patch,fix_gcc4.9_ftbfs.patch}:
       applied upstream.
     - Add debian/patches/allow-build-with-root.patch.
+    - Add debian/patches/fix-bindir.patch. (LP: #1380737)
     - Refresh remaining patches.
   * Update Standards version to 3.9.6, no changes required.
 

Added: packages/trunk/0ad/debian/patches/fix-bindir.patch
===================================================================
--- packages/trunk/0ad/debian/patches/fix-bindir.patch	                        (rev 0)
+++ packages/trunk/0ad/debian/patches/fix-bindir.patch	2014-10-14 03:55:31 UTC (rev 15293)
@@ -0,0 +1,21 @@
+Description: Fix search path for pyrogenesis
+ Modify launcher script to execute /usr/games/pyrogenesis if /usr/games is
+ not in the user's $PATH.
+Forwarded: http://trac.wildfiregames.com/ticket/1424
+Author: Vincent Cheng <vcheng at debian.org>
+Bug-Debian: https://bugs.debian.org/679033
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1380737
+Last-Update: 2014-10-13
+
+--- a/build/resources/0ad.sh
++++ b/build/resources/0ad.sh
+@@ -3,6 +3,9 @@
+ pyrogenesis=$(which pyrogenesis 2> /dev/null)
+ if [ -x "$pyrogenesis" ] ; then
+   "$pyrogenesis" "$@"
++elif [ -x /usr/games/pyrogenesis ] ; then
++  # Fallback in case /usr/games is not in $PATH; see #679033 and LP: #1380737
++  /usr/games/pyrogenesis "$@"
+ else
+   echo "Error: pyrogenesis not found in ($PATH)"
+   exit 1

Modified: packages/trunk/0ad/debian/patches/series
===================================================================
--- packages/trunk/0ad/debian/patches/series	2014-10-14 03:27:45 UTC (rev 15292)
+++ packages/trunk/0ad/debian/patches/series	2014-10-14 03:55:31 UTC (rev 15293)
@@ -1,2 +1,3 @@
 enable-hardening-relro.patch
 allow-build-with-root.patch
+fix-bindir.patch