[SCM] Packaging for the Nexuiz engine branch, master, updated. debian/2.5.2-1-5-ga2abe12

Bruno Kleinert fuddl at tauware.de
Thu Oct 22 15:25:35 UTC 2009


The following commit has been merged in the master branch:
commit a2abe12967635b21f742e9551f2f19d2c8a38f47
Author: Bruno Kleinert <fuddl at tauware.de>
Date:   Thu Oct 22 17:24:52 2009 +0200

    Drop obsolete Debian patches

diff --git a/debian/changelog b/debian/changelog
index 06240ef..bdeb063 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,13 @@ nexuiz (2.5.2-2) UNRELEASED; urgency=low
   * Migrate from Subversion to Git and Update Vcs-* fields in control file
   * Build depend on debhelper 7. We're using dh_prep instead of dh_clean -k in
     debian/rules, now and dh_prep requires debhelper 7
+  * Drop obsolete patches:
+    * 10_ambiguous_keyboard_bindings.patch: It used to patch documentation files
+      which are now in nexuiz-data
+    * 20_nostrip_support.patch: It removed the strip command from the upstream
+      makefile, but we're building the debug targets, now.
 
- -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Thu, 22 Oct 2009 17:01:58 +0200
+ -- Bruno "Fuddl" Kleinert <fuddl at debian.org>  Thu, 22 Oct 2009 17:23:21 +0200
 
 nexuiz (2.5.2-1) unstable; urgency=low
 
diff --git a/debian/patches/10_ambiguous_keyboard_bindings.patch b/debian/patches/10_ambiguous_keyboard_bindings.patch
deleted file mode 100755
index aac35fc..0000000
--- a/debian/patches/10_ambiguous_keyboard_bindings.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_ambiguous_keyboard_bindings.dpatch by Bruno "Fuddl" Kleinert <fuddl at tauware.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't suggest ambiguous and deprecated keys, as we removed them from nexuiz-data's default.cfg
-
-Index: nexuiz-2.5.1/Docs/faq.html
-===================================================================
---- nexuiz-2.5.1.orig/Docs/faq.html	2009-03-31 07:24:19.000000000 +0200
-+++ nexuiz-2.5.1/Docs/faq.html	2009-09-11 17:21:39.000000000 +0200
-@@ -226,7 +226,7 @@
- <!--End Section 2-->
- <h3><a name="How do I open the console?">How do I open the console?</a></h3>
- <p class="Body">
--Press <tt>[shift]+[escape]</tt>.  To close it press <tt>[escape]</tt>.  While playing ` or ^ will also open the console.
-+Press <tt>[shift]+[escape]</tt>.  To close it press <tt>[escape]</tt>.
- </p>
- <!--End Section 2-->
- <h3><a name="What console commands/variables are there?">What console commands/variables are there?</a></h3>
diff --git a/debian/patches/20_nostrip_support.patch b/debian/patches/20_nostrip_support.patch
deleted file mode 100644
index 94d4055..0000000
--- a/debian/patches/20_nostrip_support.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_nostrip_support.dpatch by Bruno "Fuddl" Kleinert <fuddl at tauware.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't strip debug symbols from binaries by default
-
- at DPATCH@
-diff -urNad nexuiz-2.4~/darkplaces/makefile.inc nexuiz-2.4/darkplaces/makefile.inc
---- nexuiz-2.4~/darkplaces/makefile.inc	2008-01-18 16:38:00.000000000 +0100
-+++ nexuiz-2.4/darkplaces/makefile.inc	2008-03-02 23:57:12.637218522 +0100
-@@ -399,7 +399,6 @@
- 		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
- 		CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\
- 		LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)"
--	$(STRIP) $(EXE)
- 
- snd_modplug.o: snd_modplug.c
- 	$(DO_CC) $(CFLAGS_SND_MODPLUG)

-- 
Packaging for the Nexuiz engine



More information about the Pkg-games-commits mailing list