--- adonthell-0.3.5.orig/debian/copyright +++ adonthell-0.3.5/debian/copyright @@ -6,6 +6,21 @@ Upstream Authors: Kai Sterker & the Adonthell team Copyright: + (C) 1997-2001 by Dimitri van Heesch + (C) 1999 The Adonthell Team + (C) 1999-2001 The Adonthell Project + (C) 1999-2004 Kai Sterker + (C) 1999-2004 Alexandre Courbot + (C) Copyright 2000-2001, 2004 Joel Vennin +src/tools/oggloop/vcedit.h: (C) 2000-2001 Michael Smith +src/tools/oggloop/vcedit.c: (C) 2000-2001 Michael Smith +src/audio.h: (C) 2000 Andrew Henderson +src/gettext.h: (C) 1995-1998, 2000-2002, 2004 Free Software Foundation, Inc. +src/tools/charedit/dirbrowser.h: (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies +src/tools/charedit/dirbrowser.cc: (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies +src/tools/questedit/dirbrowser.h: (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies +src/tools/questedit/dirbrowser.cc: (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies +src/audio.cc: (C) 2000 Andrew Henderson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by --- adonthell-0.3.5.orig/debian/README.source +++ adonthell-0.3.5/debian/README.source @@ -0,0 +1,58 @@ +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 + +where 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 + +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 /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). 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 + +You may need to run quilt pop -a to unapply patches first before running +this command. --- adonthell-0.3.5.orig/debian/changelog +++ adonthell-0.3.5/debian/changelog @@ -1,3 +1,191 @@ +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 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 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 to Uploaders + + -- Iain Lane 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 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 . + + 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 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 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 Sat, 02 Jun 2007 07:18:26 +0200 + +adonthell (0.3.4.cvs.20050813-2.4) unstable; urgency=high + + * Non-maintainer upload. + * Replace remaining "" with . + (Closes: #398694) + Thanks Goswin von Brederlow and Matthew Johnson for noticing. + + -- Mohammed Adnène Trojette 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 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 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 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 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 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 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 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 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 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 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 Tue, 1 Oct 2002 07:25:13 +0200 + adonthell (0.3.3-1) unstable; urgency=low * New upstream release --- adonthell-0.3.5.orig/debian/compat +++ adonthell-0.3.5/debian/compat @@ -1 +1 @@ -4 +5 --- adonthell-0.3.5.orig/debian/pyversions +++ adonthell-0.3.5/debian/pyversions @@ -0,0 +1 @@ +2.3- --- adonthell-0.3.5.orig/debian/watch +++ adonthell-0.3.5/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://savannah.nongnu.org/download/adonthell/adonthell-src-(.*)\.tar\.gz debian + --- adonthell-0.3.5.orig/debian/rules +++ adonthell-0.3.5/debian/rules @@ -2,13 +2,29 @@ #export DH_VERBOSE=1 +include /usr/share/quilt/quilt.make + DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -CXXFLAGS = "-Wall -O2 -fno-exceptions -DDATA_DIR=\"\\\"/usr/share/games/adonthell\"\\\"" +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) + + +#for some reason when adonthell embeds python2.5 on arm(el) it fails to init +#so use python2.4 there for now +DEB_BUILD_ARCH_CPU ?=$(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) + +#note: DEB_BUILD_ARCH_CPU is arm on both arm and armel +ifeq ($(DEB_BUILD_ARCH_CPU),arm) + PYVERSIONNN :=2.4 +endif + +PYVERSION :=python$(PYVERSIONNN) + ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) CXXFLAGS += -g CFGDEBUG = "--enable-py-debug" @@ -16,39 +32,57 @@ 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 +configure: configure-stamp +configure-stamp: $(QUILT_STAMPFN) dh_testdir + + + -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/python2.2/config -lpython2.2 -ldl -lpthread -lutil" \ - --with-py-cflags="-I/usr/include/python2.2" \ + --with-py-libs="-Wl,-E -L/usr/lib/$(PYVERSION)/config -l$(PYVERSION) -ldl -lpthread -lutil -lSDL -lSDL_ttf -lSDL_mixer" \ + --with-py-cflags="-I/usr/include/$(PYVERSION)" \ $(CFGDEBUG) + touch configure-stamp -build: build-stamp +build: configure-stamp build-stamp -build-stamp: config.status +build-stamp: dh_testdir - $(MAKE) CXXFLAGS=$(CXXFLAGS) INSTALL_PROGRAM="$(INSTALL_PROGRAM)" + + $(MAKE) CXXFLAGS="$(CXXFLAGS)" INSTALL_PROGRAM="$(INSTALL_PROGRAM)" + touch build-stamp -clean: +clean: unpatch dh_testdir dh_testroot - rm -f build-stamp + rm -f configure-stamp 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 + [ ! -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 @@ -59,6 +93,10 @@ $(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 # Build architecture-independent files here. binary-indep: build install @@ -72,6 +110,7 @@ dh_installmenu dh_installman debian/adonthell.6 dh_installchangelogs ChangeLog + dh_pysupport -V $(PYVERSIONNN) adonthell /usr/share/games/adonthell/modules/ dh_link dh_strip dh_compress --- adonthell-0.3.5.orig/debian/control +++ adonthell-0.3.5/debian/control @@ -1,14 +1,19 @@ Source: adonthell Section: games Priority: optional -Maintainer: Gordon Fraser -Build-Depends: debhelper (>= 4), libsdl1.2-dev, python (>= 1.5), python-dev (>=1.5), libvorbis-dev, libc6-dev, zlib1g-dev, swig1.3 (>= 1.3.14), libfreetype6-dev, bison -Standards-Version: 3.5.6.1 +Maintainer: Debian Games Team +Uploaders: Barry deFreese , Iain Lane +Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, libsdl1.2-dev, libvorbis-dev, zlib1g-dev, swig1.3 (>= 1.3.14), libfreetype6-dev, libaa1-dev, python-dev (>= 2.3.5-11), python-support (>= 0.4.0), libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libsdl1.2-dev, quilt (>= 0.40), python2.4-dev [arm armel] +Standards-Version: 3.8.3 +Homepage: http://adonthell.linuxgames.com/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/adonthell/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/adonthell/?op=log Package: adonthell Architecture: any -Depends: ${shlibs:Depends} -Recommends: adonthell-data (>= 0.3), adonthell-data (<< 0.4) +Depends: ${shlibs:Depends}, ${python:Depends} +Recommends: adonthell-data (>= 0.3.3-3), adonthell-data (<< 0.4) +Conflicts: adonthell-data (<< 0.3.3-3) Description: A 2D graphical roleplaying game A 2D graphical RPG game inspired by good old console RPGs like the ones on the SNES. --- adonthell-0.3.5.orig/debian/patches/series +++ adonthell-0.3.5/debian/patches/series @@ -0,0 +1,2 @@ +04_do_not_ship_pyc.diff +10_ftbfs_with_gcc-4.4.diff --- adonthell-0.3.5.orig/debian/patches/10_ftbfs_with_gcc-4.4.diff +++ adonthell-0.3.5/debian/patches/10_ftbfs_with_gcc-4.4.diff @@ -0,0 +1,25 @@ +Patch backported from http://github.com/ksterker/adonthell/tree/master, +commit c620028d36510103d15efe15fed11532a4cd4a71 +Index: adonthell-0.3.5/src/dialog.cc +=================================================================== +--- adonthell-0.3.5.orig/src/dialog.cc 2009-09-12 09:35:25.000000000 +0400 ++++ adonthell-0.3.5/src/dialog.cc 2009-09-12 09:49:58.000000000 +0400 +@@ -265,7 +265,8 @@ + { + u_int32 begin, end, len; + PyObject *result; +- char *tmp, *start, *mid, *str = NULL; ++ char *tmp, *mid, *str = NULL; ++ const char *start; + character *the_player = data::the_player; + string newstr (s); + +@@ -318,7 +319,7 @@ + + // Error! + cout << "\n*** Error, unknown macro " << start << flush; +- start[0] = ' '; ++ newstr[newstr.length () - strlen (start)] = ' '; + } + + // execute python functions --- adonthell-0.3.5.orig/debian/patches/04_do_not_ship_pyc.diff +++ adonthell-0.3.5/debian/patches/04_do_not_ship_pyc.diff @@ -0,0 +1,28 @@ +Index: adonthell-0.3.5/src/modules/Makefile.am +=================================================================== +--- adonthell-0.3.5.orig/src/modules/Makefile.am 2008-02-11 19:58:20.000000000 +0000 ++++ adonthell-0.3.5/src/modules/Makefile.am 2008-12-22 23:43:49.000000000 +0000 +@@ -3,7 +3,8 @@ + pyc_files = dialogue.pyc adonthell.pyc + py_files = dialogue.py adonthell.py + +-moddata_DATA = $(pyc_files) ++#moddata_DATA = $(pyc_files) ++moddata_DATA = $(py_files) + + EXTRA_DIST = $(py_files) + +Index: adonthell-0.3.5/src/modules/Makefile.in +=================================================================== +--- adonthell-0.3.5.orig/src/modules/Makefile.in 2008-05-29 19:43:05.000000000 +0100 ++++ adonthell-0.3.5/src/modules/Makefile.in 2008-12-22 23:43:49.000000000 +0000 +@@ -210,7 +210,8 @@ + moddatadir = $(gamedatadir)/modules + pyc_files = dialogue.pyc adonthell.pyc + py_files = dialogue.py adonthell.py +-moddata_DATA = $(pyc_files) ++#moddata_DATA = $(pyc_files) ++moddata_DATA = $(py_files) + EXTRA_DIST = $(py_files) + CLEANFILES = $(pyc_files) + all: all-am