[adonthell-data] 07/60: New Upstream Release Added deveral changes by Iain Lane
Markus Koschany
apo at moszumanska.debian.org
Tue Jul 12 23:23:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository adonthell-data.
commit 7d9a8ce11e053639f5946c3ac165563671ddc938
Author: Miriam Ruiz <miriam at debian.org>
Date: Tue Dec 23 01:39:42 2008 +0000
New Upstream Release
Added deveral changes by Iain Lane
---
debian/adonthell.desktop | 8 --
debian/changelog | 15 ++-
debian/control | 2 +-
debian/patches/01_do_not_ship_pyc_files | 176 ++++++++++++++++----------------
debian/patches/02_player_text.py.diff | 4 +-
debian/patches/series | 2 +
debian/rules | 15 ++-
debian/watch | 2 +
8 files changed, 114 insertions(+), 110 deletions(-)
diff --git a/debian/adonthell.desktop b/debian/adonthell.desktop
index d49f283..e69de29 100644
--- a/debian/adonthell.desktop
+++ b/debian/adonthell.desktop
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Adonthell - Waste's Edge
-Comment=This is a 2D graphical role playing game.
-Exec=/usr/games/adonthell-wastesedge
-Icon=wastesedge_16x16
-Terminal=false
-Type=Application
-Categories=Game;2DGraphics;RolePlaying;
diff --git a/debian/changelog b/debian/changelog
index 3418aba..7b2cd34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,19 @@
-adonthell-data (0.3.4.cvs.20080529-2) unstable; urgency=low
+adonthell-data (0.3.5-1) UNRELEASED; urgency=low
[ Gonéri Le Bouder ]
- * add a desktop file, thanks Emmet Hikory (Closes: #427822)
* Bump the standard version to 3.8.0, no change needed
- -- Barry deFreese <bddebian at comcast.net> Tue, 17 Jun 2008 13:42:36 +0200
+ [ Iain Lane ]
+ * New upstream release 0.3.5
+ * debian/watch: Add watch file
+ * debian/rules: Use quilt.make to apply/deapply quilt patches.
+ * debian/rules: Install upstream's .desktop file. (Closes: #487092)
+ * debian/patches/01_do_not_ship_pyc_files: Refreshed
+ * debian/patches/02_player_text_py.diff: Readded to series. Not fixed
+ upstream. Also fixed to work with -p1 (thanks to Raphael Hertzog)
+ (Closes: #484940)
+
+ -- Iain Lane <laney at ubuntu.com> Mon, 22 Dec 2008 23:29:57 +0000
adonthell-data (0.3.4.cvs.20080529-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 85cb3cc..1a81ec8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Barry deFreese <bddebian at comcast.net>
Build-Depends-Indep: autotools-dev, python-dev, adonthell (>= 0.3), adonthell (<< 0.4), python-support (>= 0.4.0)
-Build-Depends: debhelper (>= 5), quilt
+Build-Depends: debhelper (>= 5), quilt (>= 0.40)
Standards-Version: 3.8.0
Homepage: http://adonthell.linuxgames.com/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/adonthell-data/
diff --git a/debian/patches/01_do_not_ship_pyc_files b/debian/patches/01_do_not_ship_pyc_files
index ad883b1..0c50fee 100644
--- a/debian/patches/01_do_not_ship_pyc_files
+++ b/debian/patches/01_do_not_ship_pyc_files
@@ -1,7 +1,7 @@
-Index: adonthell-data-0.3.4.cvs.20050903/scripts/Makefile.am
+Index: wastesedge-0.3.5/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
+--- wastesedge-0.3.5.orig/scripts/Makefile.am 2002-05-06 14:47:17.000000000 +0100
++++ wastesedge-0.3.5/scripts/Makefile.am 2008-12-22 22:20:58.000000000 +0000
@@ -2,12 +2,12 @@
pkgdatadir = $(gamedatadir)/scripts
@@ -17,12 +17,12 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/Makefile.am
*.pyc: *.py
-Index: adonthell-data-0.3.4.cvs.20050903/scripts/Makefile.in
+Index: wastesedge-0.3.5/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@
+--- wastesedge-0.3.5.orig/scripts/Makefile.in 2008-06-29 10:57:05.000000000 +0100
++++ wastesedge-0.3.5/scripts/Makefile.in 2008-12-22 22:20:58.000000000 +0000
+@@ -108,7 +108,7 @@
+ install_sh = @install_sh@
SUBDIRS = dialogues game_events modules schedules actions
-pkgdata_DATA = *.pyc
@@ -30,7 +30,7 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/Makefile.in
EXTRA_DIST = init.py
-@@ -439,7 +439,7 @@
+@@ -375,7 +375,7 @@
all:
@@ -39,10 +39,10 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/Makefile.in
*.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
+Index: wastesedge-0.3.5/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
+--- wastesedge-0.3.5.orig/scripts/actions/Makefile.am 2002-05-06 14:47:17.000000000 +0100
++++ wastesedge-0.3.5/scripts/actions/Makefile.am 2008-12-22 22:20:58.000000000 +0000
@@ -1,11 +1,11 @@
pkgdatadir = $(gamedatadir)/scripts/actions
@@ -57,20 +57,20 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/actions/Makefile.am
*.pyc: *.py
-Index: adonthell-data-0.3.4.cvs.20050903/scripts/actions/Makefile.in
+Index: wastesedge-0.3.5/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@
+--- wastesedge-0.3.5.orig/scripts/actions/Makefile.in 2008-06-29 10:58:32.000000000 +0100
++++ wastesedge-0.3.5/scripts/actions/Makefile.in 2008-12-22 22:20:58.000000000 +0000
+@@ -106,7 +106,7 @@
+ gamedatadir = @gamedatadir@
+ install_sh = @install_sh@
-pkgdata_DATA = *.pyc
+pkgdata_DATA = *.py
EXTRA_DIST = talk.py __init__.py
-@@ -289,7 +289,7 @@
+@@ -253,7 +253,7 @@
all:
@@ -79,10 +79,10 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/actions/Makefile.in
*.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
+Index: wastesedge-0.3.5/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
+--- wastesedge-0.3.5.orig/scripts/dialogues/Makefile.am 2002-05-06 14:47:17.000000000 +0100
++++ wastesedge-0.3.5/scripts/dialogues/Makefile.am 2008-12-22 22:20:58.000000000 +0000
@@ -1,6 +1,6 @@
pkgdatadir = $(gamedatadir)/scripts/dialogues
@@ -100,20 +100,20 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/dialogues/Makefile.am
*.pyc: *.py
-Index: adonthell-data-0.3.4.cvs.20050903/scripts/dialogues/Makefile.in
+Index: wastesedge-0.3.5/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@
+--- wastesedge-0.3.5.orig/scripts/dialogues/Makefile.in 2008-06-29 10:57:15.000000000 +0100
++++ wastesedge-0.3.5/scripts/dialogues/Makefile.in 2008-12-22 22:20:58.000000000 +0000
+@@ -106,7 +106,7 @@
+ gamedatadir = @gamedatadir@
+ install_sh = @install_sh@
-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 @@
+@@ -258,7 +258,7 @@
all:
@@ -122,10 +122,10 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/dialogues/Makefile.in
*.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
+Index: wastesedge-0.3.5/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
+--- wastesedge-0.3.5.orig/scripts/game_events/Makefile.am 2002-08-18 20:55:19.000000000 +0100
++++ wastesedge-0.3.5/scripts/game_events/Makefile.am 2008-12-22 22:20:58.000000000 +0000
@@ -1,6 +1,6 @@
pkgdatadir = $(gamedatadir)/scripts/game_events
@@ -143,20 +143,20 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/game_events/Makefile.am
*.pyc: *.py
-Index: adonthell-data-0.3.4.cvs.20050903/scripts/game_events/Makefile.in
+Index: wastesedge-0.3.5/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@
+--- wastesedge-0.3.5.orig/scripts/game_events/Makefile.in 2008-06-29 10:57:36.000000000 +0100
++++ wastesedge-0.3.5/scripts/game_events/Makefile.in 2008-12-22 22:20:58.000000000 +0000
+@@ -106,7 +106,7 @@
+ gamedatadir = @gamedatadir@
+ install_sh = @install_sh@
-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 @@
+@@ -258,7 +258,7 @@
all:
@@ -165,10 +165,10 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/game_events/Makefile.in
*.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
+Index: wastesedge-0.3.5/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
+--- wastesedge-0.3.5.orig/scripts/modules/Makefile.am 2002-05-06 14:47:18.000000000 +0100
++++ wastesedge-0.3.5/scripts/modules/Makefile.am 2008-12-22 22:20:58.000000000 +0000
@@ -1,12 +1,12 @@
pkgdatadir = $(gamedatadir)/scripts/modules
@@ -184,20 +184,20 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/modules/Makefile.am
*.pyc: *.py
-Index: adonthell-data-0.3.4.cvs.20050903/scripts/modules/Makefile.in
+Index: wastesedge-0.3.5/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@
+--- wastesedge-0.3.5.orig/scripts/modules/Makefile.in 2008-06-29 10:57:50.000000000 +0100
++++ wastesedge-0.3.5/scripts/modules/Makefile.in 2008-12-22 22:20:58.000000000 +0000
+@@ -106,7 +106,7 @@
+ gamedatadir = @gamedatadir@
+ install_sh = @install_sh@
-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 @@
+@@ -255,7 +255,7 @@
all:
@@ -206,10 +206,10 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/modules/Makefile.in
*.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
+Index: wastesedge-0.3.5/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
+--- wastesedge-0.3.5.orig/scripts/schedules/Makefile.am 2002-05-06 14:47:18.000000000 +0100
++++ wastesedge-0.3.5/scripts/schedules/Makefile.am 2008-12-22 22:20:58.000000000 +0000
@@ -2,11 +2,11 @@
pkgdatadir = $(gamedatadir)/scripts/schedules
@@ -224,12 +224,12 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/Makefile.am
+ #$(adonthell_binary) -c
CLEANFILES = *.pyc
-Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/Makefile.in
+Index: wastesedge-0.3.5/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@
+--- wastesedge-0.3.5.orig/scripts/schedules/Makefile.in 2008-06-29 10:58:06.000000000 +0100
++++ wastesedge-0.3.5/scripts/schedules/Makefile.in 2008-12-22 22:20:58.000000000 +0000
+@@ -108,7 +108,7 @@
+ install_sh = @install_sh@
SUBDIRS = audio mapcharacters mapviews
-pkgdata_DATA = *.pyc
@@ -237,7 +237,7 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/Makefile.in
EXTRA_DIST = control.py __init__.py
-@@ -439,7 +439,7 @@
+@@ -375,7 +375,7 @@
*.pyc: *.py
@@ -246,10 +246,10 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/Makefile.in
# 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
+Index: wastesedge-0.3.5/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
+--- wastesedge-0.3.5.orig/scripts/schedules/audio/Makefile.am 2002-05-06 14:47:18.000000000 +0100
++++ wastesedge-0.3.5/scripts/schedules/audio/Makefile.am 2008-12-22 22:20:58.000000000 +0000
@@ -1,11 +1,11 @@
pkgdatadir = $(gamedatadir)/scripts/schedules/audio
@@ -264,20 +264,20 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/audio/Makefile.am
*.pyc: *.py
-Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/audio/Makefile.in
+Index: wastesedge-0.3.5/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@
+--- wastesedge-0.3.5.orig/scripts/schedules/audio/Makefile.in 2008-06-29 10:58:12.000000000 +0100
++++ wastesedge-0.3.5/scripts/schedules/audio/Makefile.in 2008-12-22 22:20:58.000000000 +0000
+@@ -106,7 +106,7 @@
+ gamedatadir = @gamedatadir@
+ install_sh = @install_sh@
-pkgdata_DATA = *.pyc
+pkgdata_DATA = *.py
EXTRA_DIST = in_game.py __init__.py
-@@ -289,7 +289,7 @@
+@@ -253,7 +253,7 @@
all:
@@ -286,10 +286,10 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/audio/Makefile.in
*.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
+Index: wastesedge-0.3.5/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
+--- wastesedge-0.3.5.orig/scripts/schedules/mapcharacters/Makefile.am 2002-08-18 20:55:19.000000000 +0100
++++ wastesedge-0.3.5/scripts/schedules/mapcharacters/Makefile.am 2008-12-22 22:20:58.000000000 +0000
@@ -1,6 +1,6 @@
pkgdatadir = $(gamedatadir)/scripts/schedules/mapcharacters
@@ -307,20 +307,20 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/mapcharacters/Makefil
*.pyc: *.py
-Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/mapcharacters/Makefile.in
+Index: wastesedge-0.3.5/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@
+--- wastesedge-0.3.5.orig/scripts/schedules/mapcharacters/Makefile.in 2008-06-29 10:58:18.000000000 +0100
++++ wastesedge-0.3.5/scripts/schedules/mapcharacters/Makefile.in 2008-12-22 22:20:58.000000000 +0000
+@@ -106,7 +106,7 @@
+ gamedatadir = @gamedatadir@
+ install_sh = @install_sh@
-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 @@
+@@ -257,7 +257,7 @@
all:
@@ -329,10 +329,10 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/mapcharacters/Makefil
*.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
+Index: wastesedge-0.3.5/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
+--- wastesedge-0.3.5.orig/scripts/schedules/mapviews/Makefile.am 2002-05-06 14:47:18.000000000 +0100
++++ wastesedge-0.3.5/scripts/schedules/mapviews/Makefile.am 2008-12-22 22:20:58.000000000 +0000
@@ -1,11 +1,11 @@
pkgdatadir = $(gamedatadir)/scripts/schedules/mapviews
@@ -347,20 +347,20 @@ Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/mapviews/Makefile.am
*.pyc: *.py
-Index: adonthell-data-0.3.4.cvs.20050903/scripts/schedules/mapviews/Makefile.in
+Index: wastesedge-0.3.5/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@
+--- wastesedge-0.3.5.orig/scripts/schedules/mapviews/Makefile.in 2008-06-29 10:58:24.000000000 +0100
++++ wastesedge-0.3.5/scripts/schedules/mapviews/Makefile.in 2008-12-22 22:20:58.000000000 +0000
+@@ -106,7 +106,7 @@
+ gamedatadir = @gamedatadir@
+ install_sh = @install_sh@
-pkgdata_DATA = *.pyc
+pkgdata_DATA = *.py
EXTRA_DIST = center_character.py __init__.py
-@@ -289,7 +289,7 @@
+@@ -253,7 +253,7 @@
all:
diff --git a/debian/patches/02_player_text.py.diff b/debian/patches/02_player_text.py.diff
index a03d106..32c3fcc 100644
--- a/debian/patches/02_player_text.py.diff
+++ b/debian/patches/02_player_text.py.diff
@@ -1,5 +1,5 @@
---- 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
+--- a/scripts/modules/player_text.py.orig 2006-10-28 22:31:49.000000000 +0200
++++ b/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!")
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f0acc3f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_do_not_ship_pyc_files
+02_player_text.py.diff
diff --git a/debian/rules b/debian/rules
index 1210fd4..e6ad55d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
#!/usr/bin/make -f
#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)
INSTALL = /usr/bin/install -c
@@ -14,7 +16,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
-config.status: configure
+config.status: configure $(QUILT_STAMPFN)
dh_testdir
-test -r /usr/share/misc/config.sub && \
@@ -22,8 +24,6 @@ config.status: configure
-test -r /usr/share/misc/config.guess && \
cp -f /usr/share/misc/config.guess config.guess
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-
./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
@@ -36,11 +36,12 @@ build: build-stamp
build-stamp: config.status
dh_testdir
+ $(MAKE) wastesedge.desktop
$(MAKE) INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
DESTDIR="$(CURDIR)/debian/adonthell-data"
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
@@ -53,8 +54,6 @@ clean:
-rm -f po/*.gmo
-rm -f config.sub config.guess
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-
dh_clean
install: build
@@ -66,8 +65,8 @@ install: build
$(MAKE) install DESTDIR="$(CURDIR)/debian/adonthell-data" \
INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
# gamedatadir="$(CURDIR)/debian/adonthell-data/usr/share/games/adonthell-data"
- mkdir -p $(CURDIR)/debian/adonthell/usr/share/applications
- install -m 644 $(CURDIR)/debian/adonthell.desktop $(CURDIR)/debian/adonthell/usr/share/applications/adonthell.desktop
+ mkdir -p $(CURDIR)/debian/adonthell-data/usr/share/applications
+ install -m 644 $(CURDIR)/wastesedge.desktop $(CURDIR)/debian/adonthell-data/usr/share/applications/adonthell-data.desktop
# Build architecture-independent files here.
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..38c273d
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://savannah.nongnu.org/download/adonthell/wastesedge-src-(.*).tar.gz debian
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/adonthell-data.git
More information about the Pkg-games-commits
mailing list