The following commit has been merged in the master branch:
commit a30758b5684ba2efeab85f1bd7b69b73ff0bc2a2
Author: David Banks <[email protected]>
Date: Tue Mar 20 08:02:52 2012 +0000
refresh patch
diff --git a/debian/changelog b/debian/changelog
index 5c16c14..f8fa06b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+quakespasm (0.85.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * Refresh support-user-directories.patch.
+
+ -- David Banks <[email protected]> Tue, 20 Mar 2012 07:50:55 +0000
+
quakespasm (0.85.6-2) unstable; urgency=low
* Fix FTBFS on kFreeBSD due to different socket struct length.
diff --git a/debian/patches/support-user-directories.patch
b/debian/patches/support-user-directories.patch
index 83fde4a..0cb6a96 100644
--- a/debian/patches/support-user-directories.patch
+++ b/debian/patches/support-user-directories.patch
@@ -3,9 +3,9 @@ Description: Support user directories for game data and
configuration
directories under ~/.quakespasm/id1 (more generally, ~/.quakespasm/<game>).
Data is structured in the same way as the regular Quake data directories.
From: Ozkan Sezer <[email protected]>
---- quakespasm.orig/Quake/common.c
-+++ quakespasm/Quake/common.c
-@@ -1846,32 +1846,34 @@
+--- a/Quake/common.c
++++ b/Quake/common.c
+@@ -1848,32 +1848,34 @@
COM_AddGameDirectory -- johnfitz -- modified based on topaz's tutorial
=================
*/
@@ -44,7 +44,7 @@ From: Ozkan Sezer <[email protected]>
pak = COM_LoadPackFile (pakfile);
if (!pak)
break;
-@@ -1881,6 +1883,14 @@
+@@ -1883,6 +1885,14 @@
search->next = com_searchpaths;
com_searchpaths = search;
}
@@ -59,7 +59,7 @@ From: Ozkan Sezer <[email protected]>
}
#if defined(USE_QS_CONBACK)
-@@ -1935,8 +1945,7 @@
+@@ -1937,8 +1947,7 @@
}
// start up with GAMENAME by default (id1)
@@ -69,7 +69,7 @@ From: Ozkan Sezer <[email protected]>
#if defined(USE_QS_CONBACK)
if (!fitzmode)
-@@ -1950,17 +1959,17 @@
+@@ -1952,17 +1961,17 @@
com_nummissionpacks = 0;
if (COM_CheckParm ("-rogue"))
{
@@ -90,7 +90,7 @@ From: Ozkan Sezer <[email protected]>
com_nummissionpacks++;
}
//johnfitz
-@@ -1969,7 +1978,7 @@
+@@ -1971,7 +1980,7 @@
if (i && i < com_argc-1)
{
com_modified = true;
@@ -99,8 +99,8 @@ From: Ozkan Sezer <[email protected]>
}
COM_CheckRegistered ();
---- quakespasm.orig/Quake/sys_sdl_unix.c
-+++ quakespasm/Quake/sys_sdl_unix.c
+--- a/Quake/sys_sdl_unix.c
++++ b/Quake/sys_sdl_unix.c
@@ -20,6 +20,8 @@
*/
--
Packaging for quakespasm
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
