--- pygame-1.6.orig/config_unix.py +++ pygame-1.6/config_unix.py @@ -4,6 +4,8 @@ from glob import glob from distutils.sysconfig import get_python_inc +debian = 1 + configcommand = os.environ.get('SDL_CONFIG', 'sdl-config',) configcommand = configcommand + ' --version --cflags --libs' localbase = os.environ.get('LOCALBASE', '') #do we still need this? @@ -121,6 +123,7 @@ else: print self.name + ' '[len(self.name):] + ': not found' +debian = 1 sdl_lib_name = 'SDL' @@ -143,8 +146,11 @@ print 'Unable to run "sdl-config". Please make sure a development version of SDL is installed.' raise SystemExit - - if localbase: #unneeded? + if debian: + incdirs = ['/usr/include/SDL', '/usr/include/smpeg'] + libdirs = ['/usr/lib'] + print '[Using Debian defaults]' + elif localbase: #unneeded? incdirs = [localbase + '/include/SDL'] libdirs = [localbase + '/lib'] else: --- pygame-1.6.orig/src/constants.c +++ pygame-1.6/src/constants.c @@ -25,9 +25,9 @@ /* macros used to create each constant */ -#define DEC_CONST(x) PyModule_AddIntConstant(module, #x, SDL_##x); -#define DEC_CONSTK(x) PyModule_AddIntConstant(module, #x, SDL##x); -#define DEC_CONSTN(x) PyModule_AddIntConstant(module, #x, x); +#define DEC_CONST(x) PyModule_AddIntConstant(module, #x, (int) SDL_##x); +#define DEC_CONSTK(x) PyModule_AddIntConstant(module, #x, (int) SDL##x); +#define DEC_CONSTN(x) PyModule_AddIntConstant(module, #x, (int) x); static PyMethodDef builtins[] = --- pygame-1.6.orig/debian/control +++ pygame-1.6/debian/control @@ -0,0 +1,39 @@ +Source: pygame +Section: interpreters +Priority: optional +Maintainer: Ed Boraas +Build-Depends: debhelper (>= 4.1.25), python2.3-dev, python2.2-dev, libsdl1.2-dev (>= 1.2.2-3.1), libsdl-image1.2-dev (>= 1.2.0-1.1), libsdl-mixer1.2-dev (>= 1.2.0-1.1), libsdl-ttf2.0-dev (>= 1.2.2-1.1), libsmpeg-dev (>= 0.4.4-2.1), sharutils, python2.2-numeric, python2.3-numeric, python +Standards-Version: 3.6.1 + +Package: python2.2-pygame +Architecture: any +Depends: python2.2, python2.2-numeric, python2.2-numeric-ext, ${shlibs:Depends} +Conflicts: pygame (= 1.5-2) +Replaces: pygame (= 1.5-2) +Description: SDL bindings for games development in Python 2.2 + A multimedia development kit for Python. Pygame provides modules for you + to access the video display, play sounds, track time, read the mouse and + joystick, control the CD player, render true type fonts and more. It does + this using mainly the cross-platform SDL library, a lightweight wrapper + to OS-specific APIs. + +Package: python2.3-pygame +Architecture: any +Depends: python2.3, python2.3-numeric, python2.3-numeric-ext, ${shlibs:Depends} +Description: SDL bindings for games development in Python 2.3 + A multimedia development kit for Python. Pygame provides modules for you + to access the video display, play sounds, track time, read the mouse and + joystick, control the CD player, render true type fonts and more. It does + this using mainly the cross-platform SDL library, a lightweight wrapper + to OS-specific APIs. + +Package: python-pygame +Architecture: all +Depends: ${python:Depends} +Suggests: python2.1-pygame, python2.2-pygame +Description: SDL bindings for games development in Python + A multimedia development kit for Python. Pygame provides modules for you + to access the video display, play sounds, track time, read the mouse and + joystick, control the CD player, render true type fonts and more. It does + this using mainly the cross-platform SDL library, a lightweight wrapper + to OS-specific APIs. --- pygame-1.6.orig/debian/rules +++ pygame-1.6/debian/rules @@ -0,0 +1,107 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatability version to use. +export DH_COMPAT=3 + +PYV2 = 2.2 +PYV3 = 2.3 + +configure: configure-stamp2 configure-stamp3 +configure-stamp2: + dh_testdir + python$(PYV2) config.py + touch $@ +configure-stamp3: + dh_testdir + python$(PYV3) config.py + touch $@ + +build: build-stamp2 build-stamp3 +build-stamp2: + dh_testdir + python$(PYV2) setup.py build + touch build-stamp2 +build-stamp3: + dh_testdir + python$(PYV3) setup.py build + touch build-stamp3 + +clean: + dh_testdir + dh_testroot + rm -f build-stamp[23] configure-stamp[23] + + # We ignore errors, as if the build is already clean + # (Setup has been removed) this command doesn't run + -python$(PYV2) setup.py clean + -python$(PYV3) setup.py clean + # We have to remove these as well + # (TODO: Shouldn't "setup.py clean" remove these? This + # could be investigated if you're keen, as can the need + # to use "-" to ignore errors above) + rm -f *.pyc + rm -fr build + rm -f Setup + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + python$(PYV2) setup.py install --no-compile --root=`pwd`/debian/python$(PYV2)-pygame + python$(PYV3) setup.py install --no-compile --root=`pwd`/debian/python$(PYV3)-pygame + +# We include all the documentation except: +# util (which is for building the docs from the source) +# fullinstall.txt (which is installation instructions) +# LGPL (which is in /usr/share/common-licenses/LGPL under Debian) +doclist = $(filter-out docs/util docs/fullinstall.txt docs/LGPL,$(wildcard docs/*)) + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdocs -ppython-pygame debian/copyright + dh_installmenu -i + dh_installchangelogs -i WHATSNEW + dh_link -i + dh_strip -i + dh_compress -i + dh_fixperms -i + dh_python -i + dh_installdeb -i + dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installdocs -ppython2.2-pygame $(doclist) + dh_installdocs -ppython2.3-pygame $(doclist) + dh_installexamples -ppython2.2-pygame examples/* + dh_installexamples -ppython2.3-pygame examples/* + dh_installmenu -a + dh_installchangelogs -a WHATSNEW + dh_link -a + dh_strip -a + dh_compress -a -Xexamples + dh_fixperms -a + dh_python -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- pygame-1.6.orig/debian/changelog +++ pygame-1.6/debian/changelog @@ -0,0 +1,244 @@ +pygame (1.6-0.2ubuntu1) warty; urgency=low + + * Add missing build-depends: python + + -- LaMont Jones Fri, 17 Sep 2004 17:09:53 +0000 + +pygame (1.6-0.2) unstable; urgency=low + + * NMU on maintainer's request. + * src/constants.c: cast constants to ints to prevent breakage on 64-bit + architectures (closes: #186916, #246278). + * debian/rules: use dh_python. + * debian/python2.X-pygame.{prerm,postinst}: removed. + * debian/control: + + require debhelper 4.1.25. + + make python-pygame depend on ${python:Depends}. + + Standards-version is 3.6.1 (no changes required). + + -- Josselin Mouette Fri, 28 May 2004 15:57:25 +0200 + +pygame (1.6-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Don't build the Python 2.1 target anymore, Pygame now requires 2.2 + or better. + * Update the download URL in the copyright file to www.pygame.org/ftp. + * New upstream version. (Closes: #219524) + + -- Joe Wreschnig Tue, 10 Feb 2004 19:26:36 -0600 + +pygame (1.5.6-2) unstable; urgency=low + + * Build python-pygame dummy package where it should be, + in binary-arch (Closes: #207192) + + -- Ed Boraas Mon, 25 Aug 2003 11:27:18 -0600 + +pygame (1.5.6-1) unstable; urgency=low + + * New upstream release + * Build (and default to) Python 2.3 version + + -- Ed Boraas Mon, 11 Aug 2003 20:20:39 -0600 + +pygame (1.5.5-2) unstable; urgency=low + + * Rebuild against libsdl-ttf2.0-dev + + -- Ed Boraas Wed, 16 Apr 2003 20:44:48 -0600 + +pygame (1.5.5-1) unstable; urgency=low + + * New upstream release + * Rebuild against current python-numeric (Closes: #173041) + * Add build-depends on python2.[12]-numeric (Closes: #174770) + * Version python dependency in python-pygame package + (Closes: #174289) + * Only install documentation and examples in "real" + (python2.[12]-pygame) packages (Closes: #175268) + + -- Ed Boraas Mon, 6 Jan 2002 20:06:15 -0700 + +pygame (1.5.3-2) unstable; urgency=low + + * Version the conflicts and replaces on python2.1-pygame + * Add (versioned) conflicts and replaces to python2.2-pygame + (Closes: #159347) + * Remove emacs settings from changelog.Debian + + -- Ed Boraas Thu, 19 Sep 2002 17:11:38 -0600 + +pygame (1.5.3-1) unstable; urgency=low + + * New upstream release + * Update documentation paths in postinst (Closes: #159481) + * pygame2.1-pygame conflicts with pygame (Closes: #159482) + * python-pygame suggests all other pygame versions + + -- Ed Boraas Sun, 8 Sep 2002 15:30:14 -0600 + +pygame (1.5-4) unstable; urgency=medium + + * Update postinst and prerm to precompile the right things + + -- Ed Boraas Sat, 24 Aug 2002 21:06:34 -0600 + +pygame (1.5-3) unstable; urgency=low + + * Build separate python2.1-pygame and python2.2-pygame + packages (Closes: #158078) + + -- Ed Boraas Sat, 24 Aug 2002 20:51:12 -0600 + +pygame (1.5-2) unstable; urgency=low + + * Move to python 2.2 (#135323) + * Fix errors in documentation (Closes: #145388) + + -- Ed Boraas Sat, 24 Aug 2002 13:43:54 -0600 + +pygame (1.5-1) unstable; urgency=high + + * New upstream release (Closes: #155030) + * Upstream now includes Helmet Bold (not condensed) + + -- Ed Boraas Tue, 6 Aug 2002 06:54:56 -0600 + +pygame (1.4-3) unstable; urgency=high + + * RC Fix: include Helmet Condensed Bold from openoffice + and set default font accordingly + + -- Ed Boraas Mon, 29 Apr 2002 07:56:12 -0700 + +pygame (1.4-2) unstable; urgency=high + + * RC Fix: Remove bluebold.ttf from package, as it's non-free + (Closes: #143960) + * Suggests ttf-larabie-straight, which provides this font + (bluebold.ttf remains the default font) + + -- Ed Boraas Sun, 28 Apr 2002 22:04:37 -0700 + +pygame (1.4-1) unstable; urgency=medium + + * New upstream release (Closes: #131196) + * Extend default path to allow detection of libsmpeg + * pygame.sprite now built correctly (Closes: #126244) + + -- Ed Boraas Wed, 20 Feb 2002 06:39:24 -0700 + +pygame (1.2-5) unstable; urgency=medium + + * Fix python 2.0 references in postinst (Closes: #120422) + + -- Ed Boraas Wed, 21 Nov 2001 06:54:08 -0700 + +pygame (1.2-4) unstable; urgency=medium + + * Move to python 2.1 + * Update dependencies (Closes: #118251) + + -- Ed Boraas Tue, 20 Nov 2001 06:35:16 -0700 + +pygame (1.2-3) unstable; urgency=low + + * Rebuild against new SDL packages (Closes: #115863) + + -- Ed Boraas Wed, 17 Oct 2001 18:18:34 -0600 + +pygame (1.2-2) unstable; urgency=low + + * Build as non-native package (oops) + * Hardcode Debian directory locations, to ensure correct builds + on the autobuilders (Closes: #113714) + + -- Ed Boraas Sat, 30 Sep 2001 19:27:49 -0600 + +pygame (1.2-1) unstable; urgency=low + + * New upstream release + + -- Ed Boraas Mon, 24 Sep 2001 20:14:06 -0600 + +pygame (1.1-3) unstable; urgency=low + + * New maintainer, in that I am adopting contributed third-party debs + for official use (Thanks, Francis). + * Updated config_unix.py to check for depends in /usr as well as + /usr/local + * Removed invalid versioning on libsdl1.2-dev (which is no longer + necessary, with the above fix) + + -- Ed Boraas Tue, 26 Jun 2001 18:39:37 -0600 + +pygame (1.1-2) unstable; urgency=low + + * Fixed standards version so it is lintian compliant + * Closes: #83446 (ITP: pygame) + + -- Francis Irving Wed, 27 Jun 2001 00:32:02 +0100 + +pygame (1.1-1) unstable; urgency=low + + * New upstream release + * Now depends on 1.2 versions of all SDL libraries + * Added dependencies for python2-numeric, so more examples work + + -- Francis Irving Sun, 24 Jun 2001 10:46:00 +0100 + +pygame (1.0-2) unstable; urgency=low + + * Now depends on libsdl-ttf1.2 1.2.2-1 as it is available in Debian. + More of the examples can be now be run. + + -- Francis Irving Mon, 16 Apr 2001 22:49:38 +0100 + +pygame (1.0-1) unstable; urgency=low + + * New upstream release + + -- Francis Irving Sat, 7 Apr 2001 13:04:19 +0100 + +pygame (0.99pre-1-1) unstable; urgency=low + + * New upstream release + + -- Francis Irving Sat, 31 Mar 2001 10:09:39 +0100 + +pygame (0.9-1) unstable; urgency=low + + * New upstream release + + -- Francis Irving Tue, 20 Feb 2001 03:03:20 +0000 + +pygame (0.5-3) unstable; urgency=low + + * Tidied up documentation so installation instructions and documentation + building tools are not installed + + -- Francis Irving Sun, 28 Jan 2001 13:15:22 +0000 + +pygame (0.5-2) unstable; urgency=low + + * Correctly compiles *.py files to *.pyc and *.pyo on installation, and + deletes the *.pyc and *.pyo files on uninstallation + * Build depedency now includes python2-dev + * Documentation moved to correct place within /usr/share/doc/pygame + + -- Francis Irving Thu, 25 Jan 2001 00:52:56 +0000 + +pygame (0.5-1) unstable; urgency=low + + * New upstream release + + -- Francis Irving Mon, 22 Jan 2001 23:02:10 +0000 + +pygame (0.4-1) unstable; urgency=low + + * Initial Release. + * This is my first Debian package ;-) + + -- Francis Irving Fri, 5 Jan 2001 00:22:42 +0000 + --- pygame-1.6.orig/debian/copyright +++ pygame-1.6/debian/copyright @@ -0,0 +1,17 @@ +This package was debianized by Francis Irving on +Fri, 5 Jan 2001 00:22:42 +0000. + +It was adopted by Ed Boraas on +Tue, 26 Jun 2001 18:39:37 -0600. + +It was downloaded from http://www.pygame.org/ftp + +Upstream Author: Pete Shinners + +Copyright: + +This software is covered by the GNU Library General Public Licence +(version 2, or if you choose, a later version). + +On Debian GNU/Linux systems, the complete text of the GNU Library General +Public License can be found in /usr/share/common-licenses/LGPL