r11601 - in packages/trunk/rott/debian: . patches
Fabian Greffrath
fabian-guest at alioth.debian.org
Mon Jan 3 14:30:17 UTC 2011
Author: fabian-guest
Date: 2011-01-03 14:30:16 +0000 (Mon, 03 Jan 2011)
New Revision: 11601
Added:
packages/trunk/rott/debian/clean
packages/trunk/rott/debian/patches/10-all-variants.patch
packages/trunk/rott/debian/rott.links
Removed:
packages/trunk/rott/debian/patches/00-registered-version.patch
Modified:
packages/trunk/rott/debian/README.Debian
packages/trunk/rott/debian/changelog
packages/trunk/rott/debian/control
packages/trunk/rott/debian/patches/series
packages/trunk/rott/debian/rott.install
packages/trunk/rott/debian/rott.lintian-overrides
packages/trunk/rott/debian/rott.postinst
packages/trunk/rott/debian/rott.prerm
packages/trunk/rott/debian/rules
Log:
* Build all three variants of the game: Shareware Version, CD Version and
Site License CD Version (LP: #511810).
* Handle variants via update-alternatives, document this in the manual page
and in README-Debian, add symlinks for the manual pages.
* Add lintian overrides for desktop-command-not-in-package
and menu-command-not-in-package.
Modified: packages/trunk/rott/debian/README.Debian
===================================================================
--- packages/trunk/rott/debian/README.Debian 2011-01-03 13:01:00 UTC (rev 11600)
+++ packages/trunk/rott/debian/README.Debian 2011-01-03 14:30:16 UTC (rev 11601)
@@ -1,14 +1,20 @@
Rise of the Triad for Debian
----------------------------
- * The source code is currently configured to use the shareware data files.
- If you want to use the registered version of ROTT, you need to get the
- package source code, uncomment '00-registered-version.patch' in
- 'debian/patches/series' and rebuild the package.
+ * The rott package in Debian supports all three variants of the game:
+ Shareware Version, CD Version and Site License CD Version. The corresponding
+ binaries are named 'rott-shareware', 'rott-superrott' and 'rott-sitelicense',
+ respectively. In order to select which variant is started by the 'rott'
+ command and the desktop and menu files, Debian's 'update-alternatives'
+ mechanism is used:
.
- During package installation choose 'no' when asked to download the
- shareware data files and copy the registered version data files into the
- '/usr/share/games/rott' directory afterwards.
+ $ update-alternatives --config rott
+ .
+ By default, the 'rott-shareware' alternative is preferred.
+ .
+ The game expects its data files in the '/usr/share/games/rott' directory
+ (with upper case file names), so make sure to also copy the appropriate data
+ files into this directory when changing the 'rott' alternative.
* If you encounter game hangs like the one described in #498413,
please install the recommended packages 'timidity' and 'freepats'.
@@ -17,4 +23,4 @@
.
Please note that this works around a bug in sdl-mixer1.2, not rott.
- -- Fabian Greffrath <fabian at debian-unofficial.org> Thu, 8 Jan 2009 11:20:00 +0100
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Mon, 03 Jan 2011 15:10:21 +0100
Modified: packages/trunk/rott/debian/changelog
===================================================================
--- packages/trunk/rott/debian/changelog 2011-01-03 13:01:00 UTC (rev 11600)
+++ packages/trunk/rott/debian/changelog 2011-01-03 14:30:16 UTC (rev 11601)
@@ -1,9 +1,15 @@
-rott (1.1.1-4) UNRELEASED; urgency=low
+rott (1.1.1-4) unstable; urgency=low
* Add Japanese po-debconf template translation,
thanks Hideki Yamane <henrich at debian.org> (Closes: #599886).
+ * Build all three variants of the game: Shareware Version, CD Version and
+ Site License CD Version (LP: #511810).
+ * Handle variants via update-alternatives, document this in the manual page
+ and in README-Debian, add symlinks for the manual pages.
+ * Add lintian overrides for desktop-command-not-in-package
+ and menu-command-not-in-package.
- -- Fabian Greffrath <fabian+debian at greffrath.com> Mon, 03 Jan 2011 14:02:08 +0100
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Mon, 03 Jan 2011 15:10:21 +0100
rott (1.1.1-3.1) unstable; urgency=low
Added: packages/trunk/rott/debian/clean
===================================================================
--- packages/trunk/rott/debian/clean (rev 0)
+++ packages/trunk/rott/debian/clean 2011-01-03 14:30:16 UTC (rev 11601)
@@ -0,0 +1,2 @@
+rott
+rott-*
Modified: packages/trunk/rott/debian/control
===================================================================
--- packages/trunk/rott/debian/control 2011-01-03 13:01:00 UTC (rev 11600)
+++ packages/trunk/rott/debian/control 2011-01-03 14:30:16 UTC (rev 11601)
@@ -14,7 +14,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, wget, unzip | p7zip-full
Recommends: freepats, timidity
-Description: Rise of the Triad -- The HUNT Begins
+Description: SDL-Port of Rise of the Triad
Rise of the Triad is a high quality, fast scrolling first-person perspective
3D action game. It includes a lot of destructive enemies, an arsenal of
weapons from simple pistols to missile launchers, life-preserving armor, traps
@@ -30,7 +30,7 @@
Priority: extra
Architecture: any
Depends: rott (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Rise of the Triad -- The HUNT Begins (debug)
+Description: SDL-Port of Rise of the Triad (debug)
Rise of the Triad is a high quality, fast scrolling first-person perspective
3D action game. It includes a lot of destructive enemies, an arsenal of
weapons from simple pistols to missile launchers, life-preserving armor, traps
Deleted: packages/trunk/rott/debian/patches/00-registered-version.patch
===================================================================
--- packages/trunk/rott/debian/patches/00-registered-version.patch 2011-01-03 13:01:00 UTC (rev 11600)
+++ packages/trunk/rott/debian/patches/00-registered-version.patch 2011-01-03 14:30:16 UTC (rev 11601)
@@ -1,16 +0,0 @@
-The source code is setup to use shareware binaries. If you want to use the
-registered version of ROTT, apply this patch and compile as normal.
-
---- rott-1.1.orig/rott/develop.h
-+++ rott-1.1/rott/develop.h
-@@ -41,8 +41,8 @@
-
- #define BNACRASHPREVENT 1 //bna added
- // Make sure only one of the following are on at one time
--#define SHAREWARE 1
--#define SUPERROTT 0
-+#define SHAREWARE 0
-+#define SUPERROTT 1
- #define SITELICENSE 0
-
- // cute little dopefish thing, only works with special patch?
Added: packages/trunk/rott/debian/patches/10-all-variants.patch
===================================================================
--- packages/trunk/rott/debian/patches/10-all-variants.patch (rev 0)
+++ packages/trunk/rott/debian/patches/10-all-variants.patch 2011-01-03 14:30:16 UTC (rev 11601)
@@ -0,0 +1,43 @@
+Description: Document we support all variants of the game
+Author: Fabian Greffrath <fabian+debian at greffrath.com>
+Forwarded: not-needed
+
+--- rott-1.1.1.orig/doc/rott.6
++++ rott-1.1.1/doc/rott.6
+@@ -7,11 +7,36 @@ rott \- Rise of the Triad
+ .B rott
+ .RI [ options ]
+
++.B rott-shareware
++.RI [ options ]
++
++.B rott-superrott
++.RI [ options ]
++
++.B rott-sitelicense
++.RI [ options ]
++
+ .SH DESCRIPTION
+ .B ROTT
+ is a port of Apogee's 3D action title Rise of the Triad, originally released in 1994.
+ This port duplicates the functionality of the original game on modern operating systems, including Linux, Win32, and Mac OS X.
+
++The
++.B rott-shareware,
++.B rott-superrott
++and
++.B rott-sitelicense
++binaries start the
++.B Shareware Version,
++.B CD Version
++and
++.B Site License CD Version
++of the game, respectively. The
++.B rott
++binary is a symbolic link to one of these and is handled via Debian's
++.B update-alternatives
++mechanism.
++
+ .SH OPTIONS
+ .TP
+ .BR aim
Modified: packages/trunk/rott/debian/patches/series
===================================================================
--- packages/trunk/rott/debian/patches/series 2011-01-03 13:01:00 UTC (rev 11600)
+++ packages/trunk/rott/debian/patches/series 2011-01-03 14:30:16 UTC (rev 11601)
@@ -1,5 +1,5 @@
#00-disable-audiolib.patch
#00-ludicrous-gibs.patch
-#00-registered-version.patch
01-demo-datadir.patch
02-persistent-typo.patch
+10-all-variants.patch
Modified: packages/trunk/rott/debian/rott.install
===================================================================
--- packages/trunk/rott/debian/rott.install 2011-01-03 13:01:00 UTC (rev 11600)
+++ packages/trunk/rott/debian/rott.install 2011-01-03 14:30:16 UTC (rev 11601)
@@ -1,3 +1,3 @@
-rott /usr/games/
+rott-* /usr/games/
../misc/rott.xpm /usr/share/pixmaps/
../misc/rott.desktop /usr/share/applications/
Added: packages/trunk/rott/debian/rott.links
===================================================================
--- packages/trunk/rott/debian/rott.links (rev 0)
+++ packages/trunk/rott/debian/rott.links 2011-01-03 14:30:16 UTC (rev 11601)
@@ -0,0 +1,3 @@
+usr/share/man/man6/rott.6.gz usr/share/man/man6/rott-shareware.6.gz
+usr/share/man/man6/rott.6.gz usr/share/man/man6/rott-superrott.6.gz
+usr/share/man/man6/rott.6.gz usr/share/man/man6/rott-sitelicense1.6.gz
Modified: packages/trunk/rott/debian/rott.lintian-overrides
===================================================================
--- packages/trunk/rott/debian/rott.lintian-overrides 2011-01-03 13:01:00 UTC (rev 11600)
+++ packages/trunk/rott/debian/rott.lintian-overrides 2011-01-03 14:30:16 UTC (rev 11601)
@@ -1,2 +1,5 @@
# Directory created intentionally for data files.
rott: package-contains-empty-directory usr/share/games/rott/
+# The /usr/games/rott binary is handled via update-alternatives.
+rott: desktop-command-not-in-package
+rott: menu-command-not-in-package
Modified: packages/trunk/rott/debian/rott.postinst
===================================================================
--- packages/trunk/rott/debian/rott.postinst 2011-01-03 13:01:00 UTC (rev 11600)
+++ packages/trunk/rott/debian/rott.postinst 2011-01-03 14:30:16 UTC (rev 11601)
@@ -2,6 +2,14 @@
set -e
+
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]
+then
+ update-alternatives --quiet --install /usr/games/rott rott /usr/games/rott-shareware 30
+ update-alternatives --quiet --install /usr/games/rott rott /usr/games/rott-superrott 20
+ update-alternatives --quiet --install /usr/games/rott rott /usr/games/rott-sitelicense 20
+fi
+
. /usr/share/debconf/confmodule
SHAREDIR="/usr/share/games/rott"
Modified: packages/trunk/rott/debian/rott.prerm
===================================================================
--- packages/trunk/rott/debian/rott.prerm 2011-01-03 13:01:00 UTC (rev 11600)
+++ packages/trunk/rott/debian/rott.prerm 2011-01-03 14:30:16 UTC (rev 11601)
@@ -7,6 +7,7 @@
case "$1" in
remove|deconfigure)
+ update-alternatives --quiet --remove-all rott
rm -rf ${SHAREDIR}/* ${DOCDIR}/vendor.doc
;;
Modified: packages/trunk/rott/debian/rules
===================================================================
--- packages/trunk/rott/debian/rules 2011-01-03 13:01:00 UTC (rev 11600)
+++ packages/trunk/rott/debian/rules 2011-01-03 14:30:16 UTC (rev 11601)
@@ -6,5 +6,37 @@
%:
dh --sourcedir=rott $@
+override_dh_auto_build:
+ # Shareware Version
+ sed -e "s/^\(#define SHAREWARE\).*/\1 1/" \
+ -e "s/^\(#define SUPERROTT\).*/\1 0/" \
+ -e "s/^\(#define SITELICENSE\).*/\1 0/" \
+ -i rott/develop.h
+ dh_auto_build
+ mv -fv rott/rott rott/rott-shareware
+ dh_auto_clean
+ # CD Version
+ sed -e "s/^\(#define SHAREWARE\).*/\1 0/" \
+ -e "s/^\(#define SUPERROTT\).*/\1 1/" \
+ -e "s/^\(#define SITELICENSE\).*/\1 0/" \
+ -i rott/develop.h
+ dh_auto_build
+ mv -fv rott/rott rott/rott-superrott
+ dh_auto_clean
+ # Site License CD Version
+ sed -e "s/^\(#define SHAREWARE\).*/\1 0/" \
+ -e "s/^\(#define SUPERROTT\).*/\1 0/" \
+ -e "s/^\(#define SITELICENSE\).*/\1 1/" \
+ -i rott/develop.h
+ dh_auto_build
+ mv -fv rott/rott rott/rott-sitelicense
+
+override_dh_auto_clean:
+ sed -e "s/^\(#define SHAREWARE\).*/\1 1/" \
+ -e "s/^\(#define SUPERROTT\).*/\1 0/" \
+ -e "s/^\(#define SITELICENSE\).*/\1 0/" \
+ -i rott/develop.h
+ dh_auto_clean
+
override_dh_strip:
dh_strip --dbg-package=rott-dbg
More information about the Pkg-games-commits
mailing list