[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.1-8-48-g9372e3f

Simon McVittie smcv at debian.org
Thu Jul 29 20:14:08 UTC 2010


The following commit has been merged in the master branch:
commit f5aa1ea14800264cb1c9079d86d74c4b1f8c7004
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jul 28 21:50:36 2010 +0100

    Refresh patch queue

diff --git a/debian/patches/0002-Fix-segfault-when-deleting-non-existent-ban-address-.patch b/debian/patches/0001-Fix-segfault-when-deleting-non-existent-ban-address-.patch
similarity index 100%
rename from debian/patches/0002-Fix-segfault-when-deleting-non-existent-ban-address-.patch
rename to debian/patches/0001-Fix-segfault-when-deleting-non-existent-ban-address-.patch
diff --git a/debian/patches/0003-Fix-build-and-resulting-binary-on-alpha.patch b/debian/patches/0002-Fix-build-and-resulting-binary-on-alpha.patch
similarity index 97%
rename from debian/patches/0003-Fix-build-and-resulting-binary-on-alpha.patch
rename to debian/patches/0002-Fix-build-and-resulting-binary-on-alpha.patch
index 77cbdd3..16713bd 100644
--- a/debian/patches/0003-Fix-build-and-resulting-binary-on-alpha.patch
+++ b/debian/patches/0002-Fix-build-and-resulting-binary-on-alpha.patch
@@ -8,7 +8,7 @@ Bug-Debian: http://bugs.debian.org/410555
  1 files changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/engine/Makefile b/engine/Makefile
-index 6145bb4..d11257a 100644
+index 979ab89..50e4118 100644
 --- a/engine/Makefile
 +++ b/engine/Makefile
 @@ -216,7 +216,7 @@ MKDIR=mkdir
diff --git a/debian/patches/0004-Remove-hard-wired-build-flags.patch b/debian/patches/0003-Remove-hard-wired-build-flags.patch
similarity index 100%
rename from debian/patches/0004-Remove-hard-wired-build-flags.patch
rename to debian/patches/0003-Remove-hard-wired-build-flags.patch
diff --git a/debian/patches/0005-Build-against-recent-system-speex-and-speexdsp-libra.patch b/debian/patches/0004-Build-against-recent-system-speex-and-speexdsp-libra.patch
similarity index 99%
rename from debian/patches/0005-Build-against-recent-system-speex-and-speexdsp-libra.patch
rename to debian/patches/0004-Build-against-recent-system-speex-and-speexdsp-libra.patch
index de66936..7115df4 100644
--- a/debian/patches/0005-Build-against-recent-system-speex-and-speexdsp-libra.patch
+++ b/debian/patches/0004-Build-against-recent-system-speex-and-speexdsp-libra.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] Build against (recent) system speex and speexdsp libraries
  4 files changed, 59 insertions(+), 49 deletions(-)
 
 diff --git a/engine/Makefile b/engine/Makefile
-index d11257a..0fad630 100644
+index 50e4118..6cb0d41 100644
 --- a/engine/Makefile
 +++ b/engine/Makefile
 @@ -134,7 +134,7 @@ USE_VOIP=1
diff --git a/debian/patches/0006-Fix-FTBFS-on-kFreeBSD.patch b/debian/patches/0005-Fix-FTBFS-on-kFreeBSD.patch
similarity index 100%
rename from debian/patches/0006-Fix-FTBFS-on-kFreeBSD.patch
rename to debian/patches/0005-Fix-FTBFS-on-kFreeBSD.patch
diff --git a/debian/patches/0007-Use-memmove-instead-of-strcpy-for-overlapping-memory.patch b/debian/patches/0006-Use-memmove-instead-of-strcpy-for-overlapping-memory.patch
similarity index 100%
rename from debian/patches/0007-Use-memmove-instead-of-strcpy-for-overlapping-memory.patch
rename to debian/patches/0006-Use-memmove-instead-of-strcpy-for-overlapping-memory.patch
diff --git a/debian/patches/0008-Fix-spelling-error.patch b/debian/patches/0007-Fix-spelling-error.patch
similarity index 100%
rename from debian/patches/0008-Fix-spelling-error.patch
rename to debian/patches/0007-Fix-spelling-error.patch
diff --git a/debian/patches/0009-Add-a-special-vmMagic-that-causes-equivalent-native-.patch b/debian/patches/0008-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
similarity index 100%
rename from debian/patches/0009-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
rename to debian/patches/0008-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
diff --git a/debian/patches/0010-FS_FindDll-new-function-to-go-through-the-search-pat.patch b/debian/patches/0009-FS_FindDll-new-function-to-go-through-the-search-pat.patch
similarity index 100%
rename from debian/patches/0010-FS_FindDll-new-function-to-go-through-the-search-pat.patch
rename to debian/patches/0009-FS_FindDll-new-function-to-go-through-the-search-pat.patch
diff --git a/debian/patches/0011-Sys_LoadDll-use-FS_FindDll.patch b/debian/patches/0010-Sys_LoadDll-use-FS_FindDll.patch
similarity index 100%
rename from debian/patches/0011-Sys_LoadDll-use-FS_FindDll.patch
rename to debian/patches/0010-Sys_LoadDll-use-FS_FindDll.patch
diff --git a/debian/patches/0012-Add-error-markers-to-sources-in-the-mod-SDK-that-are.patch b/debian/patches/0011-Add-error-markers-to-sources-in-the-mod-SDK-that-are.patch
similarity index 100%
rename from debian/patches/0012-Add-error-markers-to-sources-in-the-mod-SDK-that-are.patch
rename to debian/patches/0011-Add-error-markers-to-sources-in-the-mod-SDK-that-are.patch
diff --git a/debian/patches/series b/debian/patches/series
index 06cb4d3..cec115e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,11 @@
-0002-Fix-segfault-when-deleting-non-existent-ban-address-.patch
-0003-Fix-build-and-resulting-binary-on-alpha.patch
-0004-Remove-hard-wired-build-flags.patch
-0005-Build-against-recent-system-speex-and-speexdsp-libra.patch
-0006-Fix-FTBFS-on-kFreeBSD.patch
-0007-Use-memmove-instead-of-strcpy-for-overlapping-memory.patch
-0008-Fix-spelling-error.patch
-0009-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
-0010-FS_FindDll-new-function-to-go-through-the-search-pat.patch
-0011-Sys_LoadDll-use-FS_FindDll.patch
-0012-Add-error-markers-to-sources-in-the-mod-SDK-that-are.patch
+0001-Fix-segfault-when-deleting-non-existent-ban-address-.patch
+0002-Fix-build-and-resulting-binary-on-alpha.patch
+0003-Remove-hard-wired-build-flags.patch
+0004-Build-against-recent-system-speex-and-speexdsp-libra.patch
+0005-Fix-FTBFS-on-kFreeBSD.patch
+0006-Use-memmove-instead-of-strcpy-for-overlapping-memory.patch
+0007-Fix-spelling-error.patch
+0008-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
+0009-FS_FindDll-new-function-to-go-through-the-search-pat.patch
+0010-Sys_LoadDll-use-FS_FindDll.patch
+0011-Add-error-markers-to-sources-in-the-mod-SDK-that-are.patch

-- 
Packaging for the OpenArena engine



More information about the Pkg-games-commits mailing list