r15756 - in packages/tags/adonthell: . 0.3.5-11/debian 0.3.5-11/debian/patches
Markus Koschany
apo at moszumanska.debian.org
Thu Apr 14 18:49:48 UTC 2016
Author: apo
Date: 2016-04-14 18:49:48 +0000 (Thu, 14 Apr 2016)
New Revision: 15756
Added:
packages/tags/adonthell/0.3.5-11/
packages/tags/adonthell/0.3.5-11/debian/README.source
packages/tags/adonthell/0.3.5-11/debian/changelog
packages/tags/adonthell/0.3.5-11/debian/control
packages/tags/adonthell/0.3.5-11/debian/patches/disable-swig.patch
packages/tags/adonthell/0.3.5-11/debian/patches/format-security.patch
packages/tags/adonthell/0.3.5-11/debian/patches/series
packages/tags/adonthell/0.3.5-11/debian/patches/typemap-bool.patch
packages/tags/adonthell/0.3.5-11/debian/rules
Removed:
packages/tags/adonthell/0.3.5-11/debian/README.source
packages/tags/adonthell/0.3.5-11/debian/changelog
packages/tags/adonthell/0.3.5-11/debian/control
packages/tags/adonthell/0.3.5-11/debian/patches/series
packages/tags/adonthell/0.3.5-11/debian/rules
Log:
[svn-buildpackage] Tagging adonthell 0.3.5-11
Deleted: packages/tags/adonthell/0.3.5-11/debian/README.source
===================================================================
--- packages/trunk/adonthell/debian/README.source 2016-04-13 20:19:05 UTC (rev 15754)
+++ packages/tags/adonthell/0.3.5-11/debian/README.source 2016-04-14 18:49:48 UTC (rev 15756)
@@ -1,58 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- break
- fi
- done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
- quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
- quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches. Then, for every file that will be modified by this patch,
-run:
-
- quilt add <file>
-
-before editing those files. You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly. After editing the files, run:
-
- quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
- quilt import -P <patch> /path/to/patch
- quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches. The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
- quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
Copied: packages/tags/adonthell/0.3.5-11/debian/README.source (from rev 15755, packages/trunk/adonthell/debian/README.source)
===================================================================
--- packages/tags/adonthell/0.3.5-11/debian/README.source (rev 0)
+++ packages/tags/adonthell/0.3.5-11/debian/README.source 2016-04-14 18:49:48 UTC (rev 15756)
@@ -0,0 +1,50 @@
+Adonthell for Debian
+====================
+
+As of 0.3.5-11 rebuilding of adonthell.py and py_adonthell_wrap.cc
+(disable-swig.patch) has been disabled.
+
+The latest version of Swig (>= 3) changed its default behaviour in wrapping C++
+bool. You would see a TypeError on startup like:
+
+Traceback (most recent call last):
+ File "/usr/share/games/adonthell/games/wastesedge/scripts/init.py", line 229, in
+ <module> title = title_screen ()
+ File "/usr/share/games/adonthell/games/wastesedge/scripts/init.py", line 43, in
+ __init__ self.bag_o.set_visible (0)
+ File "/usr/share/games/adonthell/modules/adonthell.py", line 3420, in set_visible
+ return _adonthell.win_base_set_visible(self, b)
+ TypeError: in method 'win_base_set_visible', argument 2 of type 'bool'
+
+See http://www.swig.org/Release/CHANGES (2014-03-06) for more information about
+this new behaviour.
+
+There are three solutions to overcome this issue.
+
+1. Enable typemap-bool.patch in debian/patches/series.
+2. Pass -DSWIG_PYTHON_LEGACY_BOOL to swig on the command line. (src/Makefile.in)
+3. Change all occurences of Python expressions for bool in adonthell-data like
+ that
+
+ OLD:
+
+ adonthell.audio_play_background (0)
+ self.c_bag.set_visible (1)
+
+ NEW:
+
+ adonthell.audio_play_background (False)
+ self.c_bag.set_visible (True)
+
+Unfortunately there is more work needed.
+
+TypeError: on_update() takes exactly 1 argument (2 given)
+
+Multiple error messages appear later because several methods expect one
+argument instead of two. The correct fix would probably be to update the Swig
+interface file and files like win_event.{h,cc} and to rebuild adonthell.py
+again.
+
+Any help to fix those issues is much appreciated.
+
+
Deleted: packages/tags/adonthell/0.3.5-11/debian/changelog
===================================================================
--- packages/trunk/adonthell/debian/changelog 2016-04-13 20:19:05 UTC (rev 15754)
+++ packages/tags/adonthell/0.3.5-11/debian/changelog 2016-04-14 18:49:48 UTC (rev 15756)
@@ -1,320 +0,0 @@
-adonthell (0.3.5-10) unstable; urgency=medium
-
- * Team upload.
-
- [ Evgeni Golov ]
- * Correct Vcs-* URLs to point to anonscm.debian.org.
-
- [ Moritz Muehlenhoff ]
- * Remove myself from uploaders.
-
- [ Markus Koschany ]
- * wrap-and-sort -sa.
- * Declare compliance with Debian Policy 3.9.8.
- * Use compat level 9 and require debhelper >= 9.
- * Vcs-Browser: Use https.
- * Fix Lintian warning copyright-refers-to-symlink-license.
- * Try to build adonthell on all architectures again. Set architecture field
- to any. (Closes: #727144)
- * debian/rules: Remove empty directories.
- * Remove lintian-overrides file.
-
- -- Markus Koschany <apo at debian.org> Mon, 11 Apr 2016 22:36:13 +0200
-
-adonthell (0.3.5-9) unstable; urgency=low
-
- * Remove extra flag from --with python2. (Closes: #710317).
-
- -- Barry deFreese <bdefreese at debian.org> Wed, 29 May 2013 14:44:36 -0400
-
-adonthell (0.3.5-8) unstable; urgency=low
-
- * Acknowledge NMU.
- * Clean up packaging.
- - Change debian/rules to dh7 style.
- - Bump debhelper and compat to 7.
- - Replace Conflicts with Breaks in control.
- - Add hardening flags.
- - Update Homepage to new address.
- - Remove links against libdl and libutil since they aren't used.
- * Bump Standards Version to 3.9.4.
-
- -- Barry deFreese <bdefreese at debian.org> Mon, 20 May 2013 08:24:40 -0400
-
-adonthell (0.3.5-7.1) unstable; urgency=medium
-
- * Non-maintainer upload.
- * debian/patches/12_no_sparc_bytecompile.patch:
- - Do not bytecompile Python files during build on sparc, workaround
- to let adonthell compile again. Generated files were not installed
- in the package, and byte-compilation is performed at a later stage
- by python-support anyway (Closes: #639450).
-
- -- Luca Falavigna <dktrkranz at debian.org> Sun, 02 Oct 2011 17:21:03 +0200
-
-adonthell (0.3.5-7) unstable; urgency=low
-
- * Team upload.
- * Thanks Torsten for the NMU!
- * Fix FTBFS caused by the NMU.
- configure looks for a "swig" binary, the swig2.0 package provides
- just swig2.0, making the build fail. Build-Depend on swig (>= 1.3),
- which will pull in the latest stable swig by default.
- Closes: #633107, #630933, #632531
-
- -- Evgeni Golov <evgeni at debian.org> Fri, 08 Jul 2011 16:10:50 +0200
-
-adonthell (0.3.5-6.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * Build with swig2.0 to allow removal of the obsolete swig1.3 package.
-
- -- Torsten Landschoff <torsten at debian.org> Wed, 22 Jun 2011 23:46:34 +0200
-
-adonthell (0.3.5-6) unstable; urgency=low
-
- * Team upload.
-
- [ Iain Lane ]
- * debian/control: Remove myself from Uploaders
-
- [ Peter De Wachter ]
- * Fixed FTBFS with newer gcc. (Closes: #624998) (LP: #765984)
- - Added patch: 11_ftbfs_with_gcc-4.6.diff
-
- [ Evgeni Golov ]
- * Drop the "A" from the Description.
- * Add ${misc:Depends} to Depends.
-
- -- Evgeni Golov <evgeni at debian.org> Sun, 08 May 2011 22:55:59 +0200
-
-adonthell (0.3.5-5) unstable; urgency=low
-
- * Drop support for armel for now (Closes: #562904)
-
- -- Moritz Muehlenhoff <jmm at debian.org> Wed, 06 Jan 2010 19:26:27 +0100
-
-adonthell (0.3.5-4) unstable; urgency=low
-
- * Add myself to uploaders
- * Drop special case handling of Python for arm, Python 2.4 is being
- removed. If it still fails with the current toolchain, we need to
- find a fix in Python or drop support for Arm (Closes: #562401)
- * Drop versioned Build-Depends for python-dev, swig1.3 and
- python-support; all satified even in Etch
- * Convert to source format 3 (quilt)
-
- -- Moritz Muehlenhoff <jmm at debian.org> Thu, 24 Dec 2009 16:31:20 +0100
-
-adonthell (0.3.5-3) unstable; urgency=low
-
- [ Barry deFreese ]
- * 10_ftbfs_with_gcc-4.4.diff. Fix FTBFS with gcc-4.4. (Closes: #546356).
- + Thanks to Ilya Barygin for the patch!
- * Add README.source for quilt.
- * Bump Standards Version to 3.8.3. (No changes needed).
-
- -- Barry deFreese <bdefreese at debian.org> Sat, 12 Dec 2009 09:01:51 -0500
-
-adonthell (0.3.5-2) unstable; urgency=low
-
- [ Barry deFreese ]
- * Update my e-mail address.
- * Bump Standards Version to 3.8.2. (No changes needed).
-
- -- Barry deFreese <bdefreese at debian.org> Tue, 28 Jul 2009 11:46:07 -0400
-
-adonthell (0.3.5-1) experimental; urgency=low
-
- [ Gonéri Le Bouder ]
- * add the missing -p1 in debian/patches/series so the package doesn't
- FTBFS with the quilt source format (Closes: #484977)
- * Bump the standard version to 3.8.0, no change needed.
-
- [ Ansgar Burchardt ]
- * Add watch file
-
- [ Iain Lane ]
- * New upstream version 0.3.5
- * debian/rules: Use quilt.make to apply patches.
- * debian/patches: Delete obsolete patches.
- * debian/patches/04_do_not_ship_pyc.diff: Refreshed.
- * debian/watch: Updated to look at savannah.nongnu.org
-
- [ Miriam Ruiz ]
- * Added Iain Lane <laney at ubuntu.com> to Uploaders
-
- -- Iain Lane <laney at ubuntu.com> Wed, 31 Dec 2008 14:23:46 +0000
-
-adonthell (0.3.4.cvs.20080529-1+nmu1) unstable; urgency=medium
-
- * Non-maintainer upload.
- * Fix FTBFS on arm and armel, thanks to peter green. (Closes: #486654)
-
- -- Philipp Kern <pkern at debian.org> Fri, 01 Aug 2008 11:08:10 +0200
-
-adonthell (0.3.4.cvs.20080529-1) unstable; urgency=low
-
- [ Barry deFreese ]
- * New maintainer. (Closes: #427141).
- + Debian Games Team <pkg-games-devel at lists.alioth.debian.org>.
- + Add myself to uploaders.
- * New upstream CVS snapshot.
- + Drop all current patches as they are fixed in CVS.
- + Fixes to build with python2.5. (Closes: #451631).
- * Make clean not ignore errors.
- * Add copyright holders to debian/copyright.
- * Move Homepage from package description to source header.
- * Add VCS tags.
- * Add autotools-dev build dependency.
- * Don't ship pyc files. (Closes: #392492).
- + Thanks to Luis Rodrigo Gallardo Cruz for the patch.
- * Remove symlink and rename binary to /usr/games/adonthell.
- * Bump debian/compat to 5.
- * Bump Standards Version to 3.7.3. (No changes needed).
-
- [ Gonéri Le Bouder ]
- * Remove src/modules/adonthell.py src/py_adonthell_wrap.cc since they are
- generated with SWIG during the build process
-
- -- Barry deFreese <bddebian at comcast.net> Thu, 29 May 2008 21:54:50 -0400
-
-adonthell (0.3.4.cvs.20050813-4) unstable; urgency=medium
-
- * QA upload.
- * Apply patch from Peter Green to fix FTBFS with gcc 4.3. closes: #477011.
- * Bump to Standards-Version 3.7.3.
-
- -- Clint Adams <schizo at debian.org> Mon, 21 Apr 2008 10:39:20 -0400
-
-adonthell (0.3.4.cvs.20050813-3) unstable; urgency=low
-
- * Orphan package, set maintainer to Debian QA Group
-
- -- Gordon Fraser <gordon at debian.org> Sat, 02 Jun 2007 07:18:26 +0200
-
-adonthell (0.3.4.cvs.20050813-2.4) unstable; urgency=high
-
- * Non-maintainer upload.
- * Replace remaining "<SDL/SDL_keysym.h>" with <SDL_keysym.h>.
- (Closes: #398694)
- Thanks Goswin von Brederlow and Matthew Johnson for noticing.
-
- -- Mohammed Adnène Trojette <adn+deb at diwi.org> Sat, 18 Nov 2006 17:43:05 +0100
-
-adonthell (0.3.4.cvs.20050813-2.3) unstable; urgency=low
-
- * Non-maintainer upload.
- * Fix SDL include statement in src/py_adonthell.i.
-
- -- Mohammed Adnène Trojette <adn+deb at diwi.org> Wed, 20 Sep 2006 00:27:19 +0200
-
-adonthell (0.3.4.cvs.20050813-2.2) unstable; urgency=medium
-
- * Non-maintainer upload with medium urgency.
- * Update to the New Python Policy (Closes: #380756)
- + debian/control
- - bump build-dependency on debhelper to (>= 5.0.37.2)
- - remove build-dependency on python and python-dev
- - build-depend on python-dev (>= 2.3.5-11)
- - build-depend on python-support (>= 0.4)
- - depend on ${python:Depends}
- + debian/rules
- - build with $(shell pyversions -d) to make the package bin-NMUable
- - run dh_pythonsupport only (hence the >= 0.4 build-dep)
- * Build-Depend on libsdl1.2-dev, libsdl-ttf2.0-dev and libsdl-mixer1.2-dev instead
- of with the embedded version, add -lSDL_ttf to --with-py-libs in debian/rules
- and rebootstrap (Closes: #382202)
- * Work around #374062 using a patch from Julien Danjou (Closes: #381456)
- * Build-Depend on quilt for patch management and add adequate rules.
- * Bump Standards-Version to 3.7.2.
-
- -- Mohammed Adnène Trojette <adn+deb at diwi.org> Thu, 10 Aug 2006 20:47:56 +0200
-
-adonthell (0.3.4.cvs.20050813-2.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * Remove obsolete internal objects include (Closes: #370147)
-
- -- Mohammed Adnène Trojette <adn+deb at diwi.org> Tue, 6 Jun 2006 10:21:05 +0200
-
-adonthell (0.3.4.cvs.20050813-2) unstable; urgency=low
-
- * Fix build problem with g++ 4.1 (Closes: #356171)
-
- -- Gordon Fraser <gordon at debian.org> Wed, 5 Apr 2006 15:03:17 +0200
-
-adonthell (0.3.4.cvs.20050813-1) unstable; urgency=low
-
- * Change dependency to libaa1-dev (Closes: #320890)
- * Update to latest CVS (Closes: #297096, #315305)
-
- -- Gordon Fraser <gordon at debian.org> Sat, 13 Aug 2005 09:18:48 +0200
-
-adonthell (0.3.3.cvs.20031022-3) unstable; urgency=medium
-
- * Fix problem with SWIG macro changes (Closes: #297096)
- * Urgency set to medium due to fix for RC bug
-
- -- Gordon Fraser <gordon at debian.org> Thu, 3 Mar 2005 18:08:27 +0100
-
-adonthell (0.3.3.cvs.20031022-2) unstable; urgency=low
-
- * gcc-3.4 compile fixes (Closes: #262996, #263404, #249730)
-
- -- Gordon Fraser <gordon at debian.org> Wed, 11 Aug 2004 15:33:44 +0200
-
-adonthell (0.3.3.cvs.20031022-1) unstable; urgency=low
-
- * New CVS checkout
- * Fix python include path (Closes: #216484)
- * Standards version to 3.6.1
- * Include upstream homepage in description
-
- -- Gordon Fraser <gordon at debian.org> Wed, 22 Oct 2003 16:36:30 +0200
-
-adonthell (0.3.3.cvs.20030119-2) unstable; urgency=low
-
- * Rebuild against new libvorbis0a package (Closes: #184976)
-
- -- Gordon Fraser <gordon at debian.org> Tue, 25 Mar 2003 11:57:26 +0100
-
-adonthell (0.3.3.cvs.20030119-1) unstable; urgency=low
-
- * New CVS snapshot:
- - fixes g++ 3.2 compile problems (Closes: #177307)
- * Bumped standards-version to 3.5.8
- * Removed build-dependency on bison
-
- -- Gordon Fraser <gordon at debian.org> Sun, 19 Jan 2003 16:14:39 +0100
-
-adonthell (0.3.3-2) unstable; urgency=low
-
- * Revert str_hash.c changes to fix build problem on hppa
-
- -- Gordon Fraser <gordon at debian.org> Tue, 1 Oct 2002 07:25:13 +0200
-
-adonthell (0.3.3-1) unstable; urgency=low
-
- * New upstream release
-
- -- Gordon Fraser <gordon at debian.org> Thu, 19 Sep 2002 16:41:22 +0200
-
-adonthell (0.3.2.cvs.20020906-3) unstable; urgency=low
-
- * Remove accidential need for autotools (Closes: #160665)
-
- -- Gordon Fraser <gordon at debian.org> Fri, 13 Sep 2002 08:33:43 +0200
-
-adonthell (0.3.2.cvs.20020906-2) unstable; urgency=low
-
- * Remove -fno-rtti to fix build problem on ia64
- * Revert hash<string> changes to fix build problem on hppa
-
- -- Gordon Fraser <gordon at debian.org> Thu, 12 Sep 2002 19:47:21 +0200
-
-adonthell (0.3.2.cvs.20020906-1) unstable; urgency=low
-
- * Initial Debian-upload (Closes: #158679)
-
- -- Gordon Fraser <gordon at debian.org> Wed, 28 Aug 2002 20:37:34 +0200
Copied: packages/tags/adonthell/0.3.5-11/debian/changelog (from rev 15755, packages/trunk/adonthell/debian/changelog)
===================================================================
--- packages/tags/adonthell/0.3.5-11/debian/changelog (rev 0)
+++ packages/tags/adonthell/0.3.5-11/debian/changelog 2016-04-14 18:49:48 UTC (rev 15756)
@@ -0,0 +1,334 @@
+adonthell (0.3.5-11) unstable; urgency=medium
+
+ * Team upload.
+ * Add disable-swig.patch and stop rebuilding adonthell.py from source due to
+ incompatible changes in Swig >= 3 that would cause runtime errors on
+ startup and make the game unusable. See README.source for more information
+ and work in progress.
+ * Add typemap-bool.patch but disable it by default. (See README.source)
+ * Add format-security.patch to fix FTBFS due to use of format-security flag.
+ * Build-Depend on dh-python and dh-autoreconf.
+ * Build with parallel and autoreconf.
+
+ -- Markus Koschany <apo at debian.org> Thu, 14 Apr 2016 20:04:46 +0200
+
+adonthell (0.3.5-10) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Evgeni Golov ]
+ * Correct Vcs-* URLs to point to anonscm.debian.org.
+
+ [ Moritz Muehlenhoff ]
+ * Remove myself from uploaders.
+
+ [ Markus Koschany ]
+ * wrap-and-sort -sa.
+ * Declare compliance with Debian Policy 3.9.8.
+ * Use compat level 9 and require debhelper >= 9.
+ * Vcs-Browser: Use https.
+ * Fix Lintian warning copyright-refers-to-symlink-license.
+ * Try to build adonthell on all architectures again. Set architecture field
+ to any. (Closes: #727144)
+ * debian/rules: Remove empty directories.
+ * Remove lintian-overrides file.
+
+ -- Markus Koschany <apo at debian.org> Mon, 11 Apr 2016 22:36:13 +0200
+
+adonthell (0.3.5-9) unstable; urgency=low
+
+ * Remove extra flag from --with python2. (Closes: #710317).
+
+ -- Barry deFreese <bdefreese at debian.org> Wed, 29 May 2013 14:44:36 -0400
+
+adonthell (0.3.5-8) unstable; urgency=low
+
+ * Acknowledge NMU.
+ * Clean up packaging.
+ - Change debian/rules to dh7 style.
+ - Bump debhelper and compat to 7.
+ - Replace Conflicts with Breaks in control.
+ - Add hardening flags.
+ - Update Homepage to new address.
+ - Remove links against libdl and libutil since they aren't used.
+ * Bump Standards Version to 3.9.4.
+
+ -- Barry deFreese <bdefreese at debian.org> Mon, 20 May 2013 08:24:40 -0400
+
+adonthell (0.3.5-7.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/12_no_sparc_bytecompile.patch:
+ - Do not bytecompile Python files during build on sparc, workaround
+ to let adonthell compile again. Generated files were not installed
+ in the package, and byte-compilation is performed at a later stage
+ by python-support anyway (Closes: #639450).
+
+ -- Luca Falavigna <dktrkranz at debian.org> Sun, 02 Oct 2011 17:21:03 +0200
+
+adonthell (0.3.5-7) unstable; urgency=low
+
+ * Team upload.
+ * Thanks Torsten for the NMU!
+ * Fix FTBFS caused by the NMU.
+ configure looks for a "swig" binary, the swig2.0 package provides
+ just swig2.0, making the build fail. Build-Depend on swig (>= 1.3),
+ which will pull in the latest stable swig by default.
+ Closes: #633107, #630933, #632531
+
+ -- Evgeni Golov <evgeni at debian.org> Fri, 08 Jul 2011 16:10:50 +0200
+
+adonthell (0.3.5-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build with swig2.0 to allow removal of the obsolete swig1.3 package.
+
+ -- Torsten Landschoff <torsten at debian.org> Wed, 22 Jun 2011 23:46:34 +0200
+
+adonthell (0.3.5-6) unstable; urgency=low
+
+ * Team upload.
+
+ [ Iain Lane ]
+ * debian/control: Remove myself from Uploaders
+
+ [ Peter De Wachter ]
+ * Fixed FTBFS with newer gcc. (Closes: #624998) (LP: #765984)
+ - Added patch: 11_ftbfs_with_gcc-4.6.diff
+
+ [ Evgeni Golov ]
+ * Drop the "A" from the Description.
+ * Add ${misc:Depends} to Depends.
+
+ -- Evgeni Golov <evgeni at debian.org> Sun, 08 May 2011 22:55:59 +0200
+
+adonthell (0.3.5-5) unstable; urgency=low
+
+ * Drop support for armel for now (Closes: #562904)
+
+ -- Moritz Muehlenhoff <jmm at debian.org> Wed, 06 Jan 2010 19:26:27 +0100
+
+adonthell (0.3.5-4) unstable; urgency=low
+
+ * Add myself to uploaders
+ * Drop special case handling of Python for arm, Python 2.4 is being
+ removed. If it still fails with the current toolchain, we need to
+ find a fix in Python or drop support for Arm (Closes: #562401)
+ * Drop versioned Build-Depends for python-dev, swig1.3 and
+ python-support; all satified even in Etch
+ * Convert to source format 3 (quilt)
+
+ -- Moritz Muehlenhoff <jmm at debian.org> Thu, 24 Dec 2009 16:31:20 +0100
+
+adonthell (0.3.5-3) unstable; urgency=low
+
+ [ Barry deFreese ]
+ * 10_ftbfs_with_gcc-4.4.diff. Fix FTBFS with gcc-4.4. (Closes: #546356).
+ + Thanks to Ilya Barygin for the patch!
+ * Add README.source for quilt.
+ * Bump Standards Version to 3.8.3. (No changes needed).
+
+ -- Barry deFreese <bdefreese at debian.org> Sat, 12 Dec 2009 09:01:51 -0500
+
+adonthell (0.3.5-2) unstable; urgency=low
+
+ [ Barry deFreese ]
+ * Update my e-mail address.
+ * Bump Standards Version to 3.8.2. (No changes needed).
+
+ -- Barry deFreese <bdefreese at debian.org> Tue, 28 Jul 2009 11:46:07 -0400
+
+adonthell (0.3.5-1) experimental; urgency=low
+
+ [ Gonéri Le Bouder ]
+ * add the missing -p1 in debian/patches/series so the package doesn't
+ FTBFS with the quilt source format (Closes: #484977)
+ * Bump the standard version to 3.8.0, no change needed.
+
+ [ Ansgar Burchardt ]
+ * Add watch file
+
+ [ Iain Lane ]
+ * New upstream version 0.3.5
+ * debian/rules: Use quilt.make to apply patches.
+ * debian/patches: Delete obsolete patches.
+ * debian/patches/04_do_not_ship_pyc.diff: Refreshed.
+ * debian/watch: Updated to look at savannah.nongnu.org
+
+ [ Miriam Ruiz ]
+ * Added Iain Lane <laney at ubuntu.com> to Uploaders
+
+ -- Iain Lane <laney at ubuntu.com> Wed, 31 Dec 2008 14:23:46 +0000
+
+adonthell (0.3.4.cvs.20080529-1+nmu1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS on arm and armel, thanks to peter green. (Closes: #486654)
+
+ -- Philipp Kern <pkern at debian.org> Fri, 01 Aug 2008 11:08:10 +0200
+
+adonthell (0.3.4.cvs.20080529-1) unstable; urgency=low
+
+ [ Barry deFreese ]
+ * New maintainer. (Closes: #427141).
+ + Debian Games Team <pkg-games-devel at lists.alioth.debian.org>.
+ + Add myself to uploaders.
+ * New upstream CVS snapshot.
+ + Drop all current patches as they are fixed in CVS.
+ + Fixes to build with python2.5. (Closes: #451631).
+ * Make clean not ignore errors.
+ * Add copyright holders to debian/copyright.
+ * Move Homepage from package description to source header.
+ * Add VCS tags.
+ * Add autotools-dev build dependency.
+ * Don't ship pyc files. (Closes: #392492).
+ + Thanks to Luis Rodrigo Gallardo Cruz for the patch.
+ * Remove symlink and rename binary to /usr/games/adonthell.
+ * Bump debian/compat to 5.
+ * Bump Standards Version to 3.7.3. (No changes needed).
+
+ [ Gonéri Le Bouder ]
+ * Remove src/modules/adonthell.py src/py_adonthell_wrap.cc since they are
+ generated with SWIG during the build process
+
+ -- Barry deFreese <bddebian at comcast.net> Thu, 29 May 2008 21:54:50 -0400
+
+adonthell (0.3.4.cvs.20050813-4) unstable; urgency=medium
+
+ * QA upload.
+ * Apply patch from Peter Green to fix FTBFS with gcc 4.3. closes: #477011.
+ * Bump to Standards-Version 3.7.3.
+
+ -- Clint Adams <schizo at debian.org> Mon, 21 Apr 2008 10:39:20 -0400
+
+adonthell (0.3.4.cvs.20050813-3) unstable; urgency=low
+
+ * Orphan package, set maintainer to Debian QA Group
+
+ -- Gordon Fraser <gordon at debian.org> Sat, 02 Jun 2007 07:18:26 +0200
+
+adonthell (0.3.4.cvs.20050813-2.4) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Replace remaining "<SDL/SDL_keysym.h>" with <SDL_keysym.h>.
+ (Closes: #398694)
+ Thanks Goswin von Brederlow and Matthew Johnson for noticing.
+
+ -- Mohammed Adnène Trojette <adn+deb at diwi.org> Sat, 18 Nov 2006 17:43:05 +0100
+
+adonthell (0.3.4.cvs.20050813-2.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix SDL include statement in src/py_adonthell.i.
+
+ -- Mohammed Adnène Trojette <adn+deb at diwi.org> Wed, 20 Sep 2006 00:27:19 +0200
+
+adonthell (0.3.4.cvs.20050813-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload with medium urgency.
+ * Update to the New Python Policy (Closes: #380756)
+ + debian/control
+ - bump build-dependency on debhelper to (>= 5.0.37.2)
+ - remove build-dependency on python and python-dev
+ - build-depend on python-dev (>= 2.3.5-11)
+ - build-depend on python-support (>= 0.4)
+ - depend on ${python:Depends}
+ + debian/rules
+ - build with $(shell pyversions -d) to make the package bin-NMUable
+ - run dh_pythonsupport only (hence the >= 0.4 build-dep)
+ * Build-Depend on libsdl1.2-dev, libsdl-ttf2.0-dev and libsdl-mixer1.2-dev instead
+ of with the embedded version, add -lSDL_ttf to --with-py-libs in debian/rules
+ and rebootstrap (Closes: #382202)
+ * Work around #374062 using a patch from Julien Danjou (Closes: #381456)
+ * Build-Depend on quilt for patch management and add adequate rules.
+ * Bump Standards-Version to 3.7.2.
+
+ -- Mohammed Adnène Trojette <adn+deb at diwi.org> Thu, 10 Aug 2006 20:47:56 +0200
+
+adonthell (0.3.4.cvs.20050813-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove obsolete internal objects include (Closes: #370147)
+
+ -- Mohammed Adnène Trojette <adn+deb at diwi.org> Tue, 6 Jun 2006 10:21:05 +0200
+
+adonthell (0.3.4.cvs.20050813-2) unstable; urgency=low
+
+ * Fix build problem with g++ 4.1 (Closes: #356171)
+
+ -- Gordon Fraser <gordon at debian.org> Wed, 5 Apr 2006 15:03:17 +0200
+
+adonthell (0.3.4.cvs.20050813-1) unstable; urgency=low
+
+ * Change dependency to libaa1-dev (Closes: #320890)
+ * Update to latest CVS (Closes: #297096, #315305)
+
+ -- Gordon Fraser <gordon at debian.org> Sat, 13 Aug 2005 09:18:48 +0200
+
+adonthell (0.3.3.cvs.20031022-3) unstable; urgency=medium
+
+ * Fix problem with SWIG macro changes (Closes: #297096)
+ * Urgency set to medium due to fix for RC bug
+
+ -- Gordon Fraser <gordon at debian.org> Thu, 3 Mar 2005 18:08:27 +0100
+
+adonthell (0.3.3.cvs.20031022-2) unstable; urgency=low
+
+ * gcc-3.4 compile fixes (Closes: #262996, #263404, #249730)
+
+ -- Gordon Fraser <gordon at debian.org> Wed, 11 Aug 2004 15:33:44 +0200
+
+adonthell (0.3.3.cvs.20031022-1) unstable; urgency=low
+
+ * New CVS checkout
+ * Fix python include path (Closes: #216484)
+ * Standards version to 3.6.1
+ * Include upstream homepage in description
+
+ -- Gordon Fraser <gordon at debian.org> Wed, 22 Oct 2003 16:36:30 +0200
+
+adonthell (0.3.3.cvs.20030119-2) unstable; urgency=low
+
+ * Rebuild against new libvorbis0a package (Closes: #184976)
+
+ -- Gordon Fraser <gordon at debian.org> Tue, 25 Mar 2003 11:57:26 +0100
+
+adonthell (0.3.3.cvs.20030119-1) unstable; urgency=low
+
+ * New CVS snapshot:
+ - fixes g++ 3.2 compile problems (Closes: #177307)
+ * Bumped standards-version to 3.5.8
+ * Removed build-dependency on bison
+
+ -- Gordon Fraser <gordon at debian.org> Sun, 19 Jan 2003 16:14:39 +0100
+
+adonthell (0.3.3-2) unstable; urgency=low
+
+ * Revert str_hash.c changes to fix build problem on hppa
+
+ -- Gordon Fraser <gordon at debian.org> Tue, 1 Oct 2002 07:25:13 +0200
+
+adonthell (0.3.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Gordon Fraser <gordon at debian.org> Thu, 19 Sep 2002 16:41:22 +0200
+
+adonthell (0.3.2.cvs.20020906-3) unstable; urgency=low
+
+ * Remove accidential need for autotools (Closes: #160665)
+
+ -- Gordon Fraser <gordon at debian.org> Fri, 13 Sep 2002 08:33:43 +0200
+
+adonthell (0.3.2.cvs.20020906-2) unstable; urgency=low
+
+ * Remove -fno-rtti to fix build problem on ia64
+ * Revert hash<string> changes to fix build problem on hppa
+
+ -- Gordon Fraser <gordon at debian.org> Thu, 12 Sep 2002 19:47:21 +0200
+
+adonthell (0.3.2.cvs.20020906-1) unstable; urgency=low
+
+ * Initial Debian-upload (Closes: #158679)
+
+ -- Gordon Fraser <gordon at debian.org> Wed, 28 Aug 2002 20:37:34 +0200
Deleted: packages/tags/adonthell/0.3.5-11/debian/control
===================================================================
--- packages/trunk/adonthell/debian/control 2016-04-13 20:19:05 UTC (rev 15754)
+++ packages/tags/adonthell/0.3.5-11/debian/control 2016-04-14 18:49:48 UTC (rev 15756)
@@ -1,42 +0,0 @@
-Source: adonthell
-Section: games
-Priority: optional
-Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders:
- Barry deFreese <bdefreese at debian.org>
-Build-Depends:
- autotools-dev,
- debhelper (>= 9),
- dpkg-dev (>= 1.16.1~),
- libaa1-dev,
- libfreetype6-dev,
- libsdl-mixer1.2-dev,
- libsdl-ttf2.0-dev,
- libsdl1.2-dev,
- libvorbis-dev,
- python-dev,
- swig (>= 1.3),
- zlib1g-dev
-Standards-Version: 3.9.8
-Homepage: http://adonthell.nongnu.org/index.shtml
-Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/adonthell/
-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/adonthell/
-
-Package: adonthell
-Architecture: any
-Depends:
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
-Recommends:
- adonthell-data (<< 0.4),
- adonthell-data (>= 0.3.3-3)
-Breaks:
- adonthell-data (<< 0.3.3-3)
-Description: 2D graphical roleplaying game
- A 2D graphical RPG game inspired by good old console RPGs like the
- ones on the SNES.
- .
- This package contains the Adonthell engine. You'll also need a game
- to be able to play. For this release, the official game is Waste's
- Edge, found in the package adonthell-data.
Copied: packages/tags/adonthell/0.3.5-11/debian/control (from rev 15755, packages/trunk/adonthell/debian/control)
===================================================================
--- packages/tags/adonthell/0.3.5-11/debian/control (rev 0)
+++ packages/tags/adonthell/0.3.5-11/debian/control 2016-04-14 18:49:48 UTC (rev 15756)
@@ -0,0 +1,43 @@
+Source: adonthell
+Section: games
+Priority: optional
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Uploaders:
+ Barry deFreese <bdefreese at debian.org>
+Build-Depends:
+ debhelper (>= 9),
+ dh-autoreconf,
+ dh-python,
+ dpkg-dev (>= 1.16.1~),
+ libaa1-dev,
+ libfreetype6-dev,
+ libsdl-mixer1.2-dev,
+ libsdl-ttf2.0-dev,
+ libsdl1.2-dev,
+ libvorbis-dev,
+ python-dev,
+ swig (>= 1.3),
+ zlib1g-dev
+Standards-Version: 3.9.8
+Homepage: http://adonthell.nongnu.org/index.shtml
+Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/adonthell/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/adonthell/
+
+Package: adonthell
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Recommends:
+ adonthell-data (<< 0.4),
+ adonthell-data (>= 0.3.3-3)
+Breaks:
+ adonthell-data (<< 0.3.3-3)
+Description: 2D graphical roleplaying game
+ A 2D graphical RPG game inspired by good old console RPGs like the
+ ones on the SNES.
+ .
+ This package contains the Adonthell engine. You'll also need a game
+ to be able to play. For this release, the official game is Waste's
+ Edge, found in the package adonthell-data.
Copied: packages/tags/adonthell/0.3.5-11/debian/patches/disable-swig.patch (from rev 15755, packages/trunk/adonthell/debian/patches/disable-swig.patch)
===================================================================
--- packages/tags/adonthell/0.3.5-11/debian/patches/disable-swig.patch (rev 0)
+++ packages/tags/adonthell/0.3.5-11/debian/patches/disable-swig.patch 2016-04-14 18:49:48 UTC (rev 15756)
@@ -0,0 +1,29 @@
+From: Markus Koschany <apo at debian.org>
+Date: Thu, 14 Apr 2016 18:59:31 +0200
+Subject: disable swig
+
+Do not rebuild adonthell.py and py_adonthell_wrap.cc. As of Swig >= 3.x this
+would cause runtime errors on startup.
+
+See README.source for more information and ideas to fix this issue.
+
+Forwarded: not-needed
+---
+ src/Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index f18477d..5b74fa0 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -768,8 +768,8 @@ uninstall-am: uninstall-binPROGRAMS
+
+
+ # Note: adonthell.py is also built by this target.
+-py_adonthell_wrap.cc : py_adonthell.i $(headers)
+- @if test "${P_SWIG}"; then \
++#py_adonthell_wrap.cc : py_adonthell.i $(headers)
++# @if test "${P_SWIG}"; then \
+ echo ${P_SWIG} -python -modern -shadow ${SDL_CFLAGS} -I$(srcdir) -I$(top_srcdir) -c++ -makedefault -o $(srcdir)/$*.cc $(srcdir)/py_adonthell.i; \
+ ${P_SWIG} -python -modern -shadow ${SDL_CFLAGS} -I$(srcdir) -I$(top_srcdir) -c++ -makedefault -o $(srcdir)/$*.cc $(srcdir)/py_adonthell.i; \
+ mv $(srcdir)/adonthell.py modules/adonthell.py; \
Copied: packages/tags/adonthell/0.3.5-11/debian/patches/format-security.patch (from rev 15755, packages/trunk/adonthell/debian/patches/format-security.patch)
===================================================================
--- packages/tags/adonthell/0.3.5-11/debian/patches/format-security.patch (rev 0)
+++ packages/tags/adonthell/0.3.5-11/debian/patches/format-security.patch 2016-04-14 18:49:48 UTC (rev 15756)
@@ -0,0 +1,24 @@
+From: Markus Koschany <apo at debian.org>
+Date: Thu, 14 Apr 2016 19:20:53 +0200
+Subject: format security
+
+Fix FTBFS due to format-security flag.
+
+Forwarded: no, project is no longer active
+---
+ src/py_adonthell_wrap.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/py_adonthell_wrap.cc b/src/py_adonthell_wrap.cc
+index 048f0af..2a73207 100644
+--- a/src/py_adonthell_wrap.cc
++++ b/src/py_adonthell_wrap.cc
+@@ -867,7 +867,7 @@ SWIG_Python_AddErrorMsg(const char* mesg)
+ Py_DECREF(old_str);
+ Py_DECREF(value);
+ } else {
+- PyErr_Format(PyExc_RuntimeError, mesg);
++ PyErr_Format(PyExc_RuntimeError, "%s", mesg);
+ }
+ }
+
Deleted: packages/tags/adonthell/0.3.5-11/debian/patches/series
===================================================================
--- packages/trunk/adonthell/debian/patches/series 2016-04-13 20:19:05 UTC (rev 15754)
+++ packages/tags/adonthell/0.3.5-11/debian/patches/series 2016-04-14 18:49:48 UTC (rev 15756)
@@ -1,4 +0,0 @@
-04_do_not_ship_pyc.diff
-10_ftbfs_with_gcc-4.4.diff
-11_ftbfs_with_gcc-4.6.diff
-12_no_sparc_bytecompile.patch
Copied: packages/tags/adonthell/0.3.5-11/debian/patches/series (from rev 15755, packages/trunk/adonthell/debian/patches/series)
===================================================================
--- packages/tags/adonthell/0.3.5-11/debian/patches/series (rev 0)
+++ packages/tags/adonthell/0.3.5-11/debian/patches/series 2016-04-14 18:49:48 UTC (rev 15756)
@@ -0,0 +1,7 @@
+04_do_not_ship_pyc.diff
+10_ftbfs_with_gcc-4.4.diff
+11_ftbfs_with_gcc-4.6.diff
+12_no_sparc_bytecompile.patch
+#typemap-bool.patch
+disable-swig.patch
+format-security.patch
Copied: packages/tags/adonthell/0.3.5-11/debian/patches/typemap-bool.patch (from rev 15755, packages/trunk/adonthell/debian/patches/typemap-bool.patch)
===================================================================
--- packages/tags/adonthell/0.3.5-11/debian/patches/typemap-bool.patch (rev 0)
+++ packages/tags/adonthell/0.3.5-11/debian/patches/typemap-bool.patch 2016-04-14 18:49:48 UTC (rev 15756)
@@ -0,0 +1,28 @@
+From: Markus Koschany <apo at debian.org>
+Date: Thu, 14 Apr 2016 07:57:12 +0200
+Subject: typemap bool
+
+---
+ src/py_adonthell.i | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/py_adonthell.i b/src/py_adonthell.i
+index d5ae9a9..68e4b00 100644
+--- a/src/py_adonthell.i
++++ b/src/py_adonthell.i
+@@ -94,6 +94,15 @@ enum {Python = 1, C = 0};
+ $1 = $input;
+ }
+
++%typemap(in) bool{
++ $1 = false; // any type other than numeric is automatically false
++ if(PyInt_Check($input))
++ $1 = !(PyInt_AsLong($input) == (long)0);
++ else if(PyFloat_Check($input))
++ $1 = !(PyFloat_AsDouble($input) == 0.0);
++}
++
++
+ %include "types.h"
+ %include "fileops.h"
+ %include "event.h"
Deleted: packages/tags/adonthell/0.3.5-11/debian/rules
===================================================================
--- packages/trunk/adonthell/debian/rules 2016-04-13 20:19:05 UTC (rev 15754)
+++ packages/tags/adonthell/0.3.5-11/debian/rules 2016-04-14 18:49:48 UTC (rev 15756)
@@ -1,74 +0,0 @@
-#!/usr/bin/make -f
-
-#export DH_VERBOSE=1
-
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-CXXFLAGS += -Wall -fno-exceptions -DSWIG_GLOBAL -DDATA_DIR=\"\\\"/usr/share/games/adonthell\"\\\"
-CFGDEBUG = ""
-INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL} -p -o root -g root -m 755
-
-PYVERSIONNN:=$(shell pyversions -d -v)
-PYVERSION :=python$(PYVERSIONNN)
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CXXFLAGS += -g
- CFGDEBUG = "--enable-py-debug"
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CXXFLAGS += -O0
-else
- CXXFLAGS += -O2
-endif
-
-%:
- dh $@ --with python2
-
-override_dh_auto_configure:
- -test -r /usr/share/misc/config.sub && \
- cp -f /usr/share/misc/config.sub config.sub
- -test -r /usr/share/misc/config.guess && \
- cp -f /usr/share/misc/config.guess config.guess
-
-
- ./configure --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --bindir=\$${prefix}/games \
- --datadir=\$${prefix}/share/games \
- --with-py-libs="-Wl,-E -L/usr/lib/$(PYVERSION)/config -l$(PYVERSION) -lpthread -lSDL -lSDL_ttf -lSDL_mixer" \
- --with-py-cflags="-I/usr/include/$(PYVERSION)" \
- $(CFGDEBUG)
-
-
-override_dh_auto_build:
- $(MAKE) CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
-
-
-override_dh_auto_install:
- $(MAKE) install DESTDIR="$(CURDIR)/debian/adonthell" INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
- #Remove the symlink and change binary name back to adonthell
- rm -f $(CURDIR)/debian/adonthell/usr/games/adonthell
- mv $(CURDIR)/debian/adonthell/usr/games/adonthell-0.3 \
- $(CURDIR)/debian/adonthell/usr/games/adonthell
- # Remove empty directories
- find . -type d -empty -delete
-
-override_dh_clean:
- [ ! -f Makefile ] || $(MAKE) distclean
- -rm -f `find . -name "*~"`
- -rm -f src/adonthell.pyc
-
- rm -f config.guess config.sub
-
- # drop files generated by SWIG
- rm -f src/modules/adonthell.py src/py_adonthell_wrap.cc
- dh_clean
Copied: packages/tags/adonthell/0.3.5-11/debian/rules (from rev 15755, packages/trunk/adonthell/debian/rules)
===================================================================
--- packages/tags/adonthell/0.3.5-11/debian/rules (rev 0)
+++ packages/tags/adonthell/0.3.5-11/debian/rules 2016-04-14 18:49:48 UTC (rev 15756)
@@ -0,0 +1,72 @@
+#!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+#export DH_VERBOSE=1
+
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# If you manage to fix the issues mentioned in README.source, you should
+# probably replace the current CXXFLAGS variable with the old one again and
+# remove src/modules/adonthell.py src/py_adonthell_wrap.cc in override_dh_clean.
+# CXXFLAGS += -Wall -fno-exceptions -DSWIG_GLOBAL -DDATA_DIR=\"\\\"/usr/share/games/adonthell\"\\\"
+CXXFLAGS += -Wall -fno-exceptions -DDATA_DIR=\"\\\"/usr/share/games/adonthell\"\\\"
+CFGDEBUG = ""
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL} -p -o root -g root -m 755
+
+PYVERSIONNN:=$(shell pyversions -d -v)
+PYVERSION :=python$(PYVERSIONNN)
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CXXFLAGS += -g
+ CFGDEBUG = "--enable-py-debug"
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CXXFLAGS += -O0
+else
+ CXXFLAGS += -O2
+endif
+
+%:
+ dh $@ --parallel --with autoreconf,python2
+
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --bindir=\$${prefix}/games \
+ --datadir=\$${prefix}/share/games \
+ --with-py-libs="-Wl,-E -L/usr/lib/$(PYVERSION)/config -l$(PYVERSION) -lpthread -lSDL -lSDL_ttf -lSDL_mixer" \
+ --with-py-cflags="-I/usr/include/$(PYVERSION)" \
+ $(CFGDEBUG)
+
+
+override_dh_auto_build:
+ $(MAKE) CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
+
+
+override_dh_auto_install:
+ $(MAKE) install DESTDIR="$(CURDIR)/debian/adonthell" INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
+ #Remove the symlink and change binary name back to adonthell
+ rm -f $(CURDIR)/debian/adonthell/usr/games/adonthell
+ mv $(CURDIR)/debian/adonthell/usr/games/adonthell-0.3 \
+ $(CURDIR)/debian/adonthell/usr/games/adonthell
+ # Remove empty directories
+ find . -type d -empty -delete
+
+override_dh_clean:
+ [ ! -f Makefile ] || $(MAKE) distclean
+ -rm -f `find . -name "*~"`
+ -rm -f src/adonthell.pyc
+ rm -f config.guess config.sub
+ # drop files generated by SWIG
+ #rm -f src/modules/adonthell.py src/py_adonthell_wrap.cc
+ dh_clean
More information about the Pkg-games-commits
mailing list