r2855 - in packages/trunk/vegastrike/debian: . patches
Andres Mejia
ceros-guest at alioth.debian.org
Wed Jun 6 00:05:13 UTC 2007
Author: ceros-guest
Date: 2007-06-06 00:05:13 +0000 (Wed, 06 Jun 2007)
New Revision: 2855
Modified:
packages/trunk/vegastrike/debian/changelog
packages/trunk/vegastrike/debian/control
packages/trunk/vegastrike/debian/patches/020_disable_internal_boost.diff
packages/trunk/vegastrike/debian/patches/100_rebootstrap.diff
packages/trunk/vegastrike/debian/patches/250_config_path.diff
Log:
Implemented checks for version of libboost_python. Made modifications so vegastrike can be built on stable. Changed source version back to 0.4.3. Package version is 6.
Modified: packages/trunk/vegastrike/debian/changelog
===================================================================
--- packages/trunk/vegastrike/debian/changelog 2007-06-05 22:55:30 UTC (rev 2854)
+++ packages/trunk/vegastrike/debian/changelog 2007-06-06 00:05:13 UTC (rev 2855)
@@ -1,4 +1,4 @@
-vegastrike (0.4.3.debian-2) UNRELEASED; urgency=low
+vegastrike (0.4.3-6) UNRELEASED; urgency=low
[ Eddy Petrișor ]
* use CURDIR instead of PWD since the later is erased in sudo
@@ -10,6 +10,11 @@
+ removed python-dev as build depend since libboost-python-dev takes care
of proper python dependency regardless.
+ add checks for python2.4 and python2.5 in reboostrap patch.
+ * Adding checks to detect version of libboost-python-dev.
+ * Replacing build dependency from xlibmesa-gl-dev to libgl1-mesa-dev.
+ * Modified vegastrike dependencies for vegastrike-data.
+ * Switched config path from .vegastrike.4.x to .vegastrike-0.4.x
+ * Changed back version to source version 0.4.3 with package version 6.
-- Andres Mejia <mcitadel at gmail.com> Tue, 5 Jun 2007 01:35:41 -0400
Modified: packages/trunk/vegastrike/debian/control
===================================================================
--- packages/trunk/vegastrike/debian/control 2007-06-05 22:55:30 UTC (rev 2854)
+++ packages/trunk/vegastrike/debian/control 2007-06-06 00:05:13 UTC (rev 2855)
@@ -3,17 +3,16 @@
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
-Build-Depends: debhelper (>> 5.0), quilt, libboost-python-dev, libgtk2.0-dev, libopenal-dev, libalut-dev, xlibmesa-gl-dev, libexpat1-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libpng12-dev, libjpeg62-dev, libglut3-dev, libxmu-dev
+Build-Depends: debhelper (>= 5.0), quilt, libboost-python-dev, libgtk2.0-dev, libopenal-dev, libalut-dev, libgl1-mesa-dev, libexpat1-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libpng12-dev, libjpeg62-dev, libglut3-dev, libxmu-dev
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-games/packages/trunk/vegastrike
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/vegastrike/
Package: vegastrike
-Architecture: i386 powerpc sparc mips mipsel s390 alpha arm ia64 hppa amd64 ppc64 kfreebsd-i386 kfreebsd-amd64
-Depends: vegastrike-data (>=0.4.3-1), vegastrike-data (<<0.4.4-1), ${shlibs:Depends}
+Architecture: any
+Depends: vegastrike-data (>=0.4.3), vegastrike-data (<<0.4.4), ${shlibs:Depends}
Description: 3D space combat game
Vegastrike is a 3D space simulator. Currently in Beta development, the
project, at version 1.0, is to be a generic space simulator. Current
features include split-screen play, trading, exploration and plenty of
shoot'em up action.
-
Modified: packages/trunk/vegastrike/debian/patches/020_disable_internal_boost.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/020_disable_internal_boost.diff 2007-06-05 22:55:30 UTC (rev 2854)
+++ packages/trunk/vegastrike/debian/patches/020_disable_internal_boost.diff 2007-06-06 00:05:13 UTC (rev 2855)
@@ -20,7 +20,7 @@
gfx/nav/libnav.a \
aldrv/libaldrv.a \
--lz
-+-lboost_python-st -lz
++$(BOOST_LIBS) -lz
vegaserver_LDADD = \
networking/netserver_devices.o \
@@ -31,7 +31,7 @@
-boost129/libboost_python.a \
-boost/libboost_python.a \
--lz
-+-lboost_python-st -lz
++$(BOOST_LIBS) -lz
accountserver_LDADD = \
networking/libnetacct.a \
@@ -39,7 +39,7 @@
===================================================================
--- vegastrike-0.4.3.debian.orig/configure.in 2007-04-06 17:04:28.000000000 +0200
+++ vegastrike-0.4.3.debian/configure.in 2007-04-06 17:05:32.000000000 +0200
-@@ -1597,16 +1597,8 @@
+@@ -1597,16 +1597,30 @@
AC_SUBST(CG_CPPFLAGS)
AC_SUBST(CG_LIBS)
@@ -54,7 +54,29 @@
- BOOST_LIBS="../src/boost129/libpython_boost.a"
-fi
+BOOST_CPPFLAGS="-DUSE_BOOST_131=1 "
-+BOOST_LIBS="-lboost_python-st"
++
++{ echo "$as_me:$LINENO: checking for libboost_python" >&5
++echo $ECHO_N "checking for libboost_python... $ECHO_C" >&6; }
++BOOST_PYTHON_libchk="/usr/lib /usr/local/lib"
++for i in ${BOOST_PYTHON_libchk};
++do
++ if test -L $i/libboost_python-st.so;
++ then
++ echo -e "Found libboost-python-dev (>= 1.34)"
++ BOOST_LIBS="-lboost_python-st"
++ break
++ else if test -L $i/libboost_python.so;
++ then
++ echo -e "Found libboost-python-dev (<= 1.33)"
++ BOOST_LIBS="-lboost_python"
++ break
++ else
++ { { echo "$as_me:$LINENO: error: *** libboost-python-dev not found!" >&5
++ echo "$as_me: error: *** libboost-python-dev not found!" >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++ fi
++done
if test "$TESTUSEBOOST131" = "0" ; then
TESTUSEBOOST128="1"
Modified: packages/trunk/vegastrike/debian/patches/100_rebootstrap.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/100_rebootstrap.diff 2007-06-05 22:55:30 UTC (rev 2854)
+++ packages/trunk/vegastrike/debian/patches/100_rebootstrap.diff 2007-06-06 00:05:13 UTC (rev 2855)
@@ -5906,7 +5906,7 @@
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ vegastrike-0.4.3.debian/configure 2007-04-06 17:56:47.000000000 +0200
-@@ -0,0 +1,15420 @@
+@@ -0,0 +1,15440 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.61 for vegastrike 0.4.0.
@@ -19709,8 +19709,31 @@
+
+
+BOOST_CPPFLAGS="-DUSE_BOOST_131=1 "
-+BOOST_LIBS="-lboost_python-st"
++BOOST_CPPFLAGS="-DUSE_BOOST_131=1 "
+
++{ echo "$as_me:$LINENO: checking for libboost_python" >&5
++echo $ECHO_N "checking for libboost_python... $ECHO_C" >&6; }
++BOOST_PYTHON_libchk="/usr/lib /usr/local/lib"
++for i in ${BOOST_PYTHON_libchk};
++do
++ if test -L $i/libboost_python-st.so;
++ then
++ echo -e "Found libboost-python-dev (>= 1.34)"
++ BOOST_LIBS="-lboost_python-st"
++ break
++ else if test -L $i/libboost_python.so;
++ then
++ echo -e "Found libboost-python-dev (<= 1.33)"
++ BOOST_LIBS="-lboost_python"
++ break
++ else
++ { { echo "$as_me:$LINENO: error: *** libboost-python-dev not found!" >&5
++ echo "$as_me: error: *** libboost-python-dev not found!" >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++ fi
++done
++
+if test "$TESTUSEBOOST131" = "0" ; then
+TESTUSEBOOST128="1"
+fi
@@ -24733,7 +24756,7 @@
+cmd/collide/libcollide.a \
+gfx/nav/libnav.a \
+aldrv/libaldrv.a \
-+-lboost_python-st -lz
++$(BOOST_LIBS) -lz
+
+vegaserver_LDADD = \
+networking/netserver_devices.o \
@@ -24751,7 +24774,7 @@
+gfx/libgfxserver.a \
+gldrv/libgldrvserver.a \
+cmd/collide/libcollide.a \
-+-lboost_python-st -lz
++$(BOOST_LIBS) -lz
+
+accountserver_LDADD = \
+networking/libnetacct.a \
Modified: packages/trunk/vegastrike/debian/patches/250_config_path.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/250_config_path.diff 2007-06-05 22:55:30 UTC (rev 2854)
+++ packages/trunk/vegastrike/debian/patches/250_config_path.diff 2007-06-06 00:05:13 UTC (rev 2855)
@@ -7,7 +7,7 @@
"|CHANGE SCENERIO BUTTON|\nThis allows you to select which mission vegastrike\nwill start the next time you press one\nof the keys below it. Most missions do not involve\nsave games and will ignore those options,\nhowever the default, in the mission/exploration folder will\nindeed ustilize the save games you specify.\nIf you ignore this option you begin in the standard\ntrading/bounty hunting mission."
};
-std::string HOMESUBDIR= ".vegastrike";
-+std::string HOMESUBDIR= ".vegastrike.4.x";
++std::string HOMESUBDIR= ".vegastrike-0.4.x";
char * prog_arg=0;
@@ -21,8 +21,8 @@
#endif
- mkdir (".vegastrike",0xffffffff);
- chdir (".vegastrike");
-+ mkdir (".vegastrike.4.x",0xffffffff);
-+ chdir (".vegastrike.4.x");
++ mkdir (".vegastrike-0.4.x",0xffffffff);
++ chdir (".vegastrike-0.4.x");
}else {
if (!paths.empty()) {
chdir (paths.back().c_str());
@@ -35,7 +35,7 @@
exit(1);
}
-std::string HOMESUBDIR=".vegastrike";
-+std::string HOMESUBDIR=".vegastrike.4.x";
++std::string HOMESUBDIR=".vegastrike-0.4.x";
/******************************************************************************/
/* The main function */
void changehome (bool to, bool linuxhome=true) {
@@ -48,7 +48,7 @@
string weapon_list;
string universe_name;
- string HOMESUBDIR(".vegastrike");
-+ string HOMESUBDIR(".vegastrike.4.x");
++ string HOMESUBDIR(".vegastrike-0.4.x");
vector<string> current_path;
vector<string> current_directory;
vector<string> current_subdirectory;
@@ -61,7 +61,7 @@
struct passwd *pwent;
pwent = getpwuid (getuid());
- string HOMESUBDIR=".vegastrike";
-+ string HOMESUBDIR=".vegastrike.4.x";
++ string HOMESUBDIR=".vegastrike-0.4.x";
FILE *version=fopen("Version.txt","r");
if (!version)
version=fopen("../Version.txt","r");
More information about the Pkg-games-commits
mailing list