[adonthell] 02/65: [svn-inject] Applying Debian modifications to trunk
Markus Koschany
apo at moszumanska.debian.org
Tue Jul 12 19:53:50 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 9e2d839fa380530707a65f2e8168c18795df5b9c
Author: Barry deFreese <bddebian at comcast.net>
Date: Fri May 30 17:37:57 2008 +0000
[svn-inject] Applying Debian modifications to trunk
---
debian/README.debian | 7 +
debian/adonthell.6 | 40 +++++
debian/changelog | 161 +++++++++++++++++
debian/compat | 1 +
debian/control | 23 +++
debian/copyright | 35 ++++
debian/dirs | 3 +
debian/docs | 4 +
debian/patches/01_work_around_bug_381456.diff | 13 ++
debian/patches/02_use_libsdl-ttf.diff | 237 ++++++++++++++++++++++++++
debian/patches/03_use_libsdl-mixer.diff | 17 ++
debian/patches/04_do_not_ship_pyc.diff | 28 +++
debian/patches/04_fix_const.diff | 27 +++
debian/patches/series | 1 +
debian/pyversions | 1 +
debian/rules | 110 ++++++++++++
16 files changed, 708 insertions(+)
diff --git a/debian/README.debian b/debian/README.debian
new file mode 100644
index 0000000..87ec10b
--- /dev/null
+++ b/debian/README.debian
@@ -0,0 +1,7 @@
+adonthell for Debian
+----------------------
+
+This only includes the game engine, to actually play Adonthell
+you'll need datafiles included in adonthell-data.
+
+ -- Gordon Fraser <gordon at debian.org>, Tue, 17 Sep 2002 15:16:21 +0200
diff --git a/debian/adonthell.6 b/debian/adonthell.6
new file mode 100644
index 0000000..99c4bba
--- /dev/null
+++ b/debian/adonthell.6
@@ -0,0 +1,40 @@
+.TH Adonthell 6
+.SH NAME
+Adonthell \- a Free Role Playing Game engine.
+.SH SYNOPSIS
+.B adonthell
+.I "[options] files ..."
+.SH "DESCRIPTION"
+.BR Adonthell
+is a Free graphical role playing game engine.
+.BR
+This program is used to run
+.BR Adonthell
+games - therefore you need one game installed in order to play
+something.
+.SH OPTIONS
+.TP
+.B \-h,
+Print help message.
+.TP
+.B \-v,
+Print version and exit.
+.TP
+.B \-d,
+Print the data directory and exit (for developers).
+.TP
+.B \-l,
+List installed games and exit.
+.TP
+.B \-g
+.I dir
+, play the game contained in
+.I dir
+(for developers).
+.TP
+.B \-c,
+Byte-compile all Python scripts in this directory (for developers).
+
+.SH AUTHOR
+This manual page was written by Alexandre Courbot <alexandrecourbot at linuxgames.com>,
+for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..cc57c1e
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,161 @@
+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).
+
+ -- 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
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..3cb8c15
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,23 @@
+Source: adonthell
+Section: games
+Priority: optional
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Uploaders: Barry deFreese <bddebian at comcast.net>
+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
+Standards-Version: 3.7.3
+Homepage: http://adonthell.linuxgames.com/
+Vcs-Svn: ssh://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}, ${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.
+ .
+ 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.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..c7e5a74
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,35 @@
+This package was debianized by Gordon Fraser <gordon at debian.org> on
+Wed, 28 Aug 2002 20:37:34 +0200.
+
+It was downloaded from http://adonthell.linuxgames.com/download/
+
+Upstream Authors: Kai Sterker & the Adonthell team <adonthell at linuxgames.com>
+
+Copyright:
+ (C) 1997-2001 by Dimitri van Heesch
+ (C) 1999 The Adonthell Team
+ (C) 1999-2001 The Adonthell Project
+ (C) 1999-2004 Kai Sterker <kaisterker at linuxgames.com>
+ (C) 1999-2004 Alexandre Courbot <alexandrecourbot at linuxgames.com>
+ (C) Copyright 2000-2001, 2004 Joel Vennin
+src/tools/oggloop/vcedit.h: (C) 2000-2001 Michael Smith <msmith at labyrinth.net.au>
+src/tools/oggloop/vcedit.c: (C) 2000-2001 Michael Smith <msmith at labyrinth.net.au>
+src/audio.h: (C) 2000 Andrew Henderson <hendersa at db.erau.edu>
+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 <hendersa at db.erau.edu>
+
+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
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+The GNU GPL may be viewed on Debian systems in /usr/share/common-licenses/GPL
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..f2ac2b1
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,3 @@
+usr/games
+usr/share/games/adonthell/modules
+usr/share/man/man6
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..1ab13e3
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,4 @@
+AUTHORS
+FULLSCREEN.howto
+NEWS
+README
diff --git a/debian/patches/01_work_around_bug_381456.diff b/debian/patches/01_work_around_bug_381456.diff
new file mode 100644
index 0000000..90bf891
--- /dev/null
+++ b/debian/patches/01_work_around_bug_381456.diff
@@ -0,0 +1,13 @@
+Index: adonthell-0.3.4.cvs.20050813/src/win_ttf.cc
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/win_ttf.cc 2006-08-10 20:50:05.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/win_ttf.cc 2006-08-10 20:50:18.000000000 +0200
+@@ -137,7 +137,7 @@
+ if (s == NULL) return *(glyphs[' ']);
+
+ image tmp (s, bg);
+- image shadow (TTF_RenderUNICODE_Solid (ttf, unichar, bg), white);
++ image shadow (TTF_RenderUNICODE_Shaded (ttf, unichar, bg, bg), white);
+ image *glph = new image (tmp.length(), height_, false);
+ glph->fillrect (0, 0, tmp.length()+1, height_+1, screen::trans_col(), NULL);
+ shadow.draw (1, 1+height_-shadow.height(), 0, 0, shadow.length(), shadow.height(), NULL, glph);
diff --git a/debian/patches/02_use_libsdl-ttf.diff b/debian/patches/02_use_libsdl-ttf.diff
new file mode 100644
index 0000000..ad3ba3c
--- /dev/null
+++ b/debian/patches/02_use_libsdl-ttf.diff
@@ -0,0 +1,237 @@
+Index: adonthell-0.3.4.cvs.20050813/src/audio.h
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/audio.h 2006-08-11 20:08:00.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/audio.h 2006-08-11 20:41:27.000000000 +0200
+@@ -15,7 +15,7 @@
+ #ifndef __AUDIO_H__
+ #define __AUDIO_H__
+
+-#include "SDL_mixer.h"
++#include <SDL/SDL_mixer.h>
+ #include "prefs.h"
+ #include "py_object.h"
+ // #include "audio_loop.h"
+Index: adonthell-0.3.4.cvs.20050813/src/audio_loop.cc
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/audio_loop.cc 2006-08-11 20:08:00.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/audio_loop.cc 2006-08-11 20:41:27.000000000 +0200
+@@ -22,7 +22,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
+-#include "SDL_mixer.h"
++#include <SDL/SDL_mixer.h>
+
+ #include "types.h"
+ #include "fileops.h"
+Index: adonthell-0.3.4.cvs.20050813/src/input.h
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/input.h 2006-08-11 20:08:00.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/input.h 2006-08-11 20:41:27.000000000 +0200
+@@ -28,7 +28,7 @@
+ #define INPUT_H__
+
+ #include "types.h"
+-#include "SDL_keysym.h"
++#include <SDL_keysym.h>
+
+
+ /**
+Index: adonthell-0.3.4.cvs.20050813/src/Makefile.am
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/Makefile.am 2006-08-11 20:07:59.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/Makefile.am 2006-08-11 20:41:27.000000000 +0200
+@@ -24,7 +24,7 @@
+ win_base.h win_border.h win_container.h str_hash.h win_font.h win_image.h \
+ win_label.h win_mapview.h label.h label_input.h win_scrollbar.h win_scroll.h \
+ win_select.h win_theme.h win_keys.h win_event.h win_types.h win_write.h \
+-win_ttf.h win_manager.h win_object.h window.h win_wrappers.h yarg.h SDL_ttf.h
++win_ttf.h win_manager.h win_object.h window.h win_wrappers.h yarg.h
+
+ libadonthell_a_SOURCES = adonthell.cc animation.cc audio.cc \
+ character_base.cc character.cc data_screen.cc dialog.cc dialog_screen.cc \
+@@ -40,8 +40,7 @@
+ win_ttf.cc win_keys.cc win_manager.cc win_scrollbar.cc win_scroll.cc \
+ win_select.cc \
+ win_theme.cc win_event.cc yarg.cc mixer.c music.c music_cmd.c music_cmd.h \
+-music_ogg.c music_ogg.h wave.h wavestream.c wavestream.h SDL_mixer.h \
+-SDL_ttf.c $(headers)
++music_ogg.c music_ogg.h wave.h wavestream.c wavestream.h $(headers)
+
+ libadonthell_LDADD = $(SDL_LIBS) $(OGG_LIBS) $(PY_LIBS) $(INTLLIBS) $(FT2_LIBS)
+
+Index: adonthell-0.3.4.cvs.20050813/src/mixer.c
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/mixer.c 2006-08-11 20:07:59.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/mixer.c 2006-08-11 20:41:27.000000000 +0200
+@@ -28,11 +28,11 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-#include "SDL_mutex.h"
+-#include "SDL_endian.h"
+-#include "SDL_timer.h"
++#include <SDL/SDL_mutex.h>
++#include <SDL/SDL_endian.h>
++#include <SDL/SDL_timer.h>
+
+-#include "SDL_mixer.h"
++#include <SDL/SDL_mixer.h>
+
+ static int audio_opened = 0;
+
+Index: adonthell-0.3.4.cvs.20050813/src/music_cmd.c
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/music_cmd.c 2006-08-11 20:07:59.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/music_cmd.c 2006-08-11 20:41:27.000000000 +0200
+@@ -34,7 +34,7 @@
+ #include <string.h>
+ #include <signal.h>
+
+-#include "SDL_mixer.h"
++#include <SDL/SDL_mixer.h>
+ #include "music_cmd.h"
+
+ /* Unimplemented */
+Index: adonthell-0.3.4.cvs.20050813/src/music_ogg.c
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/music_ogg.c 2006-08-11 20:07:59.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/music_ogg.c 2006-08-11 20:41:27.000000000 +0200
+@@ -30,7 +30,7 @@
+ #include <stdio.h>
+ #include <string.h>
+
+-#include "SDL_mixer.h"
++#include <SDL/SDL_mixer.h>
+ #include "music_ogg.h"
+
+ /* This is the format of the audio mixer data */
+Index: adonthell-0.3.4.cvs.20050813/src/py_adonthell.i
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/py_adonthell.i 2006-08-11 20:07:59.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/py_adonthell.i 2006-08-11 20:41:27.000000000 +0200
+@@ -11,7 +11,7 @@
+ #include "storage.h"
+ #include "gametime.h"
+ #include "gamedate.h"
+-#include "SDL_keysym.h"
++#include <SDL_keysym.h>
+ #include "input.h"
+ #include "audio.h"
+ #include "character_base.h"
+@@ -104,7 +104,7 @@
+ %include "storage.h"
+ %include "gametime.h"
+ %include "gamedate.h"
+-%include "SDL_keysym.h"
++%include <SDL_keysym.h>
+ %include "input.h"
+ %include "audio.h"
+ %include "character_base.h"
+Index: adonthell-0.3.4.cvs.20050813/src/py_adonthell_wrap.cc
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/py_adonthell_wrap.cc 2006-08-11 20:07:59.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/py_adonthell_wrap.cc 2006-08-11 20:41:27.000000000 +0200
+@@ -1442,7 +1442,7 @@
+ #include "storage.h"
+ #include "gametime.h"
+ #include "gamedate.h"
+-#include "SDL_keysym.h"
++#include <SDL/SDL_keysym.h>
+ #include "input.h"
+ #include "audio.h"
+ #include "character_base.h"
+Index: adonthell-0.3.4.cvs.20050813/src/tools/fontedit/font_editor.cc
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/tools/fontedit/font_editor.cc 2006-08-11 20:07:59.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/tools/fontedit/font_editor.cc 2006-08-11 20:41:27.000000000 +0200
+@@ -2,7 +2,7 @@
+ #include <unistd.h>
+ #include <list>
+ #include <stdlib.h>
+-#include "SDL_thread.h"
++#include <SDL/SDL_thread.h>
+ #include "types.h"
+ #include "screen.h"
+ #include "image.h"
+Index: adonthell-0.3.4.cvs.20050813/src/wavestream.c
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/wavestream.c 2006-08-11 20:07:59.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/wavestream.c 2006-08-11 20:41:27.000000000 +0200
+@@ -27,10 +27,10 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-#include "SDL_audio.h"
+-#include "SDL_mutex.h"
+-#include "SDL_rwops.h"
+-#include "SDL_endian.h"
++#include <SDL/SDL_audio.h>
++#include <SDL/SDL_mutex.h>
++#include <SDL/SDL_rwops.h>
++#include <SDL/SDL_endian.h>
+
+ #include "wave.h"
+ #include "wavestream.h"
+Index: adonthell-0.3.4.cvs.20050813/src/win_ttf.h
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/win_ttf.h 2006-08-11 20:07:59.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/win_ttf.h 2006-08-11 20:41:27.000000000 +0200
+@@ -15,7 +15,7 @@
+ #ifndef WIN_TTF_H
+ #define WIN_TTF_H
+
+-#include "SDL_ttf.h"
++#include <SDL/SDL_ttf.h>
+ #include "win_font.h"
+
+ class win_ttf : public win_font
+Index: adonthell-0.3.4.cvs.20050813/src/Makefile.in
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/Makefile.in 2006-08-11 20:41:32.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/Makefile.in 2006-08-11 20:42:21.000000000 +0200
+@@ -199,7 +199,7 @@
+ win_base.h win_border.h win_container.h str_hash.h win_font.h win_image.h \
+ win_label.h win_mapview.h label.h label_input.h win_scrollbar.h win_scroll.h \
+ win_select.h win_theme.h win_keys.h win_event.h win_types.h win_write.h \
+-win_ttf.h win_manager.h win_object.h window.h win_wrappers.h yarg.h SDL_ttf.h
++win_ttf.h win_manager.h win_object.h window.h win_wrappers.h yarg.h
+
+
+ libadonthell_a_SOURCES = adonthell.cc animation.cc audio.cc \
+@@ -216,8 +216,7 @@
+ win_ttf.cc win_keys.cc win_manager.cc win_scrollbar.cc win_scroll.cc \
+ win_select.cc \
+ win_theme.cc win_event.cc yarg.cc mixer.c music.c music_cmd.c music_cmd.h \
+-music_ogg.c music_ogg.h wave.h wavestream.c wavestream.h SDL_mixer.h \
+-SDL_ttf.c $(headers)
++music_ogg.c music_ogg.h wave.h wavestream.c wavestream.h $(headers)
+
+
+ libadonthell_LDADD = $(SDL_LIBS) $(OGG_LIBS) $(PY_LIBS) $(INTLLIBS) $(FT2_LIBS)
+@@ -261,7 +260,7 @@
+ win_scroll.$(OBJEXT) win_select.$(OBJEXT) win_theme.$(OBJEXT) \
+ win_event.$(OBJEXT) yarg.$(OBJEXT) mixer.$(OBJEXT) \
+ music.$(OBJEXT) music_cmd.$(OBJEXT) music_ogg.$(OBJEXT) \
+- wavestream.$(OBJEXT) SDL_ttf.$(OBJEXT) $(am__objects_1)
++ wavestream.$(OBJEXT) $(am__objects_1)
+ libadonthell_a_OBJECTS = $(am_libadonthell_a_OBJECTS)
+ bin_PROGRAMS = adonthell$(EXEEXT)
+ PROGRAMS = $(bin_PROGRAMS)
+@@ -274,7 +273,7 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/SDL_ttf.Po ./$(DEPDIR)/adonthell.Po \
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/adonthell.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/animation.Po ./$(DEPDIR)/audio.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/character.Po \
+ @AMDEP_TRUE@ ./$(DEPDIR)/character_base.Po \
+@@ -398,7 +397,6 @@
+ distclean-compile:
+ -rm -f *.tab.c
+
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/SDL_ttf.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/adonthell.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/animation.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/audio.Po at am__quote@
diff --git a/debian/patches/03_use_libsdl-mixer.diff b/debian/patches/03_use_libsdl-mixer.diff
new file mode 100644
index 0000000..ae2131b
--- /dev/null
+++ b/debian/patches/03_use_libsdl-mixer.diff
@@ -0,0 +1,17 @@
+Index: adonthell-0.3.4.cvs.20050813/src/music.c
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/music.c 2006-08-10 22:09:27.000000000 +0200
++++ adonthell-0.3.4.cvs.20050813/src/music.c 2006-08-11 20:06:40.000000000 +0200
+@@ -24,9 +24,9 @@
+
+ #include <stdlib.h>
+ #include <string.h>
+-#include "SDL_endian.h"
+-#include "SDL_audio.h"
+-#include "SDL_timer.h"
++#include <SDL/SDL_endian.h>
++#include <SDL/SDL_audio.h>
++#include <SDL/SDL_timer.h>
+
+ #include "SDL_mixer.h"
+
diff --git a/debian/patches/04_do_not_ship_pyc.diff b/debian/patches/04_do_not_ship_pyc.diff
new file mode 100644
index 0000000..47a7d5a
--- /dev/null
+++ b/debian/patches/04_do_not_ship_pyc.diff
@@ -0,0 +1,28 @@
+Index: adonthell-0.3/src/modules/Makefile.am
+===================================================================
+--- adonthell-0.3.orig/src/modules/Makefile.am 2008-05-29 23:52:50.000000000 -0400
++++ adonthell-0.3/src/modules/Makefile.am 2008-05-29 23:53:50.000000000 -0400
+@@ -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/src/modules/Makefile.in
+===================================================================
+--- adonthell-0.3.orig/src/modules/Makefile.in 2008-05-29 23:54:03.000000000 -0400
++++ adonthell-0.3/src/modules/Makefile.in 2008-05-29 23:55:28.000000000 -0400
+@@ -212,7 +212,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
diff --git a/debian/patches/04_fix_const.diff b/debian/patches/04_fix_const.diff
new file mode 100644
index 0000000..3f9134e
--- /dev/null
+++ b/debian/patches/04_fix_const.diff
@@ -0,0 +1,27 @@
+Index: adonthell-0.3.4.cvs.20050813/src/py_adonthell_wrap.cc
+===================================================================
+--- adonthell-0.3.4.cvs.20050813.orig/src/py_adonthell_wrap.cc 2008-04-20 22:54:27.000000000 +0100
++++ adonthell-0.3.4.cvs.20050813/src/py_adonthell_wrap.cc 2008-04-20 22:55:15.000000000 +0100
+@@ -1174,7 +1174,7 @@
+ obj = pyobj;
+ if (PyCFunction_Check(obj)) {
+ /* here we get the method pointer for callbacks */
+- char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
++ const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
+ c = doc ? strstr(doc, "swig_ptr: ") : 0;
+ if (c) {
+ c = SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name);
+@@ -28592,11 +28592,11 @@
+ swig_type_info **types_initial) {
+ size_t i;
+ for (i = 0; methods[i].ml_name; ++i) {
+- char *c = methods[i].ml_doc;
++ const char *c = methods[i].ml_doc;
+ if (c && (c = strstr(c, "swig_ptr: "))) {
+ int j;
+ swig_const_info *ci = 0;
+- char *name = c + 10;
++ const char *name = c + 10;
+ for (j = 0; const_table[j].type; j++) {
+ if (strncmp(const_table[j].name, name,
+ strlen(const_table[j].name)) == 0) {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..39e74e9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+04_do_not_ship_pyc.diff
diff --git a/debian/pyversions b/debian/pyversions
new file mode 100644
index 0000000..57a7586
--- /dev/null
+++ b/debian/pyversions
@@ -0,0 +1 @@
+2.3-
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..ba20151
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,110 @@
+#!/usr/bin/make -f
+
+#export DH_VERBOSE=1
+
+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
+PYVERSION=$(shell pyversions -d)
+
+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
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+
+ -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) -ldl -lpthread -lutil -lSDL -lSDL_ttf -lSDL_mixer" \
+ --with-py-cflags="-I/usr/include/$(PYVERSION)" \
+ $(CFGDEBUG)
+ touch configure-stamp
+
+
+build: configure-stamp build-stamp
+
+build-stamp:
+ dh_testdir
+
+ $(MAKE) CXXFLAGS="$(CXXFLAGS)" INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f configure-stamp build-stamp
+
+ [ ! -f Makefile ] || $(MAKE) distclean
+ -rm -f `find . -name "*~"`
+ -rm -f src/adonthell.pyc
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+ rm -rf .pc
+
+ rm -f config.guess config.sub
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(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
+# 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_pysupport -V $(shell pyversions -d -v) adonthell /usr/share/games/adonthell/modules/
+ 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