r8542 - in packages/trunk/adonthell/debian: . patches
Miriam Ruiz
miriam at alioth.debian.org
Tue Dec 23 00:58:49 UTC 2008
Author: miriam
Date: 2008-12-23 00:58:48 +0000 (Tue, 23 Dec 2008)
New Revision: 8542
Removed:
packages/trunk/adonthell/debian/patches/01_work_around_bug_381456.diff
packages/trunk/adonthell/debian/patches/02_use_libsdl-ttf.diff
packages/trunk/adonthell/debian/patches/03_use_libsdl-mixer.diff
packages/trunk/adonthell/debian/patches/04_fix_const.diff
Modified:
packages/trunk/adonthell/debian/changelog
packages/trunk/adonthell/debian/control
packages/trunk/adonthell/debian/patches/04_do_not_ship_pyc.diff
packages/trunk/adonthell/debian/patches/series
packages/trunk/adonthell/debian/rules
packages/trunk/adonthell/debian/watch
Log:
New Upstream Release
Added deveral changes by Iain Lane
Modified: packages/trunk/adonthell/debian/changelog
===================================================================
--- packages/trunk/adonthell/debian/changelog 2008-12-22 20:01:17 UTC (rev 8541)
+++ packages/trunk/adonthell/debian/changelog 2008-12-23 00:58:48 UTC (rev 8542)
@@ -1,4 +1,4 @@
-adonthell (0.3.4.cvs.20080529-2) UNRELEASED; urgency=low
+adonthell (0.3.5-1) UNRELEASED; urgency=low
[ Gonéri Le Bouder ]
* add the missing -p1 in debian/patches/series so the package doesn't
@@ -8,8 +8,15 @@
[ Ansgar Burchardt ]
* Add watch file
- -- Barry deFreese <bddebian at comcast.net> Tue, 17 Jun 2008 13:42:36 +0200
+ [ 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
+ -- Iain Lane <laney at ubuntu.com> Mon, 22 Dec 2008 23:44:02 +0000
+
adonthell (0.3.4.cvs.20080529-1+nmu1) unstable; urgency=medium
* Non-maintainer upload.
Modified: packages/trunk/adonthell/debian/control
===================================================================
--- packages/trunk/adonthell/debian/control 2008-12-22 20:01:17 UTC (rev 8541)
+++ packages/trunk/adonthell/debian/control 2008-12-23 00:58:48 UTC (rev 8542)
@@ -3,7 +3,7 @@
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, python2.4-dev [arm armel]
+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.0
Homepage: http://adonthell.linuxgames.com/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/adonthell/
Deleted: packages/trunk/adonthell/debian/patches/01_work_around_bug_381456.diff
===================================================================
--- packages/trunk/adonthell/debian/patches/01_work_around_bug_381456.diff 2008-12-22 20:01:17 UTC (rev 8541)
+++ packages/trunk/adonthell/debian/patches/01_work_around_bug_381456.diff 2008-12-23 00:58:48 UTC (rev 8542)
@@ -1,13 +0,0 @@
-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);
Deleted: packages/trunk/adonthell/debian/patches/02_use_libsdl-ttf.diff
===================================================================
--- packages/trunk/adonthell/debian/patches/02_use_libsdl-ttf.diff 2008-12-22 20:01:17 UTC (rev 8541)
+++ packages/trunk/adonthell/debian/patches/02_use_libsdl-ttf.diff 2008-12-23 00:58:48 UTC (rev 8542)
@@ -1,237 +0,0 @@
-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@
Deleted: packages/trunk/adonthell/debian/patches/03_use_libsdl-mixer.diff
===================================================================
--- packages/trunk/adonthell/debian/patches/03_use_libsdl-mixer.diff 2008-12-22 20:01:17 UTC (rev 8541)
+++ packages/trunk/adonthell/debian/patches/03_use_libsdl-mixer.diff 2008-12-23 00:58:48 UTC (rev 8542)
@@ -1,17 +0,0 @@
-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"
-
Modified: packages/trunk/adonthell/debian/patches/04_do_not_ship_pyc.diff
===================================================================
--- packages/trunk/adonthell/debian/patches/04_do_not_ship_pyc.diff 2008-12-22 20:01:17 UTC (rev 8541)
+++ packages/trunk/adonthell/debian/patches/04_do_not_ship_pyc.diff 2008-12-23 00:58:48 UTC (rev 8542)
@@ -1,7 +1,7 @@
-Index: adonthell-0.3/src/modules/Makefile.am
+Index: adonthell-0.3.5/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
+--- 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
@@ -12,11 +12,11 @@
EXTRA_DIST = $(py_files)
-Index: adonthell-0.3/src/modules/Makefile.in
+Index: adonthell-0.3.5/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 @@
+--- 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
Deleted: packages/trunk/adonthell/debian/patches/04_fix_const.diff
===================================================================
--- packages/trunk/adonthell/debian/patches/04_fix_const.diff 2008-12-22 20:01:17 UTC (rev 8541)
+++ packages/trunk/adonthell/debian/patches/04_fix_const.diff 2008-12-23 00:58:48 UTC (rev 8542)
@@ -1,27 +0,0 @@
-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) {
Modified: packages/trunk/adonthell/debian/patches/series
===================================================================
--- packages/trunk/adonthell/debian/patches/series 2008-12-22 20:01:17 UTC (rev 8541)
+++ packages/trunk/adonthell/debian/patches/series 2008-12-23 00:58:48 UTC (rev 8542)
@@ -1 +1 @@
-04_do_not_ship_pyc.diff -p1
+04_do_not_ship_pyc.diff
Modified: packages/trunk/adonthell/debian/rules
===================================================================
--- packages/trunk/adonthell/debian/rules 2008-12-22 20:01:17 UTC (rev 8541)
+++ packages/trunk/adonthell/debian/rules 2008-12-23 00:58:48 UTC (rev 8542)
@@ -2,6 +2,8 @@
#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 -fno-exceptions -DSWIG_GLOBAL -DDATA_DIR=\"\\\"/usr/share/games/adonthell\"\\\"
@@ -37,10 +39,9 @@
endif
configure: configure-stamp
-configure-stamp:
+configure-stamp: $(QUILT_STAMPFN)
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
@@ -68,7 +69,7 @@
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f configure-stamp build-stamp
@@ -76,8 +77,6 @@
[ ! -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
Modified: packages/trunk/adonthell/debian/watch
===================================================================
--- packages/trunk/adonthell/debian/watch 2008-12-22 20:01:17 UTC (rev 8541)
+++ packages/trunk/adonthell/debian/watch 2008-12-23 00:58:48 UTC (rev 8542)
@@ -1,3 +1,3 @@
version=3
-http://adonthell.linuxgames.com/download/source.shtml .*/?adonthell-src-(.*)\.tar\.gz
+http://savannah.nongnu.org/download/adonthell/adonthell-src-(.*)\.tar\.gz debian
More information about the Pkg-games-commits
mailing list