Package: exult
Severity: wishlist
Tags: patch
While I was looking at #192468 and #192469, I noticed that exult doesn't
build at all on sid. Here is a summary of the changes I made to make it
possible to build the package again.
* debian/control:
+ Standards version bumped to 3.7.2.
+ Depend on debhelper (>= 5).
* debian/rules:
+ DH_COMPAT changed to 5.
+ (install) Use dh_install instead of the deprecated dh_movefiles.
* debian/exult.install: New file, for dh_install.
* debian/exult-studio.install: New file, for dh_install.
* debian/*.files: Removed, dh_movefiles not used anymore.
I still have doubts regarding exult-studio. It seems to me that
01_estudio_dir.patch is intended to install exult-studio "data" on
/usr/share/games/exult/, but in fact, the current version installs it
in /usr/share/games/exult/estudio/new/.
Also, note that dh_install is called using --fail-missing, which should
be equivalent to the previous check. The desktop file and its icon are
excluded since I didn't want to touch more than what was necessary,
but it wouldn't be a bad idea to include them.
Finally, debian/templates also needs a review: malformed titles and
use of first person (dev-ref 6.5.2.5). A possible fix is also attached
separately.
Thanks.
diff -Nu debian-old/control debian/control
--- debian-old/control 2006-07-30 20:09:00.000000000 +0200
+++ debian/control 2006-07-29 23:54:07.000000000 +0200
@@ -2,8 +2,8 @@
Section: contrib/games
Priority: extra
Maintainer: Michael Banck <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.1.16), dpatch, flex, bison, libsdl1.2-dev (>=
1.2.7+1.2.8cvs20041007-5.1), libsdl-mixer1.2-dev, libx11-dev, x-dev, timidity,
libgimp2.0-dev (>= 2.2.8-11), libglade2-dev, zlib1g-dev, libpng12-dev,
autoconf, automake1.4, libtool, libx11-dev
-Standards-Version: 3.6.1.1
+Build-Depends: debhelper (>= 5), dpatch, flex, bison, libsdl1.2-dev (>=
1.2.7+1.2.8cvs20041007-5.1), libsdl-mixer1.2-dev, libx11-dev, x-dev, timidity,
libgimp2.0-dev (>= 2.2.8-11), libglade2-dev, zlib1g-dev, libpng12-dev,
autoconf, automake1.4, libtool, libx11-dev
+Standards-Version: 3.7.2
Package: exult
Architecture: any
diff -Nu debian-old/exult.files debian/exult.files
--- debian-old/exult.files 2006-07-30 20:09:00.000000000 +0200
+++ debian/exult.files 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-usr/share/games/exult/*.flx
-usr/share/games/exult/*.txt
-usr/share/games/exult/*.data
-usr/share/man/man6/exult.6
-usr/bin/exult
diff -Nu debian-old/exult.install debian/exult.install
--- debian-old/exult.install 1970-01-01 01:00:00.000000000 +0100
+++ debian/exult.install 2006-07-29 22:59:00.000000000 +0200
@@ -0,0 +1,9 @@
+usr/share/games/exult/exult.flx
+usr/share/games/exult/exult_bg.flx
+usr/share/games/exult/exult_si.flx
+usr/share/games/exult/midisfx.flx
+usr/share/games/exult/exultmsg.txt
+usr/share/games/exult/u7bgintrinsics.data
+usr/share/games/exult/u7siintrinsics.data
+usr/share/man/man6/exult.6
+usr/bin/exult
diff -Nu debian-old/exult-studio.files debian/exult-studio.files
--- debian-old/exult-studio.files 2006-07-30 20:09:00.000000000 +0200
+++ debian/exult-studio.files 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-usr/bin/expack
-usr/bin/ipack
-usr/bin/textpack
-usr/bin/splitshp
-usr/bin/shp2pcx
-usr/bin/ucxt
-usr/bin/ucc
-usr/bin/exult_studio
-usr/share/games/exult/u7opcodes.data
-usr/share/games/exult/u7misc.data
-usr/share/games/exult/exult_studio.glade
-usr/share/games/exult/estudio/new/*
-usr/share/man/man1/expack.1
-usr/share/man/man1/ipack.1
-usr/share/man/man1/shp2pcx.1
-usr/share/man/man1/splitshp.1
-usr/share/man/man1/textpack.1
-usr/lib/gimp/2.0/plug-ins/u7shp
diff -Nu debian-old/exult-studio.install debian/exult-studio.install
--- debian-old/exult-studio.install 1970-01-01 01:00:00.000000000 +0100
+++ debian/exult-studio.install 2006-07-29 22:59:11.000000000 +0200
@@ -0,0 +1,22 @@
+usr/bin/expack
+usr/bin/ipack
+usr/bin/textpack
+usr/bin/splitshp
+usr/bin/shp2pcx
+usr/bin/ucxt
+usr/bin/ucc
+usr/bin/exult_studio
+usr/share/games/exult/u7opcodes.data
+usr/share/games/exult/u7misc.data
+usr/share/games/exult/exult_studio.glade
+usr/share/games/exult/combos.flx
+usr/share/games/exult/palettes.flx
+usr/share/games/exult/text.flx
+usr/share/games/exult/pointers.shp
+usr/share/games/exult/*.vga
+usr/share/man/man1/expack.1
+usr/share/man/man1/ipack.1
+usr/share/man/man1/shp2pcx.1
+usr/share/man/man1/splitshp.1
+usr/share/man/man1/textpack.1
+usr/lib/gimp/2.0/plug-ins/u7shp
diff -Nu debian-old/rules debian/rules
--- debian-old/rules 2006-07-30 20:09:00.000000000 +0200
+++ debian/rules 2006-07-30 15:04:36.000000000 +0200
@@ -28,7 +28,7 @@
#export DH_VERBOSE=1
# This is the debhelper compatability version to use.
-export DH_COMPAT=3
+export DH_COMPAT=5
include /usr/share/dpatch/dpatch.make
@@ -83,18 +83,13 @@
dh_testroot
dh_clean -k
dh_installdirs
- mkdir -p debian/tmp/usr/share/games/exult/estudio/new
- # Install the package into debian/tmp; dh_movefiles then puts
+ #mkdir -p debian/tmp/usr/share/games/exult/estudio/new
+ # Install the package into debian/tmp; dh_install then puts
# the files into debian/exult or debian/exult-tools as
# required.
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- dh_movefiles -Nexult
- dh_movefiles -pexult
- @if [ `find debian/tmp -type d -or -print | wc -l` -gt 0 ]; then \
- echo The following files are not accounted for:; \
- find debian/tmp -type d -or -print; \
- false; \
- fi
+ dh_install --fail-missing --sourcedir=$(CURDIR)/debian/tmp \
+ -Xexult.png -Xexult.desktop
install -d $(exult_pixmaps)
install -m644 debian/exult.xpm $(exult_pixmaps)
# handle the exult binary
--- debian-old/templates 2006-07-30 20:09:00.000000000 +0200
+++ debian/templates 2006-07-30 20:26:07.000000000 +0200
@@ -18,10 +18,12 @@
Template: exult/not_a_dir
Type: note
-_Description: The entered path is not a directory.
+_Description: The entered path is not a directory
+ Exult expects the path to the Ultima top directory.
Template: exult/no_static
Type: note
-_Description: This does not look like a top directory of one of the Ultimas.
- (Specifically, I was looking for a subdirectory named "static", which did
- not exist.)
+_Description: Invalid Ultima top directory
+ The entered path does not look like a Ultima VII top directory.
+ (Specifically, a subdirectory named "static" was expected but did not
+ exist.)
