r9983 - packages/trunk/freedoom/debian
Jon Dowland
jmtd at alioth.debian.org
Tue Jul 7 22:36:50 UTC 2009
Author: jmtd
Date: 2009-07-07 22:36:49 +0000 (Tue, 07 Jul 2009)
New Revision: 9983
Added:
packages/trunk/freedoom/debian/wrappers/
Removed:
packages/trunk/freedoom/debian/freedm.prerm
packages/trunk/freedoom/debian/freedoom.prerm
packages/trunk/freedoom/debian/overrides/
packages/trunk/freedoom/debian/patches/
Modified:
packages/trunk/freedoom/debian/changelog
packages/trunk/freedoom/debian/compat
packages/trunk/freedoom/debian/control
packages/trunk/freedoom/debian/freedm.desktop
packages/trunk/freedoom/debian/freedm.install
packages/trunk/freedoom/debian/freedm.postinst
packages/trunk/freedoom/debian/freedoom.desktop
packages/trunk/freedoom/debian/freedoom.install
packages/trunk/freedoom/debian/freedoom.postinst
packages/trunk/freedoom/debian/rules
Log:
merge branch "no_iwad_alternatives"
Modified: packages/trunk/freedoom/debian/changelog
===================================================================
--- packages/trunk/freedoom/debian/changelog 2009-07-06 19:26:50 UTC (rev 9982)
+++ packages/trunk/freedoom/debian/changelog 2009-07-07 22:36:49 UTC (rev 9983)
@@ -1,3 +1,22 @@
+freedoom (0.6.4-5) unstable; urgency=low
+
+ * Stop providing doom2.wad alternative: we are not
+ vanilla compatible. Remove older alternatives in
+ postinst for upgrades.
+ * Adjust PATH in debian/rules to avoid needing to
+ patch Makefile: thus, remove quilt dependency and
+ patching boilerplate
+ * bump Debhelper and compat to 7
+ * install "freedm" and "freedoom" invoke-scripts into
+ /usr/games. Reference these in the .desktop files.
+ * Remove lintian overrides. These were for calling
+ "boom" in the desktop files but not installing it
+ (fixed with invoke-scripts); creating a directory
+ with no files in it (which we installed alternatives
+ into).
+
+ -- Jon Dowland <jmtd at debian.org> Sun, 05 Jul 2009 22:38:45 +0100
+
freedoom (0.6.4-4) unstable; urgency=low
* changes for debhelper 7
Modified: packages/trunk/freedoom/debian/compat
===================================================================
--- packages/trunk/freedoom/debian/compat 2009-07-06 19:26:50 UTC (rev 9982)
+++ packages/trunk/freedoom/debian/compat 2009-07-07 22:36:49 UTC (rev 9983)
@@ -1 +1 @@
-5
+7
Modified: packages/trunk/freedoom/debian/control
===================================================================
--- packages/trunk/freedoom/debian/control 2009-07-06 19:26:50 UTC (rev 9982)
+++ packages/trunk/freedoom/debian/control 2009-07-07 22:36:49 UTC (rev 9983)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Moritz Muehlenhoff <jmm at debian.org>, Jon Dowland <jmtd at debian.org>
-Build-Depends: debhelper (>= 5), quilt
+Build-Depends: debhelper (>= 7)
Build-Depends-Indep: deutex, imagemagick, gsfonts, python (>= 2.4)
Standards-Version: 3.8.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/freedoom/
Modified: packages/trunk/freedoom/debian/freedm.desktop
===================================================================
--- packages/trunk/freedoom/debian/freedm.desktop 2009-07-06 19:26:50 UTC (rev 9982)
+++ packages/trunk/freedoom/debian/freedm.desktop 2009-07-07 22:36:49 UTC (rev 9983)
@@ -2,7 +2,7 @@
Name=Free DM
GenericName=Multiplayer-only Clone of the first person shooter Doom
Comment=First Person Shooter Game
-Exec=boom -iwad /usr/share/games/freedoom/freedm.wad
+Exec=/usr/games/freedm
Icon=freedm
Terminal=false
Type=Application
Modified: packages/trunk/freedoom/debian/freedm.install
===================================================================
--- packages/trunk/freedoom/debian/freedm.install 2009-07-06 19:26:50 UTC (rev 9982)
+++ packages/trunk/freedoom/debian/freedm.install 2009-07-07 22:36:49 UTC (rev 9983)
@@ -1,4 +1,4 @@
+debian/wrappers/freedm usr/games
wads/freedm.wad usr/share/games/freedoom
debian/freedm.desktop usr/share/applications
freedm.xpm /usr/share/pixmaps
-debian/overrides/freedm usr/share/lintian/overrides
Modified: packages/trunk/freedoom/debian/freedm.postinst
===================================================================
--- packages/trunk/freedoom/debian/freedm.postinst 2009-07-06 19:26:50 UTC (rev 9982)
+++ packages/trunk/freedoom/debian/freedm.postinst 2009-07-07 22:36:49 UTC (rev 9983)
@@ -5,10 +5,10 @@
case "$1" in
configure|abort-upgrade)
- update-alternatives --install /usr/share/games/doom/doom2.wad \
- doom2.wad \
- /usr/share/games/freedoom/freedm.wad \
- 12
+ if dpkg --compare-versions "$2" lt "0.6.4-5"; then
+ update-alternatives --quiet --remove doom2.wad \
+ /usr/share/games/freedoom/freedm.wad
+ fi
;;
abort-remove|abort-deconfigure)
Deleted: packages/trunk/freedoom/debian/freedm.prerm
===================================================================
--- packages/trunk/freedoom/debian/freedm.prerm 2009-07-06 19:26:50 UTC (rev 9982)
+++ packages/trunk/freedoom/debian/freedm.prerm 2009-07-07 22:36:49 UTC (rev 9983)
@@ -1,21 +0,0 @@
-#! /bin/sh
-# prerm script for freedm
-
-set -e
-
-case "$1" in
- remove)
- update-alternatives --remove doom2.wad \
- /usr/share/games/freedoom/freedm.wad
- ;;
- upgrade|deconfigure|failed-upgrade)
- ;;
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Modified: packages/trunk/freedoom/debian/freedoom.desktop
===================================================================
--- packages/trunk/freedoom/debian/freedoom.desktop 2009-07-06 19:26:50 UTC (rev 9982)
+++ packages/trunk/freedoom/debian/freedoom.desktop 2009-07-07 22:36:49 UTC (rev 9983)
@@ -2,7 +2,7 @@
Name=Freedoom
GenericName=Clone of the legendary first person shooter Doom
Comment=First Person Shooter Game
-Exec=boom -iwad /usr/share/games/freedoom/doom2.wad
+Exec=/usr/games/freedoom
Icon=freedoom
Terminal=false
Type=Application
Modified: packages/trunk/freedoom/debian/freedoom.install
===================================================================
--- packages/trunk/freedoom/debian/freedoom.install 2009-07-06 19:26:50 UTC (rev 9982)
+++ packages/trunk/freedoom/debian/freedoom.install 2009-07-07 22:36:49 UTC (rev 9983)
@@ -1,4 +1,3 @@
-wads/doom2.wad usr/share/games/freedoom
-debian/overrides/freedoom usr/share/lintian/overrides
+debian/wrappers/freedoom usr/games
debian/freedoom.desktop usr/share/applications
freedoom.xpm /usr/share/pixmaps
Modified: packages/trunk/freedoom/debian/freedoom.postinst
===================================================================
--- packages/trunk/freedoom/debian/freedoom.postinst 2009-07-06 19:26:50 UTC (rev 9982)
+++ packages/trunk/freedoom/debian/freedoom.postinst 2009-07-07 22:36:49 UTC (rev 9983)
@@ -5,10 +5,10 @@
case "$1" in
configure|abort-upgrade)
- update-alternatives --install /usr/share/games/doom/doom2.wad \
- doom2.wad \
- /usr/share/games/freedoom/doom2.wad \
- 25
+ if dpkg --compare-versions "$2" lt "0.6.4-5"; then
+ update-alternatives --quiet --remove doom2.wad \
+ /usr/share/games/freedoom/doom2.wad
+ fi
;;
abort-remove|abort-deconfigure)
Deleted: packages/trunk/freedoom/debian/freedoom.prerm
===================================================================
--- packages/trunk/freedoom/debian/freedoom.prerm 2009-07-06 19:26:50 UTC (rev 9982)
+++ packages/trunk/freedoom/debian/freedoom.prerm 2009-07-07 22:36:49 UTC (rev 9983)
@@ -1,21 +0,0 @@
-#! /bin/sh
-# prerm script for nodm
-
-set -e
-
-case "$1" in
- remove)
- update-alternatives --remove doom2.wad \
- /usr/share/games/freedoom/doom2.wad
- ;;
- upgrade|deconfigure|failed-upgrade)
- ;;
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Modified: packages/trunk/freedoom/debian/rules
===================================================================
--- packages/trunk/freedoom/debian/rules 2009-07-06 19:26:50 UTC (rev 9982)
+++ packages/trunk/freedoom/debian/rules 2009-07-07 22:36:49 UTC (rev 9983)
@@ -6,10 +6,13 @@
# This is the debhelper compatability version to use.
#export DH_COMPAT=3
+# upstream makefile invokes 'deutex' which lives in
+# /usr/games
+PATH := /usr/games:$(PATH)
+
configure: configure-stamp
configure-stamp:
dh_testdir
- $(MAKE) -f /usr/share/quilt/quilt.make patch
touch configure-stamp
build: configure-stamp build-stamp
@@ -33,7 +36,6 @@
rm -f build-stamp configure-stamp
dh_clean
$(MAKE) clean
- $(MAKE) -f /usr/share/quilt/quilt.make unpatch
rm -f freedoom.xpm freedm.xpm
@@ -43,6 +45,7 @@
dh_prep
dh_installdirs
dh_install
+ mv -i wads/doom2.wad debian/freedoom/usr/share/games/doom/freedoom.wad
binary: binary-indep
More information about the Pkg-games-commits
mailing list