Hi,
Attached is the diff for my adonthell-data 0.3.4.cvs.20050903-2.2 NMU.
diff -u adonthell-data-0.3.4.cvs.20050903/debian/changelog
adonthell-data-0.3.4.cvs.20050903/debian/changelog
--- adonthell-data-0.3.4.cvs.20050903/debian/changelog
+++ adonthell-data-0.3.4.cvs.20050903/debian/changelog
@@ -1,3 +1,18 @@
+adonthell-data (0.3.4.cvs.20050903-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+
+ [ Luis Rodrigo Gallardo Cruz ]
+ * Stop shipping *.pyc files (Closes: #390573).
+
+ [ Ana Beatriz Guerrero Lopez ]
+ * Moved debhelper and quilt to Build-Depends.
+ * Little changes to Rodrigo's patch, and added patch that fixes
+ player_text.py
+ * Bumped standards-version to 3.7.2, no changes required.
+
+ -- Ana Beatriz Guerrero Lopez <[EMAIL PROTECTED]> Sat, 28 Oct 2006 22:05:25
+0200
+
adonthell-data (0.3.4.cvs.20050903-2.1) unstable; urgency=low
* Non-maintainer upload. (Closes: #390573)
diff -u adonthell-data-0.3.4.cvs.20050903/debian/control
adonthell-data-0.3.4.cvs.20050903/debian/control
--- adonthell-data-0.3.4.cvs.20050903/debian/control
+++ adonthell-data-0.3.4.cvs.20050903/debian/control
@@ -2,12 +2,13 @@
Section: games
Priority: optional
Maintainer: Gordon Fraser <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>= 4), python-dev (>= 2.3), adonthell (>=
0.3), adonthell (<< 0.4), python-support
-Standards-Version: 3.6.1
+Build-Depends-Indep: python-dev, adonthell (>= 0.3), adonthell (<< 0.4),
python-support (>= 0.4.0)
+Build-Depends: debhelper (>= 4), quilt
+Standards-Version: 3.7.2
Package: adonthell-data
Architecture: all
-Depends: adonthell (>= 0.3.3.cvs.20031022), adonthell (<< 0.4)
+Depends: ${python:Depends}, adonthell (>= 0.3.3.cvs.20031022), adonthell (<<
0.4)
Description: Data files needed by Adonthell
This is the official game for Adonthell 0.3
.
diff -u adonthell-data-0.3.4.cvs.20050903/debian/rules
adonthell-data-0.3.4.cvs.20050903/debian/rules
--- adonthell-data-0.3.4.cvs.20050903/debian/rules
+++ adonthell-data-0.3.4.cvs.20050903/debian/rules
@@ -6,6 +6,7 @@
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL} -p -o root -g root -m 755
+PYVERSION=$(shell pyversions -d -v)
#ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
# CFLAGS += -g
@@ -16,6 +17,7 @@
config.status: configure
dh_testdir
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
@@ -45,6 +47,7 @@
-rm -f config.status
-rm -f `find . -name "*~"`
-rm -f `find . -name "*.pyc"`
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
dh_clean
@@ -71,7 +74,13 @@
dh_installmenu
dh_installman debian/adonthell-wastesedge.6
dh_installchangelogs ChangeLog
- dh_pysupport
+ dh_pysupport -V $(PYVERSION) adonthell-wastesedge \
+ /usr/share/games/adonthell/games/wastesedge/scripts/init.py \
+ /usr/share/games/adonthell/games/wastesedge/scripts/actions \
+ /usr/share/games/adonthell/games/wastesedge/scripts/dialogues \
+ /usr/share/games/adonthell/games/wastesedge/scripts/game_events \
+ /usr/share/games/adonthell/games/wastesedge/scripts/modules \
+ /usr/share/games/adonthell/games/wastesedge/scripts/schedules
dh_link
dh_strip
dh_compress
reverted:
--- adonthell-data-0.3.4.cvs.20050903.orig/debian/patches/series
+++ adonthell-data-0.3.4.cvs.20050903/debian/patches/series
@@ -0,0 +1,2 @@
+01_do_not_ship_pyc_files
+02_player_text.py.diff -p0
only in patch2:
unchanged:
---
adonthell-data-0.3.4.cvs.20050903.orig/debian/patches/01_do_not_ship_pyc_files
+++ adonthell-data-0.3.4.cvs.20050903/debian/patches/01_do_not_ship_pyc_files
@@ -0,0 +1,371 @@
+Index: adonthell-data-0.3.4.cvs.20050903/scripts/Makefile.am
+===================================================================
+--- adonthell-data-0.3.4.cvs.20050903.orig/scripts/Makefile.am 2006-10-22
18:27:48.000000000 -0500
++++ adonthell-data-0.3.4.cvs.20050903/scripts/Makefile.am 2006-10-22
18:28:49.000000000 -0500
+@@ -2,12 +2,12 @@
+
+ pkgdatadir = $(gamedatadir)/scripts
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = init.py
+
+ all:
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+
+ *.pyc: *.py
+
+Index: adonthell-data-0.3.4.cvs.20050903/scripts/Makefile.in
+===================================================================
+--- adonthell-data-0.3.4.cvs.20050903.orig/scripts/Makefile.in 2006-10-22
18:27:48.000000000 -0500
++++ adonthell-data-0.3.4.cvs.20050903/scripts/Makefile.in 2006-10-22
18:28:49.000000000 -0500
+@@ -127,7 +127,7 @@
+ target_alias = @target_alias@
+ SUBDIRS = dialogues game_events modules schedules actions
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = init.py
+
+@@ -439,7 +439,7 @@
+
+
+ all:
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+
+ *.pyc: *.py
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+Index: adonthell-data-0.3.4.cvs.20050903/scripts/actions/Makefile.am
+===================================================================
+--- adonthell-data-0.3.4.cvs.20050903.orig/scripts/actions/Makefile.am
2006-10-22 18:27:48.000000000 -0500
++++ adonthell-data-0.3.4.cvs.20050903/scripts/actions/Makefile.am
2006-10-22 18:28:49.000000000 -0500
+@@ -1,11 +1,11 @@
+ pkgdatadir = $(gamedatadir)/scripts/actions
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = talk.py __init__.py
+
+ all:
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+
+ *.pyc: *.py
+
+Index: adonthell-data-0.3.4.cvs.20050903/scripts/actions/Makefile.in
+===================================================================
+--- adonthell-data-0.3.4.cvs.20050903.orig/scripts/actions/Makefile.in
2006-10-22 18:27:48.000000000 -0500
++++ adonthell-data-0.3.4.cvs.20050903/scripts/actions/Makefile.in
2006-10-22 18:28:49.000000000 -0500
+@@ -125,7 +125,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = talk.py __init__.py
+
+@@ -289,7 +289,7 @@
+
+
+ all:
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+
+ *.pyc: *.py
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+Index: adonthell-data-0.3.4.cvs.20050903/scripts/dialogues/Makefile.am
+===================================================================
+--- adonthell-data-0.3.4.cvs.20050903.orig/scripts/dialogues/Makefile.am
2006-10-22 18:27:47.000000000 -0500
++++ adonthell-data-0.3.4.cvs.20050903/scripts/dialogues/Makefile.am
2006-10-22 18:28:49.000000000 -0500
+@@ -1,6 +1,6 @@
+ pkgdatadir = $(gamedatadir)/scripts/dialogues
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = orloth_start.py lucia_start.py sarin_start.py \
+ janesta_start.py erek_start.py oliver_start.py bjarn_start.py \
+@@ -9,7 +9,7 @@
+ silverhair_start.py fellnir_start.py __init__.py
+
+ all:
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+
+ *.pyc: *.py
+
+Index: adonthell-data-0.3.4.cvs.20050903/scripts/dialogues/Makefile.in
+===================================================================
+--- adonthell-data-0.3.4.cvs.20050903.orig/scripts/dialogues/Makefile.in
2006-10-22 18:27:47.000000000 -0500
++++ adonthell-data-0.3.4.cvs.20050903/scripts/dialogues/Makefile.in
2006-10-22 18:28:49.000000000 -0500
+@@ -125,7 +125,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = orloth_start.py lucia_start.py sarin_start.py \
+ janesta_start.py erek_start.py oliver_start.py bjarn_start.py \
+@@ -294,7 +294,7 @@
+
+
+ all:
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+
+ *.pyc: *.py
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+Index: adonthell-data-0.3.4.cvs.20050903/scripts/game_events/Makefile.am
+===================================================================
+--- adonthell-data-0.3.4.cvs.20050903.orig/scripts/game_events/Makefile.am
2006-10-22 18:27:47.000000000 -0500
++++ adonthell-data-0.3.4.cvs.20050903/scripts/game_events/Makefile.am
2006-10-22 18:28:49.000000000 -0500
+@@ -1,6 +1,6 @@
+ pkgdatadir = $(gamedatadir)/scripts/game_events
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = teleport.py cellar_to_bjarn.py fst_to_silverhair.py \
+ character_speak.py open_inn_door.py silverhair_to_fst.py \
+@@ -9,7 +9,7 @@
+ speak.py
+
+ all:
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+
+ *.pyc: *.py
+
+Index: adonthell-data-0.3.4.cvs.20050903/scripts/game_events/Makefile.in
+===================================================================
+--- adonthell-data-0.3.4.cvs.20050903.orig/scripts/game_events/Makefile.in
2006-10-22 18:27:48.000000000 -0500
++++ adonthell-data-0.3.4.cvs.20050903/scripts/game_events/Makefile.in
2006-10-22 18:28:49.000000000 -0500
+@@ -125,7 +125,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = teleport.py cellar_to_bjarn.py fst_to_silverhair.py \
+ character_speak.py open_inn_door.py silverhair_to_fst.py \
+@@ -294,7 +294,7 @@
+
+
+ all:
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+
+ *.pyc: *.py
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+Index: adonthell-data-0.3.4.cvs.20050903/scripts/modules/Makefile.am
+===================================================================
+--- adonthell-data-0.3.4.cvs.20050903.orig/scripts/modules/Makefile.am
2006-10-22 18:27:48.000000000 -0500
++++ adonthell-data-0.3.4.cvs.20050903/scripts/modules/Makefile.am
2006-10-22 18:28:49.000000000 -0500
+@@ -1,12 +1,12 @@
+ pkgdatadir = $(gamedatadir)/scripts/modules
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = console.py main_menu.py events.py character_screen.py intro.py \
+ player_text.py
+
+ all:
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+
+ *.pyc: *.py
+
+Index: adonthell-data-0.3.4.cvs.20050903/scripts/modules/Makefile.in
+===================================================================
+--- adonthell-data-0.3.4.cvs.20050903.orig/scripts/modules/Makefile.in
2006-10-22 18:27:48.000000000 -0500
++++ adonthell-data-0.3.4.cvs.20050903/scripts/modules/Makefile.in
2006-10-22 18:28:49.000000000 -0500
+@@ -125,7 +125,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = console.py main_menu.py events.py character_screen.py intro.py \
+ player_text.py
+@@ -291,7 +291,7 @@
+
+
+ all:
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+
+ *.pyc: *.py
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/Makefile.am
+===================================================================
+--- adonthell-data-0.3.4.cvs.20050903.orig/scripts/schedules/Makefile.am
2006-10-22 18:27:47.000000000 -0500
++++ adonthell-data-0.3.4.cvs.20050903/scripts/schedules/Makefile.am
2006-10-22 18:28:49.000000000 -0500
+@@ -2,11 +2,11 @@
+
+ pkgdatadir = $(gamedatadir)/scripts/schedules
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = control.py __init__.py
+
+ *.pyc: *.py
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+
+ CLEANFILES = *.pyc
+Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/Makefile.in
+===================================================================
+--- adonthell-data-0.3.4.cvs.20050903.orig/scripts/schedules/Makefile.in
2006-10-22 18:27:47.000000000 -0500
++++ adonthell-data-0.3.4.cvs.20050903/scripts/schedules/Makefile.in
2006-10-22 18:28:49.000000000 -0500
+@@ -127,7 +127,7 @@
+ target_alias = @target_alias@
+ SUBDIRS = audio mapcharacters mapviews
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = control.py __init__.py
+
+@@ -439,7 +439,7 @@
+
+
+ *.pyc: *.py
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/audio/Makefile.am
+===================================================================
+--- adonthell-data-0.3.4.cvs.20050903.orig/scripts/schedules/audio/Makefile.am
2006-10-22 18:27:46.000000000 -0500
++++ adonthell-data-0.3.4.cvs.20050903/scripts/schedules/audio/Makefile.am
2006-10-22 18:28:49.000000000 -0500
+@@ -1,11 +1,11 @@
+ pkgdatadir = $(gamedatadir)/scripts/schedules/audio
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = in_game.py __init__.py
+
+ all:
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+
+ *.pyc: *.py
+
+Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/audio/Makefile.in
+===================================================================
+--- adonthell-data-0.3.4.cvs.20050903.orig/scripts/schedules/audio/Makefile.in
2006-10-22 18:27:47.000000000 -0500
++++ adonthell-data-0.3.4.cvs.20050903/scripts/schedules/audio/Makefile.in
2006-10-22 18:28:49.000000000 -0500
+@@ -125,7 +125,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = in_game.py __init__.py
+
+@@ -289,7 +289,7 @@
+
+
+ all:
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+
+ *.pyc: *.py
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+Index:
adonthell-data-0.3.4.cvs.20050903/scripts/schedules/mapcharacters/Makefile.am
+===================================================================
+---
adonthell-data-0.3.4.cvs.20050903.orig/scripts/schedules/mapcharacters/Makefile.am
2006-10-22 18:27:47.000000000 -0500
++++
adonthell-data-0.3.4.cvs.20050903/scripts/schedules/mapcharacters/Makefile.am
2006-10-22 18:28:49.000000000 -0500
+@@ -1,6 +1,6 @@
+ pkgdatadir = $(gamedatadir)/scripts/schedules/mapcharacters
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = alek.py erek.py frostbloom.py janesta.py jelom.py bjarn.py \
+ keyboard_control.py oliver.py orloth.py sarin.py silverhair.py \
+@@ -8,7 +8,7 @@
+ extro.py __init__.py schedule.py
+
+ all:
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+
+ *.pyc: *.py
+
+Index:
adonthell-data-0.3.4.cvs.20050903/scripts/schedules/mapcharacters/Makefile.in
+===================================================================
+---
adonthell-data-0.3.4.cvs.20050903.orig/scripts/schedules/mapcharacters/Makefile.in
2006-10-22 18:27:47.000000000 -0500
++++
adonthell-data-0.3.4.cvs.20050903/scripts/schedules/mapcharacters/Makefile.in
2006-10-22 18:28:49.000000000 -0500
+@@ -125,7 +125,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = alek.py erek.py frostbloom.py janesta.py jelom.py bjarn.py \
+ keyboard_control.py oliver.py orloth.py sarin.py silverhair.py \
+@@ -293,7 +293,7 @@
+
+
+ all:
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+
+ *.pyc: *.py
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/mapviews/Makefile.am
+===================================================================
+---
adonthell-data-0.3.4.cvs.20050903.orig/scripts/schedules/mapviews/Makefile.am
2006-10-22 18:27:47.000000000 -0500
++++ adonthell-data-0.3.4.cvs.20050903/scripts/schedules/mapviews/Makefile.am
2006-10-22 18:28:49.000000000 -0500
+@@ -1,11 +1,11 @@
+ pkgdatadir = $(gamedatadir)/scripts/schedules/mapviews
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = center_character.py __init__.py
+
+ all:
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+
+ *.pyc: *.py
+
+Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/mapviews/Makefile.in
+===================================================================
+---
adonthell-data-0.3.4.cvs.20050903.orig/scripts/schedules/mapviews/Makefile.in
2006-10-22 18:27:47.000000000 -0500
++++ adonthell-data-0.3.4.cvs.20050903/scripts/schedules/mapviews/Makefile.in
2006-10-22 18:28:50.000000000 -0500
+@@ -125,7 +125,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+
+-pkgdata_DATA = *.pyc
++pkgdata_DATA = *.py
+
+ EXTRA_DIST = center_character.py __init__.py
+
+@@ -289,7 +289,7 @@
+
+
+ all:
+- $(adonthell_binary) -c
++ #$(adonthell_binary) -c
+
+ *.pyc: *.py
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
only in patch2:
unchanged:
--- adonthell-data-0.3.4.cvs.20050903.orig/debian/patches/02_player_text.py.diff
+++ adonthell-data-0.3.4.cvs.20050903/debian/patches/02_player_text.py.diff
@@ -0,0 +1,8 @@
+--- scripts/modules/player_text.py.orig 2006-10-28 22:31:49.000000000
+0200
++++ scripts/modules/player_text.py 2006-10-28 22:30:34.000000000 +0200
+@@ -1,4 +1,4 @@
+- _("That clock seems to be late!")
++_("That clock seems to be late!")
+ _("Aw, a midget yeti, how cute!")
+ _("I'd better not touch this ... What if it explodes??")
+ _("Closed. We are all imprisoned here ...")
