r6853 - in packages/trunk/glest/debian: . patches

Sun May 4 14:22:17 UTC 2008

Author: ansgar-guest
Date: 2008-05-04 14:22:17 +0000 (Sun, 04 May 2008)
New Revision: 6853

Added:
   packages/trunk/glest/debian/patches/gcc-4.3-fixes
Modified:
   packages/trunk/glest/debian/
   packages/trunk/glest/debian/changelog
   packages/trunk/glest/debian/control
   packages/trunk/glest/debian/copyright
   packages/trunk/glest/debian/glest.6
   packages/trunk/glest/debian/glest.sh
   packages/trunk/glest/debian/patches/series
   packages/trunk/glest/debian/rules
Log:
* New upstream release (Closes: #468810)
* Updates to wrapper script:
   - Install servers.ini (Closes: #467247)
   - Do not create symlink to configuration.xml which does not exist.
* debian/patches/gcc-4.3-fixes: Add missing includes for gcc-4.3
* Add missing .TH in manpage
* Update libxerces build-depend to libxerces-c2-dev
* Don't set CFLAGS, CXXFLAGS (now set by dpkg-buildpackage)
* debian/copyright: Update, point to GPL-2


Property changes on: packages/trunk/glest/debian
___________________________________________________________________
Name: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/glest_3.0.0.orig.tar.gz

   + http://pkg-games.alioth.debian.org/tarballs/glest_3.1.2.orig.tar.gz

Modified: packages/trunk/glest/debian/changelog
===================================================================

--- packages/trunk/glest/debian/changelog	2008-05-04 13:50:03 UTC (rev 6852)
+++ packages/trunk/glest/debian/changelog	2008-05-04 14:22:17 UTC (rev 6853)
@@ -1,4 +1,4 @@
-glest (3.1.0-2) UNRELEASED; urgency=low
+glest (3.1.2-1) UNRELEASED; urgency=low
 
   [ Siegfried-Angel Gevatter Pujals (RainCT)]
   * Fix debian/watch to work despite the constantly changing filenames.
@@ -10,8 +10,19 @@
   [ Gonéri Le Bouder ]
   * Add armel in arch list (Closes: #476943)
 
- -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct at ubuntu.com>  Sun, 17 Feb 2008 15:52:11 +0100
+  [ Ansgar Burchardt ]
+  * New upstream release (Closes: #468810)
+  * Updates to wrapper script:
+     - Install servers.ini (Closes: #467247)
+     - Do not create symlink to configuration.xml which does not exist.
+  * debian/patches/gcc-4.3-fixes: Add missing includes for gcc-4.3
+  * Add missing .TH in manpage
+  * Update libxerces build-depend to libxerces-c2-dev
+  * Don't set CFLAGS, CXXFLAGS (now set by dpkg-buildpackage)
+  * debian/copyright: Update, point to GPL-2
 
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Sun, 04 May 2008 16:02:36 +0200
+
 glest (3.1.0-1) unstable; urgency=low
 
   [ Barry deFreese ]

Modified: packages/trunk/glest/debian/control
===================================================================
--- packages/trunk/glest/debian/control	2008-05-04 13:50:03 UTC (rev 6852)
+++ packages/trunk/glest/debian/control	2008-05-04 14:22:17 UTC (rev 6853)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Giuseppe Borzi <gborzi at ieee.org>, Eddy Petrișor <eddy.petrisor at gmail.com>, Siegfried-Angel Gevatter Pujals (RainCT) <rainct at ubuntu.com>, Ansgar Burchardt <ansgar at 43-1.org>, Alexander Schmehl <tolimar at debian.org>
-Build-Depends: debhelper (>= 5.0.0), jam, libsdl1.2-dev, libxerces27-dev, libvorbis-dev, libogg-dev, libopenal-dev, quilt
+Build-Depends: debhelper (>= 5.0.0), jam, libsdl1.2-dev, libxerces-c2-dev, libvorbis-dev, libogg-dev, libopenal-dev, quilt
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/glest/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/glest/?op=log

Modified: packages/trunk/glest/debian/copyright
===================================================================
--- packages/trunk/glest/debian/copyright	2008-05-04 13:50:03 UTC (rev 6852)
+++ packages/trunk/glest/debian/copyright	2008-05-04 14:22:17 UTC (rev 6853)
@@ -3,14 +3,14 @@
 
 It was downloaded from http://www.glest.org
 
-Copyright Holder: 2001-2005 Martiño Figueroa <contact at glest.org> and 2005 Matthias Braun <matze at braunis.de>
+Copyright Holder: 2001-2008 Martiño Figueroa <contact at glest.org> and 2005 Matthias Braun <matze at braunis.de>
 
 License:
 
 ==============================================================
      This file is part of Glest (www.glest.org)
 
-     Copyright (C) 2001-2005 Martiño Figueroa
+     Copyright (C) 2001-2008 Martiño Figueroa
      You can redistribute this code and/or modify it under
      the terms of the GNU General Public License as published
      by the Free Software Foundation; either version 2 of the
@@ -27,5 +27,5 @@
 //version.
 
 On Debian systems, the complete text of the GNU General Public
-License, version 2, can be found in 
-/usr/share/common-licenses/GPL
+License, version 2, can be found in /usr/share/common-licenses/GPL-2
+

Modified: packages/trunk/glest/debian/glest.6
===================================================================
--- packages/trunk/glest/debian/glest.6	2008-05-04 13:50:03 UTC (rev 6852)
+++ packages/trunk/glest/debian/glest.6	2008-05-04 14:22:17 UTC (rev 6853)
@@ -1,4 +1,5 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
+.TH GLEST 6 "May 4, 2008"
 .SH NAME
 glest \- A free 3d real-time customizable strategy game.
 .SH SYNOPSIS

Modified: packages/trunk/glest/debian/glest.sh
===================================================================
--- packages/trunk/glest/debian/glest.sh	2008-05-04 13:50:03 UTC (rev 6852)
+++ packages/trunk/glest/debian/glest.sh	2008-05-04 14:22:17 UTC (rev 6853)
@@ -5,7 +5,7 @@
 cd $DIR
 [ -f glest.ini ] || cp /usr/lib/glest/glest.ini .
 [ -h glest ] || ln -s /usr/lib/glest/glest .
-[ -f configuration.xml ] || ln -s $MAINDIR/configuration.xml .
+[ -f servers.ini ] || cp $MAINDIR/servers.ini .
 for i in data docs scenarios techs tilesets; do
       [ -h $i ] || ln -s $MAINDIR/$i .
 done
@@ -16,4 +16,4 @@
 done
 cd ..
 
-./glest
+exec ./glest

Added: packages/trunk/glest/debian/patches/gcc-4.3-fixes
===================================================================
--- packages/trunk/glest/debian/patches/gcc-4.3-fixes	                        (rev 0)
+++ packages/trunk/glest/debian/patches/gcc-4.3-fixes	2008-05-04 14:22:17 UTC (rev 6853)
@@ -0,0 +1,51 @@
+Index: glest-3.1.2/shared_lib/sources/platform/posix/socket.cpp
+===================================================================
+--- glest-3.1.2.orig/shared_lib/sources/platform/posix/socket.cpp
++++ glest-3.1.2/shared_lib/sources/platform/posix/socket.cpp
+@@ -20,6 +20,9 @@
+ 
+ #include "conversion.h"
+ 
++#include <cstdlib>
++#include <cstring>
++
+ using namespace std;
+ using namespace Shared::Util;
+ 
+Index: glest-3.1.2/shared_lib/sources/util/conversion.cpp
+===================================================================
+--- glest-3.1.2.orig/shared_lib/sources/util/conversion.cpp
++++ glest-3.1.2/shared_lib/sources/util/conversion.cpp
+@@ -13,6 +13,8 @@
+ 
+ #include <stdexcept>
+ #include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ 
+ #include "leak_dumper.h"
+ 
+Index: glest-3.1.2/shared_lib/sources/util/util.cpp
+===================================================================
+--- glest-3.1.2.orig/shared_lib/sources/util/util.cpp
++++ glest-3.1.2/shared_lib/sources/util/util.cpp
+@@ -14,6 +14,7 @@
+ #include <ctime>
+ #include <cassert>
+ #include <stdexcept>
++#include <cstring>
+ 
+ #include "leak_dumper.h"
+ 
+Index: glest-3.1.2/shared_lib/sources/util/properties.cpp
+===================================================================
+--- glest-3.1.2.orig/shared_lib/sources/util/properties.cpp
++++ glest-3.1.2/shared_lib/sources/util/properties.cpp
+@@ -13,6 +13,7 @@
+ 
+ #include <fstream>
+ #include <stdexcept>
++#include <cstring>
+ 
+ #include "conversion.h"
+ #include "leak_dumper.h"

Modified: packages/trunk/glest/debian/patches/series
===================================================================
--- packages/trunk/glest/debian/patches/series	2008-05-04 13:50:03 UTC (rev 6852)
+++ packages/trunk/glest/debian/patches/series	2008-05-04 14:22:17 UTC (rev 6853)
@@ -1,2 +1,2 @@
 nomapeditor
-use-fixed-fonts
+gcc-4.3-fixes

Modified: packages/trunk/glest/debian/rules
===================================================================
--- packages/trunk/glest/debian/rules	2008-05-04 13:50:03 UTC (rev 6852)
+++ packages/trunk/glest/debian/rules	2008-05-04 14:22:17 UTC (rev 6853)
@@ -5,17 +5,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall
-CXXFLAGS = -Wall
+CFLAGS += -Wall
+CXXFLAGS += -Wall
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-	CXXFLAGS += -O0
-else
-	CFLAGS += -O2
-	CXXFLAGS += -O2
-endif
-
 configure: configure-stamp
 configure-stamp: patch
 	dh_testdir
@@ -23,7 +15,6 @@
 	chmod +x configure && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 	touch configure-stamp
 
-
 build: build-stamp
 
 build-stamp: configure-stamp


