r4738 - in packages/trunk/boswars/debian: . patches
Barry deFreese
bddebian-guest at alioth.debian.org
Wed Nov 21 17:35:39 UTC 2007
Author: bddebian-guest
Date: 2007-11-21 17:35:39 +0000 (Wed, 21 Nov 2007)
New Revision: 4738
Added:
packages/trunk/boswars/debian/patches/
packages/trunk/boswars/debian/patches/10_lua_const_char.diff
packages/trunk/boswars/debian/patches/series
Modified:
packages/trunk/boswars/debian/changelog
packages/trunk/boswars/debian/control
packages/trunk/boswars/debian/rules
Log:
* Update -data package description
* Remove unnecessary files from binary package
* Add quilt patch system
* 10_lua_const_char.diff
+ Fix char* -> const char* issues in lua code
Modified: packages/trunk/boswars/debian/changelog
===================================================================
--- packages/trunk/boswars/debian/changelog 2007-11-21 04:24:28 UTC (rev 4737)
+++ packages/trunk/boswars/debian/changelog 2007-11-21 17:35:39 UTC (rev 4738)
@@ -16,5 +16,10 @@
* New files: debian/ boswars.{dirs,install}, boswars-data.{dirs,install}.
* Call dh_desktop.
* Remove opengl=0 from scons build. (OpenGL support is now run-time option)
+ * Update -data package description
+ * Remove unnecessary files from binary package
+ * Add quilt patch system
+ * 10_lua_const_char.diff
+ + Fix char* -> const char* issues in lua code
-- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr> Thu, 01 Nov 2007 03:31:24 +0100
Modified: packages/trunk/boswars/debian/control
===================================================================
--- packages/trunk/boswars/debian/control 2007-11-21 04:24:28 UTC (rev 4737)
+++ packages/trunk/boswars/debian/control 2007-11-21 17:35:39 UTC (rev 4738)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
-Build-Depends: debhelper (>= 5), scons, libpng12-dev, libsdl1.2-dev, libvorbis-dev, liblua5.1-0-dev | liblua50-dev, quilt
+Build-Depends: debhelper (>= 5), scons, quilt, libpng12-dev, libsdl1.2-dev, libvorbis-dev, liblua5.1-0-dev | liblua50-dev, quilt
Standards-Version: 3.7.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/boswars/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/boswars/?op=log
@@ -17,14 +17,11 @@
against human opponents over local network (LAN), internet, or against the
computer.
.
- This package includes the binary with OpenGL disabled.
+ OpenGL support available as a run-time configuration option.
Package: boswars-data
Architecture: all
Suggests: python
-Description: futuristic real-time strategy game - data
- Bos Wars is a futuristic real-time strategy game. It is possible to play
- against human opponents over local network (LAN), internet, or against the
- computer.
- .
- This package includes boswars data.
+Description: Images, data, and music files for Bos Wars
+ This package includes the images, data files, and music for the Bos Wars
+ real-time-strategy game.
Added: packages/trunk/boswars/debian/patches/10_lua_const_char.diff
===================================================================
--- packages/trunk/boswars/debian/patches/10_lua_const_char.diff (rev 0)
+++ packages/trunk/boswars/debian/patches/10_lua_const_char.diff 2007-11-21 17:35:39 UTC (rev 4738)
@@ -0,0 +1,161 @@
+diff -urN boswars-2.4.1-src.orig/engine/tolua/tolua++.h boswars-2.4.1-src/engine/tolua/tolua++.h
+--- boswars-2.4.1-src.orig/engine/tolua/tolua++.h 2007-02-28 17:14:04.000000000 -0500
++++ boswars-2.4.1-src/engine/tolua/tolua++.h 2007-11-21 12:05:44.000000000 -0500
+@@ -53,7 +53,7 @@
+ #define TOLUA_NOPEER LUA_REGISTRYINDEX /* for lua 5.1 */
+
+ TOLUA_API const char* tolua_typename (lua_State* L, int lo);
+-TOLUA_API void tolua_error (lua_State* L, char* msg, tolua_Error* err);
++TOLUA_API void tolua_error (lua_State* L, const char* msg, tolua_Error* err);
+ TOLUA_API int tolua_isnoobj (lua_State* L, int lo, tolua_Error* err);
+ TOLUA_API int tolua_isvalue (lua_State* L, int lo, int def, tolua_Error* err);
+ TOLUA_API int tolua_isboolean (lua_State* L, int lo, int def, tolua_Error* err);
+@@ -84,16 +84,16 @@
+ TOLUA_API int tolua_register_gc (lua_State* L, int lo);
+ TOLUA_API int tolua_default_collect (lua_State* tolua_S);
+
+-TOLUA_API void tolua_usertype (lua_State* L, char* type);
+-TOLUA_API void tolua_beginmodule (lua_State* L, char* name);
++TOLUA_API void tolua_usertype (lua_State* L, const char* type);
++TOLUA_API void tolua_beginmodule (lua_State* L, const char* name);
+ TOLUA_API void tolua_endmodule (lua_State* L);
+-TOLUA_API void tolua_module (lua_State* L, char* name, int hasvar);
+-TOLUA_API void tolua_class (lua_State* L, char* name, char* base);
+-TOLUA_API void tolua_cclass (lua_State* L, char* lname, char* name, char* base, lua_CFunction col);
+-TOLUA_API void tolua_function (lua_State* L, char* name, lua_CFunction func);
+-TOLUA_API void tolua_constant (lua_State* L, char* name, double value);
+-TOLUA_API void tolua_variable (lua_State* L, char* name, lua_CFunction get, lua_CFunction set);
+-TOLUA_API void tolua_array (lua_State* L,char* name, lua_CFunction get, lua_CFunction set);
++TOLUA_API void tolua_module (lua_State* L, const char* name, int hasvar);
++TOLUA_API void tolua_class (lua_State* L, const char* name, const char* base);
++TOLUA_API void tolua_cclass (lua_State* L, const char* lname, const char* name, const char* base, lua_CFunction col);
++TOLUA_API void tolua_function (lua_State* L, const char* name, lua_CFunction func);
++TOLUA_API void tolua_constant (lua_State* L, const char* name, double value);
++TOLUA_API void tolua_variable (lua_State* L, const char* name, lua_CFunction get, lua_CFunction set);
++TOLUA_API void tolua_array (lua_State* L, const char* name, lua_CFunction get, lua_CFunction set);
+
+ /* TOLUA_API void tolua_set_call_event(lua_State* L, lua_CFunction func, char* type); */
+ /* TOLUA_API void tolua_addbase(lua_State* L, char* name, char* base); */
+@@ -126,7 +126,7 @@
+ TOLUA_API int tolua_tofieldvalue (lua_State* L, int lo, int index, int def);
+ TOLUA_API int tolua_getfieldboolean (lua_State* L, int lo, int index, int def);
+
+-TOLUA_API void tolua_dobuffer(lua_State* L, char* B, unsigned int size, const char* name);
++TOLUA_API void tolua_dobuffer(lua_State* L, const char* B, unsigned int size, const char* name);
+
+ TOLUA_API int class_gc_event (lua_State* L);
+
+diff -urN boswars-2.4.1-src.orig/engine/tolua/tolua_is.cpp boswars-2.4.1-src/engine/tolua/tolua_is.cpp
+--- boswars-2.4.1-src.orig/engine/tolua/tolua_is.cpp 2007-02-28 17:14:04.000000000 -0500
++++ boswars-2.4.1-src/engine/tolua/tolua_is.cpp 2007-11-21 12:00:16.000000000 -0500
+@@ -85,7 +85,7 @@
+ return lua_tostring(L,-1);
+ }
+
+-TOLUA_API void tolua_error (lua_State* L, char* msg, tolua_Error* err)
++TOLUA_API void tolua_error (lua_State* L, const char* msg, tolua_Error* err)
+ {
+ if (msg[0] == '#')
+ {
+diff -urN boswars-2.4.1-src.orig/engine/tolua/tolua_map.cpp boswars-2.4.1-src/engine/tolua/tolua_map.cpp
+--- boswars-2.4.1-src.orig/engine/tolua/tolua_map.cpp 2007-02-28 17:14:04.000000000 -0500
++++ boswars-2.4.1-src/engine/tolua/tolua_map.cpp 2007-11-21 12:14:22.000000000 -0500
+@@ -25,7 +25,7 @@
+ /* Create metatable
+ * Create and register new metatable
+ */
+-static int tolua_newmetatable (lua_State* L, char* name)
++static int tolua_newmetatable (lua_State* L, const char* name)
+ {
+ int r = luaL_newmetatable(L,name);
+
+@@ -389,7 +389,7 @@
+ * It creates the correspoding metatable in the registry, for both 'type' and 'const type'.
+ * It maps 'const type' as being also a 'type'
+ */
+-TOLUA_API void tolua_usertype (lua_State* L, char* type)
++TOLUA_API void tolua_usertype (lua_State* L, const char* type)
+ {
+ char ctype[128] = "const ";
+ strncat(ctype,type,120);
+@@ -403,7 +403,7 @@
+ /* Begin module
+ * It pushes the module (or class) table on the stack
+ */
+-TOLUA_API void tolua_beginmodule (lua_State* L, char* name)
++TOLUA_API void tolua_beginmodule (lua_State* L, const char* name)
+ {
+ if (name)
+ {
+@@ -426,7 +426,7 @@
+ * It creates a new module
+ */
+ #if 1
+-TOLUA_API void tolua_module (lua_State* L, char* name, int hasvar)
++TOLUA_API void tolua_module (lua_State* L, const char* name, int hasvar)
+ {
+ if (name)
+ {
+@@ -462,7 +462,7 @@
+ lua_pop(L,1); /* pop module */
+ }
+ #else
+-TOLUA_API void tolua_module (lua_State* L, char* name, int hasvar)
++TOLUA_API void tolua_module (lua_State* L, const char* name, int hasvar)
+ {
+ if (name)
+ {
+@@ -518,7 +518,7 @@
+ /* Map C class
+ * It maps a C class, setting the appropriate inheritance and super classes.
+ */
+-TOLUA_API void tolua_cclass (lua_State* L, char* lname, char* name, char* base, lua_CFunction col)
++TOLUA_API void tolua_cclass (lua_State* L, const char* lname, const char* name, const char* base, lua_CFunction col)
+ {
+ char cname[128] = "const ";
+ char cbase[128] = "const ";
+@@ -577,7 +577,7 @@
+ /* Map function
+ * It assigns a function into the current module (or class)
+ */
+-TOLUA_API void tolua_function (lua_State* L, char* name, lua_CFunction func)
++TOLUA_API void tolua_function (lua_State* L, const char* name, lua_CFunction func)
+ {
+ lua_pushstring(L,name);
+ lua_pushcfunction(L,func);
+@@ -600,7 +600,7 @@
+ /* Map constant number
+ * It assigns a constant number into the current module (or class)
+ */
+-TOLUA_API void tolua_constant (lua_State* L, char* name, double value)
++TOLUA_API void tolua_constant (lua_State* L, const char* name, double value)
+ {
+ lua_pushstring(L,name);
+ tolua_pushnumber(L,value);
+@@ -611,7 +611,7 @@
+ /* Map variable
+ * It assigns a variable into the current module (or class)
+ */
+-TOLUA_API void tolua_variable (lua_State* L, char* name, lua_CFunction get, lua_CFunction set)
++TOLUA_API void tolua_variable (lua_State* L, const char* name, lua_CFunction get, lua_CFunction set)
+ {
+ /* get func */
+ lua_pushstring(L,".get");
+@@ -663,7 +663,7 @@
+ /* Map an array
+ * It assigns an array into the current module (or class)
+ */
+-TOLUA_API void tolua_array (lua_State* L, char* name, lua_CFunction get, lua_CFunction set)
++TOLUA_API void tolua_array (lua_State* L, const char* name, lua_CFunction get, lua_CFunction set)
+ {
+ lua_pushstring(L,".get");
+ lua_rawget(L,-2);
+@@ -693,7 +693,7 @@
+ }
+
+
+-TOLUA_API void tolua_dobuffer(lua_State* L, char* B, unsigned int size, const char* name) {
++TOLUA_API void tolua_dobuffer(lua_State* L, const char* B, unsigned int size, const char* name) {
+
+ #ifdef LUA_VERSION_NUM /* lua 5.1 */
+ luaL_loadbuffer(L, B, size, name) || lua_pcall(L, 0, 0, 0);
Added: packages/trunk/boswars/debian/patches/series
===================================================================
--- packages/trunk/boswars/debian/patches/series (rev 0)
+++ packages/trunk/boswars/debian/patches/series 2007-11-21 17:35:39 UTC (rev 4738)
@@ -0,0 +1 @@
+10_lua_const_char.diff
Modified: packages/trunk/boswars/debian/rules
===================================================================
--- packages/trunk/boswars/debian/rules 2007-11-21 04:24:28 UTC (rev 4737)
+++ packages/trunk/boswars/debian/rules 2007-11-21 17:35:39 UTC (rev 4738)
@@ -4,6 +4,8 @@
# Uncomment this to turn on verbose mode
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+
# This has to be exported to make some magic below work.
export DH_OPTIONS
@@ -19,7 +21,7 @@
endif
configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
dh_testdir
# Add here commands to configure the package.
@@ -44,7 +46,7 @@
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-arch-stamp build-indep-stamp configure-stamp
@@ -105,9 +107,14 @@
binary-indep: build-indep install-indep
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+ rm -rf debian/boswars-data/usr/share/games/boswars/languages/genpot.sh
+
# Build architecture dependant packages using the common target.
binary-arch: build-arch install-arch
$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+ rm -f debian/boswars/usr/share/doc/boswars/html/README-SDL.txt
+ rm -f debian/boswars/usr/share/doc/boswars/html/*copyright*
+
binary: binary-arch binary-indep
.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
More information about the Pkg-games-commits
mailing list