r1684 - in packages/trunk/gtkradiant/debian: . patches
Frits Daalmans
fritsd-guest at costa.debian.org
Sun Sep 24 19:44:29 UTC 2006
Author: fritsd-guest
Date: 2006-09-24 19:44:28 +0000 (Sun, 24 Sep 2006)
New Revision: 1684
Added:
packages/trunk/gtkradiant/debian/get_arch.tmp.sh
Removed:
packages/trunk/gtkradiant/debian/patches/60_get_arch.dpatch
Modified:
packages/trunk/gtkradiant/debian/patches/00list
Log:
FTBFS on amd64; took get_arch.tmp.sh script out of its dpatch into debian directory
and added a line for amd64 architecture (apparently it creates radiant.x86).
Added: packages/trunk/gtkradiant/debian/get_arch.tmp.sh
===================================================================
--- packages/trunk/gtkradiant/debian/get_arch.tmp.sh (rev 0)
+++ packages/trunk/gtkradiant/debian/get_arch.tmp.sh 2006-09-24 19:44:28 UTC (rev 1684)
@@ -0,0 +1,33 @@
+#!/bin/bash
+# this script is needed to determine the architecture version
+# in exactly the same way as the scons script, SConstruct
+uname_m=`uname -m`
+g_cpu="$uname_m"
+
+known=0
+if [ "$g_cpu" = "Power Macintosh" ]; then
+ g_cpu="ppc"
+ known=1
+fi
+if [ "$g_cpu" = "ppc" ]; then
+ # g_cpu="ppc"
+ known=1
+fi
+
+if [ `echo $g_cpu |grep -c 'i.86'` -eq 1 ]; then
+ g_cpu="x86"
+ known=1
+fi
+
+# need to verify this one
+if [ `echo $g_cpu |grep -c 'amd64'` -eq 1 ]; then
+ g_cpu="x86"
+ known=1
+fi
+
+if [ $known -eq 0 ]; then
+ g_cpu="cpu"
+fi
+
+( echo "get_arch.tmp.sh: DBG: uname says \"$uname_m\" -> select \"$g_cpu\"" 1>&2 ) >/dev/null
+echo $g_cpu
Property changes on: packages/trunk/gtkradiant/debian/get_arch.tmp.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/trunk/gtkradiant/debian/patches/00list
===================================================================
--- packages/trunk/gtkradiant/debian/patches/00list 2006-09-24 09:59:07 UTC (rev 1683)
+++ packages/trunk/gtkradiant/debian/patches/00list 2006-09-24 19:44:28 UTC (rev 1684)
@@ -4,4 +4,3 @@
20_subversion_ugly_hack.dpatch
30_debian_specific_changes.dpatch
50_minor_warnings.dpatch
-60_get_arch.dpatch
Deleted: packages/trunk/gtkradiant/debian/patches/60_get_arch.dpatch
===================================================================
--- packages/trunk/gtkradiant/debian/patches/60_get_arch.dpatch 2006-09-24 09:59:07 UTC (rev 1683)
+++ packages/trunk/gtkradiant/debian/patches/60_get_arch.dpatch 2006-09-24 19:44:28 UTC (rev 1684)
@@ -1,38 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## get_arch.dpatch by <frits at pontifex2.thuis>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: get_arch
-
- at DPATCH@
-
-Index: get_arch.sh
-===================================================================
---- old/debian/get_arch.tmp.sh (revision 0)
-+++ old/debian/get_arch.tmp.sh (revision 150)
-@@ -0,0 +1,24 @@
-+#!/bin/bash
-+# this script is needed to determine the architecture version
-+# in exactly the same way as the scons script, SConstruct
-+g_cpu=`uname -m`
-+
-+known=0
-+if [ "$g_cpu" = "Power Macintosh" ]; then
-+ g_cpu="ppc"
-+ known=1
-+fi
-+if [ "$g_cpu" = "ppc" ]; then
-+ # g_cpu="ppc"
-+ known=1
-+fi
-+
-+if [ `echo $g_cpu |grep -c 'i.86'` -eq 1 ]; then
-+ g_cpu="x86"
-+ known=1
-+fi
-+if [ $known -eq 0 ]; then
-+ g_cpu="cpu"
-+fi
-+
-+echo $g_cpu
-
More information about the Pkg-games-commits
mailing list