r6442 - in packages/trunk/vegastrike/debian: . patches
Vincent Fourmond
fourmond at alioth.debian.org
Fri Apr 4 20:16:48 UTC 2008
Author: fourmond
Date: 2008-04-04 20:16:48 +0000 (Fri, 04 Apr 2008)
New Revision: 6442
Removed:
packages/trunk/vegastrike/debian/patches/fix_long_vs_int.diff
packages/trunk/vegastrike/debian/patches/makefiles.diff
Modified:
packages/trunk/vegastrike/debian/
packages/trunk/vegastrike/debian/changelog
packages/trunk/vegastrike/debian/copyright
packages/trunk/vegastrike/debian/get_upstream_svn
packages/trunk/vegastrike/debian/patches/series
packages/trunk/vegastrike/debian/rules
Log:
[vegastrike] Uploaded new upstream tarball + set property accordingly. Beginnings of patch updates
Property changes on: packages/trunk/vegastrike/debian
___________________________________________________________________
Name: svn-bp:origUrl
- http://ftp.debian.org/debian/pool/main/v/vegastrike/vegastrike_0.4.3.debian1.orig.tar.gz
+ http://pkg-games.alioth.debian.org/tarballs/vegastrike_0.5~svn12102.orig.tar.gz
Modified: packages/trunk/vegastrike/debian/changelog
===================================================================
--- packages/trunk/vegastrike/debian/changelog 2008-04-04 15:58:28 UTC (rev 6441)
+++ packages/trunk/vegastrike/debian/changelog 2008-04-04 20:16:48 UTC (rev 6442)
@@ -1,23 +1,22 @@
-vegastrike (0.4.3.debian1-2) UNRELEASED; urgency=low
+vegastrike (0.5~svn12102-1) UNRELEASED; urgency=low
[ Barry deFreese ]
* Add watch file
* Add Homepage field in control
* Add VCS fields in control
- [ Vincent Fourmond ]
- * fix_long_vs_int.diff to hopefully fix problems with 64 bits arches
- * NOT RELEASED YET -- and NOT RELEASABLE YET !
-
[ Ansgar Burchardt ]
* Remove deprecated Encoding key from .desktop file
[ Vincent Fourmond ]
* A get_upstream_svn script to retrieve an upstream SVN snapshot
* Bumped to standards 3.7.3 with no changes.
+ * New upstream release:
+ - drop makefiles.diff, structure has completely changed.
- -- Vincent Fourmond <fourmond at debian.org> Fri, 04 Apr 2008 00:14:00 +0200
+ -- Vincent Fourmond <fourmond at debian.org> Fri, 04 Apr 2008 19:31:54 +0200
+
vegastrike (0.4.3.debian1-1) unstable; urgency=low
* Repackage upstream source to get rid of two useless copies of the
Modified: packages/trunk/vegastrike/debian/copyright
===================================================================
--- packages/trunk/vegastrike/debian/copyright 2008-04-04 15:58:28 UTC (rev 6441)
+++ packages/trunk/vegastrike/debian/copyright 2008-04-04 20:16:48 UTC (rev 6442)
@@ -5,12 +5,9 @@
Fri, 10 Aug 2007 12:19:00 -0400.
It was downloaded from http://sourceforge.net/projects/vegastrike
-from the SVN repository. The command to download was <svn co https://vegastrike.svn.sourceforge.net/svnroot/vegastrike/tags/vegastrike_0_4_3/vegastrike vegastrike>.
-The directories src/boost and src/boost129 were removed, as not used and
-introducing unnecessary code.
+from the SVN repository, using the script debian/get_upstream_svn. Please
+see this file for more information.
-The vssetup folder comes from version 0.2.9. The vssetup folder in vegastrike was downloaded into the vegastrike directory using the command <svn co https://vegastrike.svn.sourceforge.net/svnroot/vegastrike/tags/vegastrike_0_2_9/vssetup vssetup>
-
Upstream Authors:
Core Development Team
Modified: packages/trunk/vegastrike/debian/get_upstream_svn
===================================================================
--- packages/trunk/vegastrike/debian/get_upstream_svn 2008-04-04 15:58:28 UTC (rev 6441)
+++ packages/trunk/vegastrike/debian/get_upstream_svn 2008-04-04 20:16:48 UTC (rev 6442)
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
# get_upstream_svn: make a tarball from upstream svn repository
# Copyright 2008 by Vincent Fourmond
@@ -11,10 +11,11 @@
rep="http://vegastrike.svn.sourceforge.net/svnroot/vegastrike/trunk/vegastrike"
# First, we get information about the latest upstream revision:
-rev=`svn info "$rep" | grep Revision | egrep -o '[0-9]+`
+rev=`svn info "$rep" | grep Revision | egrep -o '[0-9]+'`
# The target dirname
-dirname=vegastrike-0.5\~$rev
+dirname=vegastrike-0.5\~svn$rev
+tarname=vegastrike_0.5\~svn$rev.orig.tar.gz
# Current directory
curdir=`pwd`
@@ -30,9 +31,9 @@
# cd $dirname
# ./bootstrap-sh
# cd ..
-tar cvzf $dirname.tar.gz $dirname
+tar cvzf $tarname $dirname
# We come back and move the tarball to the parent directory
cd - # $curdir
-mv $tmpdir/$dirname.tar.gz ..
-mr -rf $tmpdir
\ No newline at end of file
+mv $tmpdir/$tarname ..
+rm -rf $tmpdir
\ No newline at end of file
Property changes on: packages/trunk/vegastrike/debian/get_upstream_svn
___________________________________________________________________
Name: svn:executable
+ *
Deleted: packages/trunk/vegastrike/debian/patches/fix_long_vs_int.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/fix_long_vs_int.diff 2008-04-04 15:58:28 UTC (rev 6441)
+++ packages/trunk/vegastrike/debian/patches/fix_long_vs_int.diff 2008-04-04 20:16:48 UTC (rev 6442)
@@ -1,60 +0,0 @@
---- vegastrike-0.4.3.debian1.orig/src/gui/eventmanager.cpp
-+++ vegastrike-0.4.3.debian1/src/gui/eventmanager.cpp
-@@ -61,7 +61,7 @@
- if (controlToDelete == NULL || find(deleteQueue.begin(), deleteQueue.end(), controlToDelete)!=deleteQueue.end()) {
- bool DUPLICATE_DELETE_OF_OBJECT = true;
- char tempstr[254];
-- sprintf(tempstr, "\nERROR: duplicate delete of object %X.\n\n", (int)controlToDelete);
-+ sprintf(tempstr, "\nERROR: duplicate delete of object %lx.\n\n", (long)controlToDelete);
- fputs(tempstr, stderr);
- #if defined (_MSC_VER) && defined(_DEBUG) && 0
- if (DEBUG_ERROR_IN_MY_CODE) {
-only in patch2:
-unchanged:
---- vegastrike-0.4.3.debian1.orig/src/gfx/mesh_xml.cpp
-+++ vegastrike-0.4.3.debian1/src/gfx/mesh_xml.cpp
-@@ -1267,7 +1267,7 @@
- return 0;
- }
- if (m.size()>1) {
-- fprintf (stderr,"Mesh %s has %d subcomponents. Only first used!\n",filename,m.size());
-+ fprintf (stderr,"Mesh %s has %ld subcomponents. Only first used!\n",filename,(long) m.size());
- for (unsigned int i=1;i<m.size();++i) {
- delete m[i];
- }
-only in patch2:
-unchanged:
---- vegastrike-0.4.3.debian1.orig/src/cmd/script/script_variables.cpp
-+++ vegastrike-0.4.3.debian1/src/cmd/script/script_variables.cpp
-@@ -750,7 +750,8 @@
- sprintf(buffer,"type=\"object\" object=\"%s\" value=\"%s\" >\n ", vi->objectname.c_str(),sptr->c_str());
- }
- else{
-- sprintf(buffer,"type=\"object\" object=\"%s\" value=\"0x%x\" >\n ", vi->objectname.c_str(),vi->object);
-+ // Still not good, but this shouldn't crash on 64bits arches
-+ sprintf(buffer,"type=\"object\" object=\"%s\" value=\"0x%lx\" >\n ", vi->objectname.c_str(),(long) vi->object);
-
- string modname="_"+vi->objectname;
-
-only in patch2:
-unchanged:
---- vegastrike-0.4.3.debian1.orig/src/cmd/script/script_call_olist.cpp
-+++ vegastrike-0.4.3.debian1/src/cmd/script/script_call_olist.cpp
-@@ -246,7 +246,7 @@
- olist_t *olist=getOListObject(node,mode,ovi);
- if(((unsigned int)index)>=olist->size()){
- char buffer[200];
-- sprintf(buffer,"olist.set: index out of range size=%d, index=%d\n",olist->size(),index);
-+ sprintf(buffer,"olist.set: index out of range size=%ld, index=%d\n",(long) olist->size(),index);
- fatalError(node,mode,buffer);
- assert(0);
- }
-@@ -263,7 +263,7 @@
- olist_t *olist=getOListObject(node,mode,ovi);
- if(((unsigned int)index)>=olist->size()){
- char buffer[200];
-- sprintf(buffer,"olist.at: index out of range size=%d, index=%d\n",olist->size(),index);
-+ sprintf(buffer,"olist.at: index out of range size=%ld, index=%d\n",(long) olist->size(),index);
- fatalError(node,mode,buffer);
- assert(0);
- }
Deleted: packages/trunk/vegastrike/debian/patches/makefiles.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/makefiles.diff 2008-04-04 15:58:28 UTC (rev 6441)
+++ packages/trunk/vegastrike/debian/patches/makefiles.diff 2008-04-04 20:16:48 UTC (rev 6442)
@@ -1,79 +0,0 @@
---- ./Makefile.am~ 2003-09-20 21:14:39.000000000 -0400
-+++ ./Makefile.am 2005-02-15 23:55:16.000000000 -0500
-@@ -1,4 +1,4 @@
--SUBDIRS = src objconv launcher tools
-+SUBDIRS = src
-
- EXTRA_DIST = \
- vegastrike.dsp \
-## DP: Renaming binary to vsaccountserver instead of accountserver.
-## DP: Also enabling use of external boost libraries.
---- ./src/Makefile.am~ 2007-07-01 00:08:26.000000000 -0400
-+++ ./src/Makefile.am 2007-07-01 00:11:10.000000000 -0400
-@@ -1,8 +1,8 @@
-
--bin_PROGRAMS = vegastrike vegaserver accountserver
-+bin_PROGRAMS = vegastrike vegaserver vsaccountserver
-
- SUBDIRS = \
-- cmd gfx gldrv aldrv python gui networking boost common boost129
-+ cmd gfx gldrv aldrv python gui networking common
-
- vegastrike_LDADD = \
- networking/netserver_devices.o \
-@@ -21,11 +21,9 @@
- gui/libgui.a \
- networking/libnet.a \
- cmd/collide/libcollide.a \
--boost129/libboost_python.a \
--boost/libboost_python.a \
- gfx/nav/libnav.a \
- aldrv/libaldrv.a \
---lz
-+$(BOOST_LIBS) -lz
-
- vegaserver_LDADD = \
- networking/netserver_devices.o \
-@@ -43,11 +41,9 @@
- gfx/libgfxserver.a \
- gldrv/libgldrvserver.a \
- cmd/collide/libcollide.a \
--boost129/libboost_python.a \
--boost/libboost_python.a \
---lz
-+$(BOOST_LIBS) -lz
-
--accountserver_LDADD = \
-+vsaccountserver_LDADD = \
- networking/libnetacct.a \
- networking/lowlevel/libnetlowlevel.a \
- -lz
-@@ -152,7 +148,7 @@
- $(librootgeneric) $(librootserver) \
- vegaserver.cpp
-
--accountserver_SOURCES = \
-+vsaccountserver_SOURCES = \
- vsfilesystem.cpp \
- vsfilesystem.h \
- pk3.cpp \
-## DP: Renaming binary to vssoundserver instead of soundserver.
---- ./src/networking/Makefile.am~ 2004-12-10 21:33:42.000000000 -0500
-+++ ./src/networking/Makefile.am 2005-02-15 23:55:02.000000000 -0500
-@@ -9,13 +9,13 @@
-
-
- noinst_LIBRARIES = libnet.a libnetclient.a libnetserver.a libnetacct.a
--bin_PROGRAMS = soundserver
-+bin_PROGRAMS = vssoundserver
-
--soundserver_LDADD = -L/usr/local/lib $(SDL_LIBS) $(SDL_MIXER_LIBS)
-+vssoundserver_LDADD = -L/usr/local/lib $(SDL_LIBS) $(SDL_MIXER_LIBS)
-
- SUBDIRS = lowlevel
-
--soundserver_SOURCES = inet.cpp inet_file.cpp inet_file.h inet.h soundserver.cpp
-+vssoundserver_SOURCES = inet.cpp inet_file.cpp inet_file.h inet.h soundserver.cpp
-
- libacctserver = \
- client.cpp \
Modified: packages/trunk/vegastrike/debian/patches/series
===================================================================
--- packages/trunk/vegastrike/debian/patches/series 2008-04-04 15:58:28 UTC (rev 6441)
+++ packages/trunk/vegastrike/debian/patches/series 2008-04-04 20:16:48 UTC (rev 6442)
@@ -1,4 +1,3 @@
-makefiles.diff
alut.diff
gtk2.diff
char.diff
@@ -14,4 +13,3 @@
vssetup.diff
hat_switches.diff
configure.in_modifications.diff
-fix_long_vs_int.diff
\ No newline at end of file
Modified: packages/trunk/vegastrike/debian/rules
===================================================================
--- packages/trunk/vegastrike/debian/rules 2008-04-04 15:58:28 UTC (rev 6441)
+++ packages/trunk/vegastrike/debian/rules 2008-04-04 20:16:48 UTC (rev 6442)
@@ -49,7 +49,7 @@
CC=$(DEB_HOST_GNU_TYPE)-gcc CXX=$(DEB_HOST_GNU_TYPE)-g++ \
./configure $(confflags) --bindir=/usr/games/ \
--with-data-dir=/usr/share/games/vegastrike \
- --enable-release \
+ --enable-release --with-boost=system \
|| (cat config.log && false)
touch configure-stamp
More information about the Pkg-games-commits
mailing list