[SCM] team based FPS game - packaging branch, debian, updated. debian/1.1.0-4.1-4-g727db7e

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 727db7e1ec89a9a342de78940b4edbe4526462f5
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jul 12 22:54:50 2010 +0100

    Separate out patches from previous versions into debian/patches

diff --git a/debian/patches/0002-add-upstream-Makefile.patch b/debian/patches/0001-add-upstream-Makefile.patch
similarity index 99%
rename from debian/patches/0002-add-upstream-Makefile.patch
rename to debian/patches/0001-add-upstream-Makefile.patch
index 75a8a1e..2be7243 100644
--- a/debian/patches/0002-add-upstream-Makefile.patch
+++ b/debian/patches/0001-add-upstream-Makefile.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
 
 diff --git a/Makefile b/Makefile
 new file mode 100644
-index 0000000..de9a1e4
+index 0000000..989461c
 --- /dev/null
 +++ b/Makefile
 @@ -0,0 +1,1537 @@
@@ -47,7 +47,7 @@ index 0000000..de9a1e4
 +BUILD_CLIENT_SMP =
 +BUILD_SERVER     =
 +BUILD_GAME_SO    =
-+BUILD_GAME_QVM   = 0
++BUILD_GAME_QVM   =
 +
 +#############################################################################
 +#
@@ -725,7 +725,7 @@ index 0000000..de9a1e4
 +endif
 +
 +build_release: B=$(BR)
-+build_release: makedirs #tools
++build_release: makedirs tools
 +	$(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(RELEASE_CFLAGS) $(DEPEND_CFLAGS)"
 +ifeq ($(BUILD_MASTER_SERVER),1)
 +	$(MAKE) -C $(MASTERDIR) release
@@ -1523,7 +1523,7 @@ index 0000000..de9a1e4
 +	$(MAKE) -C $(TOOLSDIR)/asm clean uninstall
 +	$(MAKE) -C $(TOOLSDIR)/lcc clean uninstall
 +
-+distclean: clean #toolsclean
++distclean: clean toolsclean
 +	rm -rf $(BUILD_DIR)
 +
 +installer: build_release
diff --git a/debian/patches/0002-Avoid-building-game-logic-as-QVMs.patch b/debian/patches/0002-Avoid-building-game-logic-as-QVMs.patch
new file mode 100644
index 0000000..fe8fc48
--- /dev/null
+++ b/debian/patches/0002-Avoid-building-game-logic-as-QVMs.patch
@@ -0,0 +1,22 @@
+From: Damien Laniel <heretik at tuxfamily.org>
+Date: Mon, 12 Jul 2010 22:50:45 +0100
+Subject: [PATCH] Avoid building game logic as QVMs
+
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 989461c..5be1e5a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,7 +31,7 @@ BUILD_CLIENT     =
+ BUILD_CLIENT_SMP =
+ BUILD_SERVER     =
+ BUILD_GAME_SO    =
+-BUILD_GAME_QVM   =
++BUILD_GAME_QVM   = 0
+ 
+ #############################################################################
+ #
+-- 
diff --git a/debian/patches/0003-Don-t-build-q3lcc.patch b/debian/patches/0003-Don-t-build-q3lcc.patch
new file mode 100644
index 0000000..146c924
--- /dev/null
+++ b/debian/patches/0003-Don-t-build-q3lcc.patch
@@ -0,0 +1,31 @@
+From: Damien Laniel <heretik at tuxfamily.org>
+Date: Mon, 12 Jul 2010 22:51:19 +0100
+Subject: [PATCH] Don't build q3lcc
+
+---
+ Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 5be1e5a..de9a1e4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -709,7 +709,7 @@ ifeq ($(BUILD_MASTER_SERVER),1)
+ endif
+ 
+ build_release: B=$(BR)
+-build_release: makedirs tools
++build_release: makedirs #tools
+ 	$(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(RELEASE_CFLAGS) $(DEPEND_CFLAGS)"
+ ifeq ($(BUILD_MASTER_SERVER),1)
+ 	$(MAKE) -C $(MASTERDIR) release
+@@ -1507,7 +1507,7 @@ toolsclean:
+ 	$(MAKE) -C $(TOOLSDIR)/asm clean uninstall
+ 	$(MAKE) -C $(TOOLSDIR)/lcc clean uninstall
+ 
+-distclean: clean toolsclean
++distclean: clean #toolsclean
+ 	rm -rf $(BUILD_DIR)
+ 
+ installer: build_release
+-- 
diff --git a/debian/patches/0001-Use-USER-as-default-player-name.patch b/debian/patches/0004-Use-USER-as-default-player-name.patch
similarity index 100%
rename from debian/patches/0001-Use-USER-as-default-player-name.patch
rename to debian/patches/0004-Use-USER-as-default-player-name.patch
diff --git a/debian/patches/0003-Applied-the-patch-to-remove-the-warning-about-OP_BLO.patch b/debian/patches/0005-Applied-the-patch-to-remove-the-warning-about-OP_BLO.patch
similarity index 100%
rename from debian/patches/0003-Applied-the-patch-to-remove-the-warning-about-OP_BLO.patch
rename to debian/patches/0005-Applied-the-patch-to-remove-the-warning-about-OP_BLO.patch
diff --git a/debian/patches/series b/debian/patches/series
index bf8728f..5132cb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
-0001-Use-USER-as-default-player-name.patch
-0002-add-upstream-Makefile.patch
-0003-Applied-the-patch-to-remove-the-warning-about-OP_BLO.patch
+0001-add-upstream-Makefile.patch
+0002-Avoid-building-game-logic-as-QVMs.patch
+0003-Don-t-build-q3lcc.patch
+0004-Use-USER-as-default-player-name.patch
+0005-Applied-the-patch-to-remove-the-warning-about-OP_BLO.patch

-- 
team based FPS game - packaging