r10034 - in packages/trunk/boswars/debian: . patches

Tue Jul 14 16:34:03 UTC 2009

Author: bdefreese
Date: 2009-07-14 16:34:01 +0000 (Tue, 14 Jul 2009)
New Revision: 10034

Added:
   packages/trunk/boswars/debian/patches/20_fix_ftbfs_with_gcc-4.4.diff
Modified:
   packages/trunk/boswars/debian/
   packages/trunk/boswars/debian/changelog
   packages/trunk/boswars/debian/control
   packages/trunk/boswars/debian/copyright
   packages/trunk/boswars/debian/patches/series
Log:
  * 20_fix_ftbfs_with_gcc-4.4.diff - Build with gcc-4.4. (Closes: #505080).
    + Thanks to Martin Michlmayr for the fix!
  * debian/copyright: Add info for DeJavu files. (Closes: #528946).
  * Add myself to uploaders.
  * Bump Standards Version to 3.8.2. (No changes needed).
Add svn-bp properties.



Property changes on: packages/trunk/boswars/debian
___________________________________________________________________
Added: svn-bp:tagsUrl
   + svn+ssh://svn.debian.org/svn/pkg-games/packages/tags/boswars
Added: svn-bp:origUrl
   + http://pkg-games.alioth.debian.org/tarballs/boswars_2.5.orig.tar.gz

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

--- packages/trunk/boswars/debian/changelog	2009-07-14 11:12:16 UTC (rev 10033)
+++ packages/trunk/boswars/debian/changelog	2009-07-14 16:34:01 UTC (rev 10034)
@@ -1,3 +1,14 @@
+boswars (2.5-2) unstable; urgency=low
+
+  [ Barry deFreese ]
+  * 20_fix_ftbfs_with_gcc-4.4.diff - Build with gcc-4.4. (Closes: #505080).
+    + Thanks to Martin Michlmayr for the fix!
+  * debian/copyright: Add info for DeJavu files. (Closes: #528946).
+  * Add myself to uploaders.
+  * Bump Standards Version to 3.8.2. (No changes needed).
+
+ -- Barry deFreese <bdefreese at debian.org>  Tue, 14 Jul 2009 11:51:52 -0400
+
 boswars (2.5-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/trunk/boswars/debian/control
===================================================================
--- packages/trunk/boswars/debian/control	2009-07-14 11:12:16 UTC (rev 10033)
+++ packages/trunk/boswars/debian/control	2009-07-14 16:34:01 UTC (rev 10034)
@@ -2,9 +2,9 @@
 Section: games
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
+Uploaders: Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>, Barry deFreese <bdefreese at debian.org>
 Build-Depends: debhelper (>= 5), scons, quilt, libpng12-dev, libsdl1.2-dev, libvorbis-dev, liblua5.1-0-dev | liblua50-dev, pkg-config, libtheora-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/boswars/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/boswars/?op=log
 Homepage: http://www.boswars.org/

Modified: packages/trunk/boswars/debian/copyright
===================================================================
--- packages/trunk/boswars/debian/copyright	2009-07-14 11:12:16 UTC (rev 10033)
+++ packages/trunk/boswars/debian/copyright	2009-07-14 16:34:01 UTC (rev 10034)
@@ -516,7 +516,53 @@
 X-Comment: On Debian systems, the complete text of the GNU General
  Public License, version 2 can be found in “/usr/share/common-licenses/GPL-2”.
 
+Files: graphics/general/dejavu*.png
+Copyright: © 2003 by Bitstream, Inc.
+License: Bitstream
 
+ | Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved.
+ | Bitstream Vera is a trademark of Bitstream, Inc.
+ |
+ | Permission is hereby granted, free of charge, to any person obtaining a 
+ | copy of the fonts accompanying this license ("Fonts") and associated 
+ | documentation files (the "Font Software"), to reproduce and distribute
+ | the Font Software, including without limitation the rights to use, copy,
+ | merge, publish, distribute, and/or sell copies of the Font Software, and
+ | to permit persons to whom the Font Software is furnished to do so, subject
+ | to the following conditions:
+ |
+ | The above copyright and trademark notices and this permission notice shall
+ | be included in all copies of one or more of the Font Software typefaces.
+ |
+ | The Font Software may be modified, altered, or added to, and in particular
+ | the designs of glyphs or characters in the Fonts may be modified and
+ | additional glyphs or characters may be added to the Fonts, only if the
+ | fonts are renamed to names not containing either the words "Bitstream" or
+ | the word "Vera".
+ |
+ | This License becomes null and void to the extent applicable to Fonts or
+ | Font Software that has been modified and is distributed under the
+ | "Bitstream Vera" names.
+ |
+ | The Font Software may be sold as part of a larger software package but
+ | no copy of one or more of the Font Software typefaces may be sold by itself.
+ |
+ | THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ | EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+ | MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ | OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+ | BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ | OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
+ | OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ | OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+ | SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+ |
+ | Except as contained in this notice, the names of Gnome, the Gnome
+ | Foundation, and Bitstream Inc., shall not be used in advertising or
+ | otherwise to promote the sale, use or other dealings in this Font
+ | Software without prior written authorization from the Gnome Foundation
+ | or Bitstream Inc., respectively. For further information, contact:
+ | fonts at gnome dot org. 
 
 Files: debian/*
 Copyright: © 2007-2008 Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>

Added: packages/trunk/boswars/debian/patches/20_fix_ftbfs_with_gcc-4.4.diff
===================================================================
--- packages/trunk/boswars/debian/patches/20_fix_ftbfs_with_gcc-4.4.diff	                        (rev 0)
+++ packages/trunk/boswars/debian/patches/20_fix_ftbfs_with_gcc-4.4.diff	2009-07-14 16:34:01 UTC (rev 10034)
@@ -0,0 +1,24 @@
+Index: boswars-2.5-src/engine/pathfinder/astar.cpp
+===================================================================
+--- boswars-2.5-src.orig/engine/pathfinder/astar.cpp	2009-07-14 11:53:41.000000000 -0400
++++ boswars-2.5-src/engine/pathfinder/astar.cpp	2009-07-14 11:54:06.000000000 -0400
+@@ -36,6 +36,7 @@
+ #include "stratagus.h"
+ #include "pathfinder.h"
+ 
++#include <cstdio>
+ #include <cstdlib>
+ 
+ /*----------------------------------------------------------------------------
+Index: boswars-2.5-src/engine/stratagus/translate.cpp
+===================================================================
+--- boswars-2.5-src.orig/engine/stratagus/translate.cpp	2009-07-14 11:54:22.000000000 -0400
++++ boswars-2.5-src/engine/stratagus/translate.cpp	2009-07-14 11:55:00.000000000 -0400
+@@ -34,6 +34,7 @@
+ 
+ #include "stratagus.h"
+ 
++#include <cstdio>
+ #include <map>
+ #include <string>
+ 

Modified: packages/trunk/boswars/debian/patches/series
===================================================================
--- packages/trunk/boswars/debian/patches/series	2009-07-14 11:12:16 UTC (rev 10033)
+++ packages/trunk/boswars/debian/patches/series	2009-07-14 16:34:01 UTC (rev 10034)
@@ -1 +1,2 @@
 10_fix_ftbfs_with_gcc-4.3.diff
+20_fix_ftbfs_with_gcc-4.4.diff


