r5078 - in packages/trunk/fillets-ng/debian: . patches

Thu Dec 27 22:05:52 UTC 2007

Author: alfie
Date: 2007-12-27 22:05:52 +0000 (Thu, 27 Dec 2007)
New Revision: 5078

Added:
   packages/trunk/fillets-ng/debian/patches/
   packages/trunk/fillets-ng/debian/patches/gcc-4.3-fix
   packages/trunk/fillets-ng/debian/patches/series
Modified:
   packages/trunk/fillets-ng/debian/changelog
   packages/trunk/fillets-ng/debian/control
   packages/trunk/fillets-ng/debian/rules
Log:
  * New upstream release (Closes: #457933). Updated dependencies on data
    packages in control file.
Wrap Build-Depends in control file
  * Add quilt to Build-Depends, adding the following patch:
    - gcc-4.3-fix: Add missing #include statements to make it compile with gcc
      4.3 (Closes: #417187)
  * Really removed fabian from uploaders.
  * Remove XS- from Vcs-* entries, those are official fields now.
  * Remove Homepage from binary description field.
  * Bump Standards-Version, no changes needed.


Modified: packages/trunk/fillets-ng/debian/changelog
===================================================================

--- packages/trunk/fillets-ng/debian/changelog	2007-12-27 14:18:09 UTC (rev 5077)
+++ packages/trunk/fillets-ng/debian/changelog	2007-12-27 22:05:52 UTC (rev 5078)
@@ -1,15 +1,24 @@
-fillets-ng (0.7.4-4) UNRELEASED; urgency=low
+fillets-ng (0.8.0-1) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
-
   [ Cyril Brulebois ]
   * Added XS-Vcs-Svn and XS-Vcs-Browser fields in the control file.
 
   [ Jon Dowland ]
   * add Homepage: control field to source stanza
 
- -- Jon Dowland <jon at alcopop.org>  Mon, 03 Dec 2007 17:47:48 +0000
+  [ Gerfried Fuchs ]
+  * New upstream release (Closes: #457932). Updated dependencies on data
+    packages in control file.
+  * Add quilt to Build-Depends, adding the following patch:
+    - gcc-4.3-fix: Add missing #include statements to make it compile with gcc
+      4.3 (Closes: #417187)
+  * Really removed fabian from uploaders.
+  * Remove XS- from Vcs-* entries, those are official fields now.
+  * Remove Homepage from binary description field.
+  * Bump Standards-Version, no changes needed.
 
+ -- Gerfried Fuchs <rhonda at debian.at>  Thu, 27 Dec 2007 22:43:50 +0100
+
 fillets-ng (0.7.4-3) unstable; urgency=low
 
   [ Eddy Petrișor ]

Modified: packages/trunk/fillets-ng/debian/control
===================================================================
--- packages/trunk/fillets-ng/debian/control	2007-12-27 14:18:09 UTC (rev 5077)
+++ packages/trunk/fillets-ng/debian/control	2007-12-27 22:05:52 UTC (rev 5078)
@@ -2,18 +2,20 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: fabian linzberger <e at lefant.net>, Alexander Schmehl <tolimar at debian.org>
-Build-Depends: debhelper (>= 5), liblua50-dev, libsdl1.2-dev, libsdl-mixer1.2-dev (>= 1.2.4-3), libsdl-image1.2-dev, libsdl-ttf2.0-dev, liblualib50-dev, libx11-dev, sharutils, libfribidi-dev
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/fillets-ng/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/fillets-ng/?op=log
+Uploaders: Alexander Schmehl <tolimar at debian.org>, Gerfried Fuchs <rhonda at debian.at>
+Build-Depends: debhelper (>= 5), quilt, liblua50-dev, libsdl1.2-dev,
+  libsdl-mixer1.2-dev (>= 1.2.4-3), libsdl-image1.2-dev, libsdl-ttf2.0-dev,
+  liblualib50-dev, libx11-dev, sharutils, libfribidi-dev
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/fillets-ng/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/fillets-ng/?op=log
 Homepage: http://fillets.sourceforge.net/
 
 Package: fillets-ng
 Architecture: any
-Depends: ${shlibs:Depends}, fillets-ng-data (>= 0.7.1-2)
-Suggests: fillets-ng-data-cs (>= 0.7.1)
-Conflicts: fillets-ng-data-cs (<< 0.7.1), fillets-ng-data (<= 0.7.1-1)
+Depends: ${shlibs:Depends}, fillets-ng-data (>= 0.8.0-1)
+Suggests: fillets-ng-data-cs (>= 0.8.0)
+Conflicts: fillets-ng-data-cs (<< 0.8.0)
 Replaces: fillets-ng-data (<= 0.7.1-1)
 Description: puzzle game about witty fish saving the world sokoban-style
  Fish Fillets is strictly a puzzle game. The goal in every of the seventy
@@ -21,5 +23,3 @@
  about their surroundings, the various inhabitants of their underwater realm
  quarrel among themselves or comment on the efforts of your fish. The whole
  game is accompanied by quiet, comforting music.
- .
-  Homepage: http://fillets.sourceforge.net/

Added: packages/trunk/fillets-ng/debian/patches/gcc-4.3-fix
===================================================================
--- packages/trunk/fillets-ng/debian/patches/gcc-4.3-fix	                        (rev 0)
+++ packages/trunk/fillets-ng/debian/patches/gcc-4.3-fix	2007-12-27 22:05:52 UTC (rev 5078)
@@ -0,0 +1,27 @@
+Author: Martin Michlmayr <tbm at cyrius.com>	vim:ft=diff:
+Description: add missing #include statements, BTS #417187
+
+Index: fillets-ng-0.8.0/src/gengine/OptionAgent.cpp
+===================================================================
+--- fillets-ng-0.8.0.orig/src/gengine/OptionAgent.cpp
++++ fillets-ng-0.8.0/src/gengine/OptionAgent.cpp
+@@ -23,6 +23,7 @@
+ #include "UnknownMsgException.h"
+ #include "minmax.h"
+ 
++#include <cstdlib> //getenv
+ #include <string.h> //strlen
+ #include <locale.h> //setlocale
+ 
+Index: fillets-ng-0.8.0/src/gengine/StringTool.cpp
+===================================================================
+--- fillets-ng-0.8.0.orig/src/gengine/StringTool.cpp
++++ fillets-ng-0.8.0/src/gengine/StringTool.cpp
+@@ -8,6 +8,7 @@
+  */
+ #include "StringTool.h"
+ 
++#include <cstdlib>
+ #include <sstream>
+ 
+ //-----------------------------------------------------------------

Added: packages/trunk/fillets-ng/debian/patches/series
===================================================================
--- packages/trunk/fillets-ng/debian/patches/series	                        (rev 0)
+++ packages/trunk/fillets-ng/debian/patches/series	2007-12-27 22:05:52 UTC (rev 5078)
@@ -0,0 +1 @@
+gcc-4.3-fix

Modified: packages/trunk/fillets-ng/debian/rules
===================================================================
--- packages/trunk/fillets-ng/debian/rules	2007-12-27 14:18:09 UTC (rev 5077)
+++ packages/trunk/fillets-ng/debian/rules	2007-12-27 22:05:52 UTC (rev 5078)
@@ -6,6 +6,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -24,7 +25,7 @@
 	INSTALL_PROGRAM += -s
 endif
 
-config.status: configure
+config.status: configure patch
 	dh_testdir
 	# Add here commands to configure the package.
 	CFLAGS="$(CFLAGS)" LDFLAGS=-lX11 ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --bindir=\$${prefix}/games --datarootdir=\$${prefix}/share
@@ -38,7 +39,7 @@
 	uudecode debian/fillets-ng.png.uu -o debian/fillets-ng.png
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 


