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

Siegfried-Angel Gevatter Pujals rainct-guest at alioth.debian.org
Tue Feb 17 21:15:42 UTC 2009 

Author: rainct-guest
Date: 2009-02-17 21:15:42 +0000 (Tue, 17 Feb 2009)
New Revision: 8874

Removed:
   packages/trunk/glest/debian/docs
   packages/trunk/glest/debian/patches/gcc-4.3-fixes
   packages/trunk/glest/debian/patches/use-fixed-fonts
Modified:
   packages/trunk/glest/debian/changelog
   packages/trunk/glest/debian/control
   packages/trunk/glest/debian/copyright
   packages/trunk/glest/debian/dirs
   packages/trunk/glest/debian/glest.desktop
   packages/trunk/glest/debian/glest.install
   packages/trunk/glest/debian/patches/do-not-link-unneeded-libs
   packages/trunk/glest/debian/patches/nomapeditor
   packages/trunk/glest/debian/patches/series
   packages/trunk/glest/debian/rules
Log:
* New upstream version.
   - Repackage the tarball from .zip to .tar.gz.
* debian/control:
   - Change my entry in the Uploaders field.
   - Add a Build-Depends on liblua5.1-dev.
   - Bump Standards-Version to 3.8.0.
* debian/glest.install:
   - Adjust the origin path.
* debian/glest.desktop:
   - Fix a typo in the Catalan description.
* debian/patches/nomapeditor, debian/patches/do-not-link-unneeded-libs:
   - Update them to apply against the new source.
* debian/patches/series, debian/patches/gcc-4.3-fixes:
   - Remove gcc-4.3-fixes, it has been adopted upstream.
* debian/rules:
   - Update it to work with the changed directory structure.
* debian/dirs:
   - Remove some unnecessary lines (we still need bin/games because the only
     file there is installed by debian/rules without using dh_install).
* debian/copyright:
   - Change the download location to SourceForge.
   - Update the copyright to match the directory structure changes.
* debian/docs:
   - Upstream's README files have no interesting content; remove it.

Modified: packages/trunk/glest/debian/changelog
===================================================================
--- packages/trunk/glest/debian/changelog	2009-02-17 20:44:43 UTC (rev 8873)
+++ packages/trunk/glest/debian/changelog	2009-02-17 21:15:42 UTC (rev 8874)
@@ -1,3 +1,32 @@
+glest (3.2.1-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+     - Repackage the tarball from .zip to .tar.gz.
+  * debian/control:
+     - Change my entry in the Uploaders field.
+     - Add a Build-Depends on liblua5.1-dev.
+     - Bump Standards-Version to 3.8.0.
+  * debian/glest.install:
+     - Adjust the origin path.
+  * debian/glest.desktop:
+     - Fix a typo in the Catalan description.
+  * debian/patches/nomapeditor, debian/patches/do-not-link-unneeded-libs:
+     - Update them to apply against the new source.
+  * debian/patches/series, debian/patches/gcc-4.3-fixes:
+     - Remove gcc-4.3-fixes, it has been adopted upstream.
+  * debian/rules:
+     - Update it to work with the changed directory structure.
+  * debian/dirs:
+     - Remove some unnecessary lines (we still need bin/games because the only
+       file there is installed by debian/rules without using dh_install).
+  * debian/copyright:
+     - Change the download location to SourceForge.
+     - Update the copyright to match the directory structure changes.
+  * debian/docs:
+     - Upstream's README files have no interesting content; remove it.
+
+ -- Siegfried-Angel Gevatter Pujals <rainct at ubuntu.com>  Tue, 17 Feb 2009 21:08:33 +0100
+
 glest (3.1.2-1) unstable; urgency=low
 
   [ Siegfried-Angel Gevatter Pujals (RainCT)]

Modified: packages/trunk/glest/debian/control
===================================================================
--- packages/trunk/glest/debian/control	2009-02-17 20:44:43 UTC (rev 8873)
+++ packages/trunk/glest/debian/control	2009-02-17 21:15:42 UTC (rev 8874)
@@ -2,9 +2,10 @@
 Section: contrib/games
 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, libxerces-c2-dev, libvorbis-dev, libogg-dev, libopenal-dev, quilt
-Standards-Version: 3.7.3
+Uploaders: Giuseppe Borzi <gborzi at ieee.org>, Eddy Petrișor <eddy.petrisor at gmail.com>, Siegfried-Angel Gevatter Pujals <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, libxerces-c2-dev,
+ libvorbis-dev, libogg-dev, libopenal-dev, liblua5.1-dev, quilt
+Standards-Version: 3.8.0
 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
 Homepage: http://www.glest.org/

Modified: packages/trunk/glest/debian/copyright
===================================================================
--- packages/trunk/glest/debian/copyright	2009-02-17 20:44:43 UTC (rev 8873)
+++ packages/trunk/glest/debian/copyright	2009-02-17 21:15:42 UTC (rev 8874)
@@ -1,7 +1,7 @@
 This package was debianized by Giuseppe Borzi <gborzi at ieee.org> on
 Sat, 18 Feb 2006 13:33:04 +0100.
 
-It was downloaded from http://www.glest.org
+It was downloaded from http://sourceforge.net/glest
 
 Authors:
 
@@ -15,9 +15,9 @@
        which belong to Matthias Braun.
     
     Copyright (C) 2005 Matthias Braun <matze at braunis.de>
-     - shared_lib/*/platform/posix/
-     - shared_lib/*/platform/sdl/
-     - shared_lib/*/sound/openal/
+     - source/shared_lib/*/platform/posix/
+     - source/shared_lib/*/platform/sdl/
+     - source/shared_lib/*/sound/openal/
 
 License:
 

Modified: packages/trunk/glest/debian/dirs
===================================================================
--- packages/trunk/glest/debian/dirs	2009-02-17 20:44:43 UTC (rev 8873)
+++ packages/trunk/glest/debian/dirs	2009-02-17 21:15:42 UTC (rev 8874)
@@ -1,4 +1 @@
 usr/games
-usr/lib/glest
-usr/share/pixmaps
-usr/share/applications

Deleted: packages/trunk/glest/debian/docs
===================================================================
--- packages/trunk/glest/debian/docs	2009-02-17 20:44:43 UTC (rev 8873)
+++ packages/trunk/glest/debian/docs	2009-02-17 21:15:42 UTC (rev 8874)
@@ -1 +0,0 @@
-README*

Modified: packages/trunk/glest/debian/glest.desktop
===================================================================
--- packages/trunk/glest/debian/glest.desktop	2009-02-17 20:44:43 UTC (rev 8873)
+++ packages/trunk/glest/debian/glest.desktop	2009-02-17 21:15:42 UTC (rev 8874)
@@ -2,7 +2,7 @@
 Type=Application
 Name=Glest
 Comment=Play a real-time strategy game with 3D graphics
-Comment[ca]=Construiu edificis i comandeu les vostres tropes cap a la victòria en aquest joc d'estratègia en temps real
+Comment[ca]=Construïu edificis i comandeu les vostres tropes cap a la victòria en aquest joc d'estratègia en temps real
 Comment[es]=Construye edificios y comanda tus tropas hacia la victoria en este juego de estrategia en tiempo real
 Exec=glest
 Icon=glest

Modified: packages/trunk/glest/debian/glest.install
===================================================================
--- packages/trunk/glest/debian/glest.install	2009-02-17 20:44:43 UTC (rev 8873)
+++ packages/trunk/glest/debian/glest.install	2009-02-17 21:15:42 UTC (rev 8874)
@@ -1,4 +1,4 @@
 glest usr/lib/glest
-glest.ini usr/lib/glest
+/mk/linux/glest.ini usr/lib/glest
 debian/glest.xpm usr/share/pixmaps
 debian/glest.desktop usr/share/applications

Modified: packages/trunk/glest/debian/patches/do-not-link-unneeded-libs
===================================================================
--- packages/trunk/glest/debian/patches/do-not-link-unneeded-libs	2009-02-17 20:44:43 UTC (rev 8873)
+++ packages/trunk/glest/debian/patches/do-not-link-unneeded-libs	2009-02-17 21:15:42 UTC (rev 8874)
@@ -1,22 +1,22 @@
-Index: glest-3.1.2/Jamfile
+Index: glest-3.2.1/mk/linux/Jamfile
 ===================================================================
---- glest-3.1.2.orig/Jamfile
-+++ glest-3.1.2/Jamfile
-@@ -25,7 +25,7 @@
+--- glest-3.2.1.orig/mk/linux/Jamfile	2009-02-17 21:33:09.000000000 +0100
++++ glest-3.2.1/mk/linux/Jamfile	2009-02-17 21:33:12.000000000 +0100
+@@ -26,7 +26,7 @@
  }
  
  Library glestlib : $(LIB_SOURCES) ;
--ExternalLibs glestlib : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL ;
-+ExternalLibs glestlib : SDL GL GLU XERCES VORBISFILE OPENAL ;
+-ExternalLibs glestlib : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL LUA ;
++ExternalLibs glestlib : SDL GL GLU XERCES VORBISFILE OPENAL LUA ;
  IncludeDir glestlib : $(LIB_INCLUDE_DIRS) ;
  
  #### Game ####
-@@ -54,7 +54,7 @@
+@@ -55,7 +55,7 @@
  
  Application glest : $(GLEST_SOURCES) ;
  LinkWith glest : glestlib ;
--ExternalLibs glest : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL ;
-+ExternalLibs glest : SDL GL GLU XERCES VORBISFILE OPENAL ;
+-ExternalLibs glest : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL LUA ;
++ExternalLibs glest : SDL GL GLU XERCES VORBISFILE OPENAL LUA ;
  IncludeDir glest : ../shared_lib/include/$(LIB_INCLUDE_DIRS) $(GLEST_DIRS) ;
  
  ##### Editor ####

Deleted: packages/trunk/glest/debian/patches/gcc-4.3-fixes
===================================================================
--- packages/trunk/glest/debian/patches/gcc-4.3-fixes	2009-02-17 20:44:43 UTC (rev 8873)
+++ packages/trunk/glest/debian/patches/gcc-4.3-fixes	2009-02-17 21:15:42 UTC (rev 8874)
@@ -1,51 +0,0 @@
-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/nomapeditor
===================================================================
--- packages/trunk/glest/debian/patches/nomapeditor	2009-02-17 20:44:43 UTC (rev 8873)
+++ packages/trunk/glest/debian/patches/nomapeditor	2009-02-17 21:15:42 UTC (rev 8874)
@@ -1,7 +1,7 @@
-Index: glest-3.0.0/Jamfile
+Index: glest-3.0.0/mk/linux/Jamfile
 ===================================================================
---- glest-3.0.0.orig/Jamfile	2008-02-02 15:58:10.000000000 +0100
-+++ glest-3.0.0/Jamfile	2008-02-02 15:58:21.000000000 +0100
+--- glest-3.0.0.orig/mk/linux/Jamfile	2008-02-02 15:58:10.000000000 +0100
++++ glest-3.0.0/mk/linux/Jamfile	2008-02-02 15:58:21.000000000 +0100
 @@ -57,18 +57,18 @@
  ExternalLibs glest : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL ;
  IncludeDir glest : ../shared_lib/include/$(LIB_INCLUDE_DIRS) $(GLEST_DIRS) ;

Modified: packages/trunk/glest/debian/patches/series
===================================================================
--- packages/trunk/glest/debian/patches/series	2009-02-17 20:44:43 UTC (rev 8873)
+++ packages/trunk/glest/debian/patches/series	2009-02-17 21:15:42 UTC (rev 8874)
@@ -1,3 +1,2 @@
 nomapeditor
-gcc-4.3-fixes
 do-not-link-unneeded-libs

Deleted: packages/trunk/glest/debian/patches/use-fixed-fonts
===================================================================
--- packages/trunk/glest/debian/patches/use-fixed-fonts	2009-02-17 20:44:43 UTC (rev 8873)
+++ packages/trunk/glest/debian/patches/use-fixed-fonts	2009-02-17 21:15:42 UTC (rev 8874)
@@ -1,17 +0,0 @@
-Index: glest-3.1.0/glest.ini
-===================================================================
---- glest-3.1.0.orig/glest.ini	2008-02-15 16:18:02.000000000 +0000
-+++ glest-3.1.0/glest.ini	2008-02-15 16:19:21.000000000 +0000
-@@ -19,9 +19,9 @@
- FogOfWar=1
- FogOfWarSmoothing=1
- FogOfWarSmoothingFrameSkip=3
--FontConsole=-*-utopia-*-*-*-*-12-*-*-*-*-*-*-*
--FontDisplay=-*-utopia-*-*-*-*-12-*-*-*-*-*-*-*
--FontMenu=-*-utopia-*-*-*-*-12-*-*-*-*-*-*-*
-+FontConsole=-*-fixed-*-*-*-*-12-*-*-*-*-*-*-*
-+FontDisplay=-*-fixed-*-*-*-*-12-*-*-*-*-*-*-*
-+FontMenu=-*-fixed-*-*-*-*-12-*-*-*-*-*-*-*
- Lang=english.lng
- MaxLights=1
- NetworkConsistencyChecks=1

Modified: packages/trunk/glest/debian/rules
===================================================================
--- packages/trunk/glest/debian/rules	2009-02-17 20:44:43 UTC (rev 8873)
+++ packages/trunk/glest/debian/rules	2009-02-17 21:15:42 UTC (rev 8874)
@@ -2,17 +2,25 @@
 # -*- makefile -*-
 
 include /usr/share/quilt/quilt.make
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 CFLAGS += -Wall
 CXXFLAGS += -Wall
 
+CONFDIR=$(CURDIR)/mk/linux/
+
 configure: configure-stamp
 configure-stamp: patch
 	dh_testdir
-	# Add here commands to configure the package.
-	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
+	cd $(CONFDIR) && chmod +x autogen.sh && ./autogen.sh
+	chmod +x $(CONFDIR)/configure && \
+		CFLAGS="$(CFLAGS)" \
+		CXXFLAGS="$(CXXFLAGS)" \
+	$(CONFDIR)/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
@@ -25,14 +33,20 @@
 
 	touch build-stamp
 
-clean: configure clean-patched unpatch
+clean: clean-patched unpatch
 clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	jam -q distclean
+	[ ! -f $(CURDIR)/Jamconfig ] || jam -q distclean
+	rm -f $(CURDIR)/Jamfile $(CONFDIR)/Jamconfig.in \
+		$(CONFDIR)/configure $(CONFDIR)/aclocal.m4
+	rm -rf build
+	[ ! -h $(CONFDIR)/glest_game ] || unlink $(CONFDIR)/glest_game
+	[ ! -h $(CONFDIR)/glest_map_editor ] || -unlink $(CONFDIR)/glest_map_editor
+	[ ! -h $(CONFDIR)/shared_lib ] || unlink $(CONFDIR)/shared_lib
 
 	dh_clean

More information about the Pkg-games-commits mailing list