[SCM] blobby Debian packaging branch, master, updated. upstream/0.9c-32-gbd44776
Felix Geyer
debfx-pkg at fobos.de
Fri Nov 11 12:10:33 UTC 2011
The following commit has been merged in the master branch:
commit b6a26809ef72e6a67549f3260ab6e858404d49fa
Author: Felix Geyer <debfx-pkg at fobos.de>
Date: Fri Nov 11 12:00:40 2011 +0100
Refresh patches.
diff --git a/debian/changelog b/debian/changelog
index fd87a01..fbc01eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ blobby (0.9c-1) UNRELEASED; urgency=low
* New upstream release.
* Drop 03_detect_endianness_glibc.patch, merged upstream.
+ * Refresh patches.
* Enable parallel building.
* Switch to source format 3.0 (quilt).
- Add unapply-patches and abort-on-upstream-changes to local-options.
diff --git a/debian/patches/01_sdl_default.patch b/debian/patches/01_sdl_default.patch
index 4a8f686..5f3e2ec 100644
--- a/debian/patches/01_sdl_default.patch
+++ b/debian/patches/01_sdl_default.patch
@@ -1,17 +1,6 @@
Description: Use SDL by default since it's faster without hardware acceleration
Author: Felix Geyer <debfx-pkg at fobos.de>
---- a/data/config.xml
-+++ b/data/config.xml
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="utf-8"?>
-
- <userconfig>
-- <var name="device" value="OpenGL"/>
-+ <var name="device" value="SDL"/>
- <var name="fullscreen" value="false"/>
- <var name="left_blobby_color_r" value="0"/>
- <var name="left_blobby_color_g" value="0"/>
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -160,8 +160,8 @@ int main(int argc, char* argv[])
diff --git a/debian/patches/02_use_system_lua.patch b/debian/patches/02_use_system_lua.patch
index 8d4f9c7..519a314 100644
--- a/debian/patches/02_use_system_lua.patch
+++ b/debian/patches/02_use_system_lua.patch
@@ -31,4 +31,4 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
+#include <lua5.1/lualib.h>
}
- #include <SDL/SDL.h>
+ #include <iostream>
diff --git a/debian/patches/04_use_system_tinyxml.patch b/debian/patches/04_use_system_tinyxml.patch
index d06398d..1b24803 100644
--- a/debian/patches/04_use_system_tinyxml.patch
+++ b/debian/patches/04_use_system_tinyxml.patch
@@ -18,7 +18,7 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
+#include <tinyxml.h>
#include <algorithm>
- #include <sstream>
+ #include <iostream>
--- a/src/UserConfig.cpp
+++ b/src/UserConfig.cpp
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite
--
blobby Debian packaging
More information about the Pkg-games-commits
mailing list