Author: arand-guest
Date: 2012-01-24 15:32:37 +0000 (Tue, 24 Jan 2012)
New Revision: 13180
Added:
non-free/packages/trunk/assaultcube/debian/patches/build-with-debug-symbols.patch
non-free/packages/trunk/assaultcube/debian/patches/build-with-lX11.patch
non-free/packages/trunk/assaultcube/debian/patches/fix-clean-target.patch
non-free/packages/trunk/assaultcube/debian/patches/fix-install-target.patch
Removed:
non-free/packages/trunk/assaultcube/debian/patches/10-fix-install-target.patch
non-free/packages/trunk/assaultcube/debian/patches/20-fix-clean-target.patch
non-free/packages/trunk/assaultcube/debian/patches/30-build-with-debug-symbols.patch
non-free/packages/trunk/assaultcube/debian/patches/40-build-with-lX11.patch
Modified:
non-free/packages/trunk/assaultcube/debian/patches/series
Log:
Rename patches, no numbering required
Deleted:
non-free/packages/trunk/assaultcube/debian/patches/10-fix-install-target.patch
===================================================================
---
non-free/packages/trunk/assaultcube/debian/patches/10-fix-install-target.patch
2012-01-24 14:57:55 UTC (rev 13179)
+++
non-free/packages/trunk/assaultcube/debian/patches/10-fix-install-target.patch
2012-01-24 15:32:37 UTC (rev 13180)
@@ -1,28 +0,0 @@
-Description: Force creating install target
- Since the flder bin/ is removed from the orig tarball for Debian (since we
- recompile anyways), we need to use install instead of cp in order to recreate
- the bin/ directory.
- .
- This is also kind of useful when recompiling oneself.
-Author: Martin Erik Werner <[email protected]>
-Forwarded:
https://sourceforge.net/tracker/?func=detail&aid=3430221&group_id=123597&atid=697091
-Last-Update: 2011-10-28
-
---- a/source/src/Makefile
-+++ b/source/src/Makefile
-@@ -174,13 +174,13 @@
- $(CXX) $(CXXFLAGS) -o ac_master $(MASTER_OBJS) $(SERVER_LIBS)
-
- client_install: client
-- cp ac_client ../../bin_unix/$(PLATFORM_PREFIX)_client
-+ install -D ac_client ../../bin_unix/$(PLATFORM_PREFIX)_client
- #ifneq (,$(STRIP))
- # $(STRIP) ../../bin_unix/$(PLATFORM_PREFIX)_client
- #endif
-
- server_install: server
-- cp ac_server ../../bin_unix/$(PLATFORM_PREFIX)_server
-+ install -D ac_server ../../bin_unix/$(PLATFORM_PREFIX)_server
- #ifneq (,$(STRIP))
- # $(STRIP) ../../bin_unix/$(PLATFORM_PREFIX)_server
- #endif
Deleted:
non-free/packages/trunk/assaultcube/debian/patches/20-fix-clean-target.patch
===================================================================
---
non-free/packages/trunk/assaultcube/debian/patches/20-fix-clean-target.patch
2012-01-24 14:57:55 UTC (rev 13179)
+++
non-free/packages/trunk/assaultcube/debian/patches/20-fix-clean-target.patch
2012-01-24 15:32:37 UTC (rev 13180)
@@ -1,23 +0,0 @@
-Description: Clean Enet in AC clean target
- On Debian we recompile the Enet submodule as well, hence we need to clean it
- properly.
- .
- This may also be useful when recompiling oneself.
-Author: Martin Erik Werner <[email protected]>
-Forwarded:
https://sourceforge.net/tracker/?func=detail&aid=3430222&group_id=123597&atid=697091
-Last-Update: 2011-10-28
-
---- a/source/src/Makefile
-+++ b/source/src/Makefile
-@@ -128,9 +128,9 @@
- -$(MAKE) -C ../enet all
-
- clean-enet: ../enet/Makefile
-- $(MAKE) -C ../enet/ clean
-+ $(MAKE) -C ../enet/ distclean
-
--clean:
-+clean: clean-enet
- -$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS)
ac_client ac_server ac_master
- # -$(MAKE) -C ../enet/ clean
-
Deleted:
non-free/packages/trunk/assaultcube/debian/patches/30-build-with-debug-symbols.patch
===================================================================
---
non-free/packages/trunk/assaultcube/debian/patches/30-build-with-debug-symbols.patch
2012-01-24 14:57:55 UTC (rev 13179)
+++
non-free/packages/trunk/assaultcube/debian/patches/30-build-with-debug-symbols.patch
2012-01-24 15:32:37 UTC (rev 13180)
@@ -1,16 +0,0 @@
-Description: Build with debug symbols
- On Debian we compile with debug symbols for debug packages, and strip for the
- normal packages, hence we need build with debugging symbols.
-Author: Martin Erik Werner <[email protected]>
-Forwarded: not-needed
-Last-Update: 2011-10-28
-
---- a/source/src/Makefile
-+++ b/source/src/Makefile
-@@ -1,5 +1,5 @@
- //CXX=g++-gcc-4.2.3
--CXXFLAGS= -O3 -fomit-frame-pointer
-+CXXFLAGS= -O3 -fomit-frame-pointer -g
- override CXXFLAGS+= -Wall -fsigned-char
-
- PLATFORM= $(shell uname -s)
Deleted:
non-free/packages/trunk/assaultcube/debian/patches/40-build-with-lX11.patch
===================================================================
--- non-free/packages/trunk/assaultcube/debian/patches/40-build-with-lX11.patch
2012-01-24 14:57:55 UTC (rev 13179)
+++ non-free/packages/trunk/assaultcube/debian/patches/40-build-with-lX11.patch
2012-01-24 15:32:37 UTC (rev 13180)
@@ -1,18 +0,0 @@
-Description: Link to lX11
- Linking against X11 fixes a build failure:
- /usr/bin/ld: console.o: undefined reference to symbol 'XFree'
-Author: Gonéri Le Bouder <[email protected]>
-Forwarded:
https://sourceforge.net/tracker/?func=detail&aid=3430223&group_id=123597&atid=697091
-Last-Update: 2011-10-28
-
---- a/source/src/Makefile
-+++ b/source/src/Makefile
-@@ -26,7 +26,7 @@
- override CXXFLAGS+= -rdynamic
- CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter
../include
- # -lSDL_ttf
--CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) `sdl-config --libs`
-lSDL_image -lz -lGL -lopenal -lvorbisfile
-+CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) `sdl-config --libs`
-lSDL_image -lz -lGL -lopenal -lvorbisfile -lX11
- endif
-
- CLIENT_OBJS= \
Copied:
non-free/packages/trunk/assaultcube/debian/patches/build-with-debug-symbols.patch
(from rev 13176,
non-free/packages/trunk/assaultcube/debian/patches/30-build-with-debug-symbols.patch)
===================================================================
---
non-free/packages/trunk/assaultcube/debian/patches/build-with-debug-symbols.patch
(rev 0)
+++
non-free/packages/trunk/assaultcube/debian/patches/build-with-debug-symbols.patch
2012-01-24 15:32:37 UTC (rev 13180)
@@ -0,0 +1,16 @@
+Description: Build with debug symbols
+ On Debian we compile with debug symbols for debug packages, and strip for the
+ normal packages, hence we need build with debugging symbols.
+Author: Martin Erik Werner <[email protected]>
+Forwarded: not-needed
+Last-Update: 2011-10-28
+
+--- a/source/src/Makefile
++++ b/source/src/Makefile
+@@ -1,5 +1,5 @@
+ //CXX=g++-gcc-4.2.3
+-CXXFLAGS= -O3 -fomit-frame-pointer
++CXXFLAGS= -O3 -fomit-frame-pointer -g
+ override CXXFLAGS+= -Wall -fsigned-char
+
+ PLATFORM= $(shell uname -s)
Copied:
non-free/packages/trunk/assaultcube/debian/patches/build-with-lX11.patch (from
rev 13176,
non-free/packages/trunk/assaultcube/debian/patches/40-build-with-lX11.patch)
===================================================================
--- non-free/packages/trunk/assaultcube/debian/patches/build-with-lX11.patch
(rev 0)
+++ non-free/packages/trunk/assaultcube/debian/patches/build-with-lX11.patch
2012-01-24 15:32:37 UTC (rev 13180)
@@ -0,0 +1,18 @@
+Description: Link to lX11
+ Linking against X11 fixes a build failure:
+ /usr/bin/ld: console.o: undefined reference to symbol 'XFree'
+Author: Gonéri Le Bouder <[email protected]>
+Forwarded:
https://sourceforge.net/tracker/?func=detail&aid=3430223&group_id=123597&atid=697091
+Last-Update: 2011-10-28
+
+--- a/source/src/Makefile
++++ b/source/src/Makefile
+@@ -26,7 +26,7 @@
+ override CXXFLAGS+= -rdynamic
+ CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter
../include
+ # -lSDL_ttf
+-CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) `sdl-config --libs`
-lSDL_image -lz -lGL -lopenal -lvorbisfile
++CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) `sdl-config --libs`
-lSDL_image -lz -lGL -lopenal -lvorbisfile -lX11
+ endif
+
+ CLIENT_OBJS= \
Copied:
non-free/packages/trunk/assaultcube/debian/patches/fix-clean-target.patch (from
rev 13176,
non-free/packages/trunk/assaultcube/debian/patches/20-fix-clean-target.patch)
===================================================================
--- non-free/packages/trunk/assaultcube/debian/patches/fix-clean-target.patch
(rev 0)
+++ non-free/packages/trunk/assaultcube/debian/patches/fix-clean-target.patch
2012-01-24 15:32:37 UTC (rev 13180)
@@ -0,0 +1,23 @@
+Description: Clean Enet in AC clean target
+ On Debian we recompile the Enet submodule as well, hence we need to clean it
+ properly.
+ .
+ This may also be useful when recompiling oneself.
+Author: Martin Erik Werner <[email protected]>
+Forwarded:
https://sourceforge.net/tracker/?func=detail&aid=3430222&group_id=123597&atid=697091
+Last-Update: 2011-10-28
+
+--- a/source/src/Makefile
++++ b/source/src/Makefile
+@@ -128,9 +128,9 @@
+ -$(MAKE) -C ../enet all
+
+ clean-enet: ../enet/Makefile
+- $(MAKE) -C ../enet/ clean
++ $(MAKE) -C ../enet/ distclean
+
+-clean:
++clean: clean-enet
+ -$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS)
ac_client ac_server ac_master
+ # -$(MAKE) -C ../enet/ clean
+
Copied:
non-free/packages/trunk/assaultcube/debian/patches/fix-install-target.patch
(from rev 13176,
non-free/packages/trunk/assaultcube/debian/patches/10-fix-install-target.patch)
===================================================================
--- non-free/packages/trunk/assaultcube/debian/patches/fix-install-target.patch
(rev 0)
+++ non-free/packages/trunk/assaultcube/debian/patches/fix-install-target.patch
2012-01-24 15:32:37 UTC (rev 13180)
@@ -0,0 +1,28 @@
+Description: Force creating install target
+ Since the flder bin/ is removed from the orig tarball for Debian (since we
+ recompile anyways), we need to use install instead of cp in order to recreate
+ the bin/ directory.
+ .
+ This is also kind of useful when recompiling oneself.
+Author: Martin Erik Werner <[email protected]>
+Forwarded:
https://sourceforge.net/tracker/?func=detail&aid=3430221&group_id=123597&atid=697091
+Last-Update: 2011-10-28
+
+--- a/source/src/Makefile
++++ b/source/src/Makefile
+@@ -174,13 +174,13 @@
+ $(CXX) $(CXXFLAGS) -o ac_master $(MASTER_OBJS) $(SERVER_LIBS)
+
+ client_install: client
+- cp ac_client ../../bin_unix/$(PLATFORM_PREFIX)_client
++ install -D ac_client ../../bin_unix/$(PLATFORM_PREFIX)_client
+ #ifneq (,$(STRIP))
+ # $(STRIP) ../../bin_unix/$(PLATFORM_PREFIX)_client
+ #endif
+
+ server_install: server
+- cp ac_server ../../bin_unix/$(PLATFORM_PREFIX)_server
++ install -D ac_server ../../bin_unix/$(PLATFORM_PREFIX)_server
+ #ifneq (,$(STRIP))
+ # $(STRIP) ../../bin_unix/$(PLATFORM_PREFIX)_server
+ #endif
Modified: non-free/packages/trunk/assaultcube/debian/patches/series
===================================================================
--- non-free/packages/trunk/assaultcube/debian/patches/series 2012-01-24
14:57:55 UTC (rev 13179)
+++ non-free/packages/trunk/assaultcube/debian/patches/series 2012-01-24
15:32:37 UTC (rev 13180)
@@ -1,4 +1,4 @@
-10-fix-install-target.patch
-20-fix-clean-target.patch
-30-build-with-debug-symbols.patch
-40-build-with-lX11.patch
+fix-install-target.patch
+fix-clean-target.patch
+build-with-debug-symbols.patch
+build-with-lX11.patch
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
