[adonthell] 41/65: Merge tag 'upstream/0.3.5'
Markus Koschany
apo at moszumanska.debian.org
Tue Jul 12 19:53:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository adonthell.
commit 788847c9f9cb2c3b75d5084ae4e9fab6ee0ede56
Merge: aedf645 f096dc3
Author: Markus Koschany <apo at debian.org>
Date: Tue Jul 12 11:28:28 2016 +0200
Merge tag 'upstream/0.3.5'
Upstream version 0.3.5
ABOUT-NLS | 1101 ++
AUTHORS | 25 +
COPYING | 340 +
ChangeLog | 16 +
FULLSCREEN.howto | 100 +
INSTALL | 196 +
Makefile.am | 13 +
Makefile.in | 688 +
NEWBIE | 429 +
NEWS | 39 +
README | 191 +
README.BeOS | 106 +
README.FreeBSD | 66 +
README.MacOSX | 45 +
README.Solaris | 70 +
aclocal.m4 | 7949 +++++++++
adonthell.spec | 60 +
adonthell.spec.in | 60 +
autogen.sh | 23 +
config.guess | 1516 ++
config.h.in | 98 +
config.rpath | 614 +
config.sub | 1622 ++
configure | 25725 +++++++++++++++++++++++++++++
configure.in | 468 +
debian/changelog | 11 +-
debian/rules | 1 +
depcomp | 584 +
doc/Makefile.am | 5 +
doc/Makefile.in | 529 +
doc/charedit.lyx | 274 +
doc/devel/Makefile.am | 12 +
doc/devel/Makefile.in | 377 +
doc/devel/dialog.dxt | 34 +
doc/devel/event.dxt | 296 +
doc/devel/intro.dxt | 143 +
doc/devel/mainpage.dxt | 56 +
doc/devel/map.dxt | 43 +
doc/devel/mapcharschedules.dxt | 88 +
doc/devel/mapviewschedules.dxt | 85 +
doc/devel/newmap.dxt | 275 +
doc/devel/prog_rules.dxt | 348 +
doc/devel/python.dxt | 70 +
doc/devel/reference.cfg | 181 +
doc/devel/save.dxt | 201 +
doc/dlgedit-api/Makefile.am | 10 +
doc/dlgedit-api/Makefile.in | 374 +
doc/dlgedit-api/dlgedit-api.cfg | 193 +
doc/dlgedit/Makefile.am | 18 +
doc/dlgedit/Makefile.in | 383 +
doc/dlgedit/Makefile.latex | 31 +
doc/dlgedit/dlgedit.cfg | 153 +
doc/dlgedit/dlgedit.dxt | 949 ++
doc/dlgedit/dlgedit.sty | 74 +
doc/dlgedit/dlgedit.tex | 67 +
doc/dlgedit/dlgedit_debug.eps | 1410 ++
doc/dlgedit/dlgedit_debug.png | Bin 0 -> 5872 bytes
doc/dlgedit/dlgedit_edit.eps | 1578 ++
doc/dlgedit/dlgedit_edit.png | Bin 0 -> 9154 bytes
doc/dlgedit/dlgedit_main.eps | 2467 +++
doc/dlgedit/dlgedit_main.png | Bin 0 -> 15628 bytes
doc/dlgedit/dlgedit_run.eps | 2040 +++
doc/dlgedit/dlgedit_run.png | Bin 0 -> 9216 bytes
doc/dlgedit/footer.html | 22 +
doc/dlgedit/header.html | 8 +
doc/dlgedit/step1.eps | 248 +
doc/dlgedit/step1.png | Bin 0 -> 511 bytes
doc/dlgedit/step2.eps | 305 +
doc/dlgedit/step2.png | Bin 0 -> 390 bytes
doc/dlgedit/step3.eps | 467 +
doc/dlgedit/step3.png | Bin 0 -> 941 bytes
doc/dlgedit/step4.eps | 479 +
doc/dlgedit/step4.png | Bin 0 -> 627 bytes
doc/interpreter.lyx | 454 +
doc/items.txt | 90 +
doc/items/Makefile.am | 13 +
doc/items/Makefile.in | 377 +
doc/items/Makefile.latex | 12 +
doc/items/footer.html | 22 +
doc/items/header.html | 8 +
doc/items/items.cfg | 249 +
doc/items/items.dxt | 632 +
doc/items/items.sty | 74 +
doc/items/items.tex | 66 +
install-sh | 507 +
ltmain.sh | 6938 ++++++++
m4/Makefile.am | 1 +
m4/Makefile.in | 369 +
m4/codeset.m4 | 23 +
m4/gettext.m4 | 419 +
m4/glibc21.m4 | 32 +
m4/iconv.m4 | 101 +
m4/intdiv0.m4 | 72 +
m4/intmax.m4 | 32 +
m4/inttypes-pri.m4 | 32 +
m4/inttypes.m4 | 27 +
m4/inttypes_h.m4 | 28 +
m4/isc-posix.m4 | 26 +
m4/lcmessage.m4 | 32 +
m4/lib-ld.m4 | 110 +
m4/lib-link.m4 | 644 +
m4/lib-prefix.m4 | 185 +
m4/longdouble.m4 | 30 +
m4/longlong.m4 | 25 +
m4/nls.m4 | 31 +
m4/po.m4 | 428 +
m4/printf-posix.m4 | 46 +
m4/progtest.m4 | 92 +
m4/signed.m4 | 19 +
m4/size_max.m4 | 61 +
m4/stdint_h.m4 | 28 +
m4/uintmax_t.m4 | 32 +
m4/ulonglong.m4 | 25 +
m4/wchar_t.m4 | 22 +
m4/wint_t.m4 | 22 +
m4/xsize.m4 | 14 +
missing | 336 +
po/ChangeLog | 15 +
po/LINGUAS | 1 +
po/Makefile.in.in | 403 +
po/Makevars | 41 +
po/POTFILES.in | 0
po/Rules-quot | 47 +
po/boldquot.sed | 10 +
po/en at boldquot.header | 25 +
po/en at quot.header | 22 +
po/insert-header.sin | 23 +
po/quot.sed | 6 +
po/remove-potcdate.sin | 19 +
src/.indent.pro | 1 +
src/Makefile.am | 87 +
src/Makefile.in | 804 +
src/adonthell.cc | 214 +
src/adonthell.h | 241 +
src/animation.cc | 423 +
src/animation.h | 718 +
src/audio.cc | 376 +
src/audio.h | 108 +
src/callback.h | 292 +
src/character.cc | 36 +
src/character.h | 69 +
src/character_base.cc | 109 +
src/character_base.h | 183 +
src/data_screen.cc | 349 +
src/data_screen.h | 120 +
src/dialog.cc | 382 +
src/dialog.h | 179 +
src/dialog_screen.cc | 271 +
src/dialog_screen.h | 191 +
src/drawable.cc | 48 +
src/drawable.h | 145 +
src/drawing_area.cc | 79 +
src/drawing_area.h | 181 +
src/event.cc | 242 +
src/event.h | 364 +
src/event_handler.cc | 62 +
src/event_handler.h | 99 +
src/event_handler_base.h | 65 +
src/event_list.cc | 159 +
src/event_list.h | 203 +
src/fileops.cc | 400 +
src/fileops.h | 338 +
src/game.cc | 122 +
src/game.h | 138 +
src/gamedata.cc | 574 +
src/gamedata.h | 394 +
src/gamedate.cc | 161 +
src/gamedate.h | 118 +
src/gametime.cc | 75 +
src/gametime.h | 148 +
src/gettext.h | 79 +
src/image.cc | 415 +
src/image.h | 385 +
src/input.cc | 132 +
src/input.h | 127 +
src/label.cc | 677 +
src/label.h | 258 +
src/label_input.cc | 92 +
src/label_input.h | 47 +
src/landmap.cc | 374 +
src/landmap.h | 393 +
src/lex.prefs.cc | 1711 ++
src/main.cc | 217 +
src/map_event.cc | 140 +
src/map_event.h | 144 +
src/map_event_handler.cc | 64 +
src/map_event_handler.h | 67 +
src/mapcharacter.cc | 1173 ++
src/mapcharacter.h | 864 +
src/mapobject.cc | 199 +
src/mapobject.h | 251 +
src/mapsquare.cc | 248 +
src/mapsquare.h | 487 +
src/mapsquare_walkable.cc | 144 +
src/mapsquare_walkable.h | 399 +
src/mapview.cc | 598 +
src/mapview.h | 375 +
src/modules/Makefile.am | 18 +
src/modules/Makefile.in | 414 +
src/modules/adonthell.py | 1942 +++
src/modules/dialogue.py | 97 +
src/nls.cc | 80 +
src/nls.h | 63 +
src/path.cc | 301 +
src/path.h | 178 +
src/pnm.cc | 121 +
src/pnm.h | 66 +
src/prefs.cc | 415 +
src/prefs.h | 170 +
src/prefs.l | 51 +
src/py_adonthell.i | 135 +
src/py_adonthell_wrap.cc | 33796 ++++++++++++++++++++++++++++++++++++++
src/py_callback.cc | 161 +
src/py_callback.h | 140 +
src/py_object.cc | 218 +
src/py_object.h | 260 +
src/python_class.cc | 189 +
src/python_class.h | 140 +
src/quest.cc | 64 +
src/quest.h | 49 +
src/screen.cc | 166 +
src/screen.h | 160 +
src/storage.cc | 166 +
src/storage.h | 233 +
src/str_hash.h | 51 +
src/surface.cc | 498 +
src/surface.h | 454 +
src/text_bubble.cc | 65 +
src/text_bubble.h | 92 +
src/time_event.cc | 125 +
src/time_event.h | 187 +
src/time_event_handler.cc | 82 +
src/time_event_handler.h | 72 +
src/types.h | 55 +
src/win_background.cc | 201 +
src/win_background.h | 80 +
src/win_base.cc | 139 +
src/win_base.h | 312 +
src/win_border.cc | 320 +
src/win_border.h | 96 +
src/win_container.cc | 476 +
src/win_container.h | 183 +
src/win_event.cc | 71 +
src/win_event.h | 110 +
src/win_font.cc | 132 +
src/win_font.h | 71 +
src/win_image.h | 24 +
src/win_keys.cc | 26 +
src/win_keys.h | 38 +
src/win_label.h | 24 +
src/win_manager.cc | 254 +
src/win_manager.h | 239 +
src/win_mapview.h | 25 +
src/win_object.h | 199 +
src/win_scroll.cc | 236 +
src/win_scroll.h | 90 +
src/win_scrollbar.cc | 345 +
src/win_scrollbar.h | 101 +
src/win_select.cc | 805 +
src/win_select.h | 200 +
src/win_theme.cc | 90 +
src/win_theme.h | 58 +
src/win_ttf.cc | 159 +
src/win_ttf.h | 38 +
src/win_types.h | 69 +
src/win_wrappers.h | 882 +
src/win_write.h | 26 +
src/window.h | 4 +
src/yarg.cc | 94 +
src/yarg.h | 41 +
270 files changed, 136902 insertions(+), 5 deletions(-)
diff --cc debian/changelog
index d4e5fe9,ca8c7e2..cd56c8e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,319 -1,3 +1,320 @@@
+adonthell (0.3.5-12) UNRELEASED; urgency=medium
+
+ * Moved the package to Git
+
+ -- Markus Koschany <apo at debian.org> Tue, 12 Jul 2016 10:57:42 +0200
+
+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
++ * 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/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
++ * 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
diff --cc debian/rules
index 27b76a4,9cbcb26..40f3bc0
--- a/debian/rules
+++ b/debian/rules
@@@ -27,46 -16,71 +27,47 @@@ endi
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CXXFLAGS += -O0
+else
+ CXXFLAGS += -O2
+endif
-config.status: configure
- dh_testdir
- ./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/python2.2/config -lpython2.2 -ldl -lpthread -lutil" \
- --with-py-cflags="-I/usr/include/python2.2" \
- $(CFGDEBUG)
+%:
+ 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)
-build: build-stamp
-build-stamp: config.status
- dh_testdir
- $(MAKE) CXXFLAGS=$(CXXFLAGS) INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
- touch build-stamp
+override_dh_auto_build:
+ $(MAKE) CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- -$(MAKE) distclean
-# -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
+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
+
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- $(MAKE) install DESTDIR="$(CURDIR)/debian/adonthell" INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installmenu
- dh_installman debian/adonthell.6
- dh_installchangelogs ChangeLog
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/adonthell.git
More information about the Pkg-games-commits
mailing list