r2952 - in packages/trunk/warsow/debian: . patches scripts

[Andres Mejia]

Author: ceros-guest
Date: 2007-06-16 20:18:03 +0000 (Sat, 16 Jun 2007)
New Revision: 2952

Modified:
   packages/trunk/warsow/debian/patches/makefile_modifications.dpatch
   packages/trunk/warsow/debian/scripts/warsow
   packages/trunk/warsow/debian/scripts/warsow-server
   packages/trunk/warsow/debian/warsow-server.install
   packages/trunk/warsow/debian/warsow.install
Log:
Fixing a problem where unusable binaries were being built.

Modified: packages/trunk/warsow/debian/patches/makefile_modifications.dpatch
===================================================================
--- packages/trunk/warsow/debian/patches/makefile_modifications.dpatch	2007-06-16 17:09:03 UTC (rev 2951)
+++ packages/trunk/warsow/debian/patches/makefile_modifications.dpatch	2007-06-16 20:18:03 UTC (rev 2952)
@@ -27,27 +27,18 @@
 
 --- source/Makefile~	2007-06-15 21:13:12.000000000 -0400
 +++ source/Makefile	2007-06-16 00:32:35.000000000 -0400
-@@ -32,22 +32,19 @@
- LD=i586-mingw32msvc-gcc
- else
- CC?=gcc
--LD=gcc
-+LD?=gcc
+@@ -35,8 +35,8 @@
+ LD=gcc
  
--# this nice line comes from the linux kernel makefile
+ # this nice line comes from the linux kernel makefile
 -BASE_ARCH:=$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
 -OS=$(shell uname)
-+# We'll use dpkg-architecture to determine the next three variables
 +BASE_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 +OS=$(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-+DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
  
--ifeq ($(OS),FreeBSD)
--ARCH=freebsd_$(BASE_ARCH)
--else
- ARCH=$(BASE_ARCH)
--endif
- 
+ ifeq ($(OS),FreeBSD)
+ ARCH=freebsd_$(BASE_ARCH)
+@@ -47,7 +47,7 @@
  SHARED_LIBRARY_EXTENSION=so
  endif
  
@@ -56,13 +47,13 @@
  BINDIR=release
  
  DEPENDFILE_CLIENT=$(BUILDDIR)/client/Makefile.d
-@@ -96,11 +93,11 @@
+@@ -96,11 +96,11 @@
  
  CLIENT_EXE=warsow_$(ARCH).exe
  SERVER_EXE=wsw_server_$(ARCH).exe
 -else # USE_MINGW
 -LOCALBASE?=/usr/local
-+else # When ($(USE_MINGW),NO)
++else # when USE_MINGW=NO
 +#LOCALBASE?=/usr/local //shouldn't be using /usr/local
  X11BASE?=/usr/X11R6
  
@@ -71,21 +62,15 @@
  CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG
  CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
  ifeq ($(DEBUG_BUILD),YES)
-@@ -113,17 +110,18 @@
- CFLAGS_DED=-DDEDICATED_ONLY -DC_ONLY
+@@ -114,16 +114,12 @@
  CFLAGS_MODULE=-DPIC -fPIC
  
-+# Adding all possible paths to libgcc.a for linking
-+GCC_SEARCH_PATHS=-L/usr/lib/gcc/$(DEB_BUILD_GNU_TYPE)/4.1.2 \
-+		-L/usr/lib/gcc/$(DEB_BUILD_GNU_TYPE)/4.1.1 \
-+		-L/usr/lib/gcc/$(DEB_BUILD_GNU_TYPE)/4.1
-+
  ifeq ($(OS),FreeBSD)
 -LDFLAGS_COMMON=-L/usr/local/lib -lm
 +LDFLAGS_COMMON=-L/usr/lib -lm
  else
 -LDFLAGS_COMMON=-L/usr/local/lib -ldl -lm
-+LDFLAGS_COMMON=-L/usr/lib $(GCC_SEARCH_PATHS) -ldl -lm -lc -lgcc
++LDFLAGS_COMMON=-L/usr/lib -ldl -lm
  endif
  
 -ifeq ($(ARCH),x86_64)
@@ -96,16 +81,14 @@
  
  LDFLAGS_CLIENT=-ljpeg -lz -L$(X11BASE)/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm -lXinerama $(shell curl-config --libs)
  LDFLAGS_DED=-lz
-@@ -149,9 +147,9 @@
+@@ -149,8 +145,8 @@
  LDFLAGS_QF=$(shell $(SDL_CONFIG) --libs) -lvorbisfile
  endif # BUILD_SND_QF
  
 -CLIENT_EXE=warsow.$(ARCH)
 -SERVER_EXE=wsw_server.$(ARCH)
--endif # USE_MINGW
-+CLIENT_EXE=warsow.bin
-+SERVER_EXE=wsw_server.bin
-+endif # end if statement of ($(USE_MINGW),YES)
++CLIENT_EXE=warsow_bin
++SERVER_EXE=wsw_server_bin
+ endif # USE_MINGW
  
  ######################################################################################################
- # Helper functions

Modified: packages/trunk/warsow/debian/scripts/warsow
===================================================================
--- packages/trunk/warsow/debian/scripts/warsow	2007-06-16 17:09:03 UTC (rev 2951)
+++ packages/trunk/warsow/debian/scripts/warsow	2007-06-16 20:18:03 UTC (rev 2952)
@@ -36,4 +36,4 @@
 		;;
 esac
 
-exec /usr/lib/games/warsow/warsow.bin $PARAMS "$@"
+exec /usr/lib/games/warsow/warsow_bin $PARAMS "$@"

Modified: packages/trunk/warsow/debian/scripts/warsow-server
===================================================================
--- packages/trunk/warsow/debian/scripts/warsow-server	2007-06-16 17:09:03 UTC (rev 2951)
+++ packages/trunk/warsow/debian/scripts/warsow-server	2007-06-16 20:18:03 UTC (rev 2952)
@@ -36,4 +36,4 @@
 		;;
 esac
 
-exec /usr/lib/games/warsow/wsw_server.bin $PARAMS "$@"
+exec /usr/lib/games/warsow/wsw_server_bin $PARAMS "$@"

Modified: packages/trunk/warsow/debian/warsow-server.install
===================================================================
--- packages/trunk/warsow/debian/warsow-server.install	2007-06-16 17:09:03 UTC (rev 2951)
+++ packages/trunk/warsow/debian/warsow-server.install	2007-06-16 20:18:03 UTC (rev 2952)
@@ -1,2 +1,2 @@
-source/release/wsw_server.bin usr/lib/games/warsow
+source/release/wsw_server_bin usr/lib/games/warsow
 debian/scripts/warsow-server usr/games

Modified: packages/trunk/warsow/debian/warsow.install
===================================================================
--- packages/trunk/warsow/debian/warsow.install	2007-06-16 17:09:03 UTC (rev 2951)
+++ packages/trunk/warsow/debian/warsow.install	2007-06-16 20:18:03 UTC (rev 2952)
@@ -1,4 +1,4 @@
-source/release/warsow.bin usr/lib/games/warsow
+source/release/warsow_bin usr/lib/games/warsow
 source/release/libs usr/lib/games/warsow
 source/release/basewsw usr/lib/games/warsow
 debian/scripts/warsow usr/games