[chocolate-doom] 01/01: Split the Heretic, Hexen and Strife ports into separate packages, as per upstream's request (Closes: #747256).
Fabian Greffrath
fabian-guest at moszumanska.debian.org
Mon May 4 10:13:19 UTC 2015
This is an automated email from the git hooks/post-receive script.
fabian-guest pushed a commit to branch master
in repository chocolate-doom.
commit 176a8c556660318980a9b398d080e6bbb33e65f6
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date: Mon May 4 12:12:54 2015 +0200
Split the Heretic, Hexen and Strife ports into separate packages, as per upstream's request (Closes: #747256).
* Split the Heretic, Hexen and Strife ports into separate packages,
as per upstream's request (Closes: #747256).
+ Introduce an additional chocolate-common package that contains the
dedicated server for multiplayer games and the common configuration tool
for all four ports as well as the icons.
+ Split the chocolate-doom.{install,links,lintian-overrides,menu} files
among the newly added packages.
+ Add Breaks and Replaces accordingly.
+ Add "Recommends: chocolate-heretic, chocolate-hexen, chocolate-strife"
to chocolate-doom, so these ports are not lost on upgrades.
+ Remove the alternatives for heretic, hexen and strife upon upgrade of
the chocolate-doom package.
+ Append "-Wl,--as-needed -Wl,-z,defs" to LDFLAGS to avoid needless
library dependencies for the chocolate-common package.
+ Call "dh_install --list-missing". It is alright if the chocolate-*-setup.6
manpages are reported missing, they are installed as symlinks.
* Move the "chocolate-doom" source and binary packages from the
"contrib/games" section into the main "games" section \o/
(Closes: #766713, 766803).
+ Since freedoom 0.9 the freedm package contains a fully vanilla-compatible
data file which satisfies the chocolate-doom package's dependency
on such data in order to be fully playable and operational.
+ Add "Depends: freedm (>= 0.9)" as the preferred alternative.
+ The Heretic, Hexen and Strife ports remain in "contrib/games", though.
* Apply a series of patches cherry-picked from upstream GIT to fix the
hyphen-used-as-minus-sign lintian warning.
---
debian/changelog | 31 +++++
debian/chocolate-common.install | 7 ++
debian/chocolate-common.menu | 15 +++
debian/chocolate-doom.install | 8 +-
debian/chocolate-doom.links | 6 -
debian/chocolate-doom.lintian-overrides | 5 +-
debian/chocolate-doom.menu | 40 -------
debian/chocolate-doom.postinst | 35 +-----
debian/chocolate-doom.preinst | 17 +++
debian/chocolate-doom.prerm | 18 +--
debian/chocolate-heretic.install | 6 +
debian/chocolate-heretic.links | 2 +
debian/chocolate-heretic.lintian-overrides | 2 +
debian/chocolate-heretic.menu | 7 ++
debian/chocolate-heretic.postinst | 14 +++
debian/chocolate-heretic.prerm | 12 ++
debian/chocolate-hexen.install | 6 +
debian/chocolate-hexen.links | 2 +
debian/chocolate-hexen.lintian-overrides | 2 +
debian/chocolate-hexen.menu | 7 ++
debian/chocolate-hexen.postinst | 14 +++
debian/chocolate-hexen.prerm | 12 ++
debian/chocolate-strife.install | 6 +
debian/chocolate-strife.links | 2 +
debian/chocolate-strife.lintian-overrides | 2 +
debian/chocolate-strife.menu | 7 ++
debian/chocolate-strife.postinst | 14 +++
debian/chocolate-strife.prerm | 12 ++
debian/control | 131 +++++++++++++++++++--
.../0001-man-Use-to-denote-dashes.-Fixes-512.patch | 25 ++++
...an-fix-one-last-hyphen-used-as-minus-sign.patch | 25 ++++
...x-the-very-last-hyphen-used-as-minus-sign.patch | 25 ++++
debian/patches/series | 3 +
debian/rules | 10 +-
34 files changed, 419 insertions(+), 111 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f5d55f3..a07cbd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+chocolate-doom (2.1.0-2) unstable; urgency=medium
+
+ * Split the Heretic, Hexen and Strife ports into separate packages,
+ as per upstream's request (Closes: #747256).
+ + Introduce an additional chocolate-common package that contains the
+ dedicated server for multiplayer games and the common configuration tool
+ for all four ports as well as the icons.
+ + Split the chocolate-doom.{install,links,lintian-overrides,menu} files
+ among the newly added packages.
+ + Add Breaks and Replaces accordingly.
+ + Add "Recommends: chocolate-heretic, chocolate-hexen, chocolate-strife"
+ to chocolate-doom, so these ports are not lost on upgrades.
+ + Remove the alternatives for heretic, hexen and strife upon upgrade of
+ the chocolate-doom package.
+ + Append "-Wl,--as-needed -Wl,-z,defs" to LDFLAGS to avoid needless
+ library dependencies for the chocolate-common package.
+ + Call "dh_install --list-missing". It is alright if the chocolate-*-setup.6
+ manpages are reported missing, they are installed as symlinks.
+ * Move the "chocolate-doom" source and binary packages from the
+ "contrib/games" section into the main "games" section \o/
+ (Closes: #766713, 766803).
+ + Since freedoom 0.9 the freedm package contains a fully vanilla-compatible
+ data file which satisfies the chocolate-doom package's dependency
+ on such data in order to be fully playable and operational.
+ + Add "Depends: freedm (>= 0.9)" as the preferred alternative.
+ + The Heretic, Hexen and Strife ports remain in "contrib/games", though.
+ * Apply a series of patches cherry-picked from upstream GIT to fix the
+ hyphen-used-as-minus-sign lintian warning.
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Mon, 04 May 2015 08:35:59 +0200
+
chocolate-doom (2.1.0-1) unstable; urgency=medium
* Imported Upstream version 2.1.0
diff --git a/debian/chocolate-common.install b/debian/chocolate-common.install
new file mode 100644
index 0000000..23efdfd
--- /dev/null
+++ b/debian/chocolate-common.install
@@ -0,0 +1,7 @@
+debian/chocolate-*.xpm usr/share/pixmaps
+usr/games/chocolate-server
+usr/games/chocolate-setup
+usr/share/applications/chocolate-setup.desktop
+usr/share/icons/
+usr/share/man/man6/chocolate-server.6
+usr/share/man/man6/chocolate-setup.6
diff --git a/debian/chocolate-common.menu b/debian/chocolate-common.menu
new file mode 100644
index 0000000..5a2c37e
--- /dev/null
+++ b/debian/chocolate-common.menu
@@ -0,0 +1,15 @@
+?package(chocolate-common):\
+ needs="X11"\
+ section="Games/Action"\
+ hints="Doom,First person"\
+ title="Chocolate Setup"\
+ command="/usr/games/chocolate-setup"\
+ icon="/usr/share/pixmaps/chocolate-setup.xpm"
+
+?package(chocolate-common):\
+ needs="text"\
+ section="Games/Action"\
+ hints="Doom,First person"\
+ title="Chocolate Server"\
+ command="/usr/games/chocolate-server"\
+ icon="/usr/share/pixmaps/chocolate-doom.xpm"
diff --git a/debian/chocolate-doom.install b/debian/chocolate-doom.install
index c43eeda..643264c 100644
--- a/debian/chocolate-doom.install
+++ b/debian/chocolate-doom.install
@@ -1 +1,7 @@
-debian/chocolate-*.xpm usr/share/pixmaps
+usr/games/chocolate-doom
+usr/share/applications/chocolate-doom.desktop
+usr/share/applications/screensavers/chocolate-doom-screensaver.desktop
+usr/share/doc/chocolate-doom
+usr/share/man/man5/chocolate-doom.cfg.5
+usr/share/man/man5/default.cfg.5
+usr/share/man/man6/chocolate-doom.6
diff --git a/debian/chocolate-doom.links b/debian/chocolate-doom.links
index 5520cdc..5fc5d79 100644
--- a/debian/chocolate-doom.links
+++ b/debian/chocolate-doom.links
@@ -1,8 +1,2 @@
usr/games/chocolate-setup usr/games/chocolate-doom-setup
-usr/games/chocolate-setup usr/games/chocolate-heretic-setup
-usr/games/chocolate-setup usr/games/chocolate-hexen-setup
-usr/games/chocolate-setup usr/games/chocolate-strife-setup
usr/share/man/man6/chocolate-setup.6.gz usr/share/man/man6/chocolate-doom-setup.6.gz
-usr/share/man/man6/chocolate-setup.6.gz usr/share/man/man6/chocolate-heretic-setup.6.gz
-usr/share/man/man6/chocolate-setup.6.gz usr/share/man/man6/chocolate-hexen-setup.6.gz
-usr/share/man/man6/chocolate-setup.6.gz usr/share/man/man6/chocolate-strife-setup.6.gz
diff --git a/debian/chocolate-doom.lintian-overrides b/debian/chocolate-doom.lintian-overrides
index ba5b2e4..e0d9841 100644
--- a/debian/chocolate-doom.lintian-overrides
+++ b/debian/chocolate-doom.lintian-overrides
@@ -1,5 +1,2 @@
-# These contain legitimate information
+# This contains legitimate information
chocolate-doom: package-contains-upstream-install-documentation usr/share/doc/chocolate-doom/INSTALL.doom.gz
-chocolate-doom: package-contains-upstream-install-documentation usr/share/doc/chocolate-doom/INSTALL.heretic
-chocolate-doom: package-contains-upstream-install-documentation usr/share/doc/chocolate-doom/INSTALL.hexen
-chocolate-doom: package-contains-upstream-install-documentation usr/share/doc/chocolate-doom/INSTALL.strife
diff --git a/debian/chocolate-doom.menu b/debian/chocolate-doom.menu
index 3ab94ec..8627d3b 100644
--- a/debian/chocolate-doom.menu
+++ b/debian/chocolate-doom.menu
@@ -5,43 +5,3 @@
title="Chocolate Doom"\
command="/usr/games/chocolate-doom"\
icon="/usr/share/pixmaps/chocolate-doom.xpm"
-
-?package(chocolate-doom):\
- needs="X11"\
- section="Games/Action"\
- hints="Doom,Heretic,First person"\
- title="Chocolate Heretic"\
- command="/usr/games/chocolate-heretic"\
- icon="/usr/share/pixmaps/chocolate-doom.xpm"
-
-?package(chocolate-doom):\
- needs="X11"\
- section="Games/Action"\
- hints="Doom,Hexen,First person"\
- title="Chocolate Hexen"\
- command="/usr/games/chocolate-hexen"\
- icon="/usr/share/pixmaps/chocolate-doom.xpm"
-
-?package(chocolate-doom):\
- needs="X11"\
- section="Games/Action"\
- hints="Doom,Strife,First person"\
- title="Chocolate Strife"\
- command="/usr/games/chocolate-strife"\
- icon="/usr/share/pixmaps/chocolate-doom.xpm"
-
-?package(chocolate-doom):\
- needs="X11"\
- section="Games/Action"\
- hints="Doom,First person"\
- title="Chocolate Setup"\
- command="/usr/games/chocolate-setup"\
- icon="/usr/share/pixmaps/chocolate-setup.xpm"
-
-?package(chocolate-doom):\
- needs="text"\
- section="Games/Action"\
- hints="Doom,First person"\
- title="Chocolate Server"\
- command="/usr/games/chocolate-server"\
- icon="/usr/share/pixmaps/chocolate-doom.xpm"
diff --git a/debian/chocolate-doom.postinst b/debian/chocolate-doom.postinst
index 446aa33..0dc3ed5 100644
--- a/debian/chocolate-doom.postinst
+++ b/debian/chocolate-doom.postinst
@@ -2,35 +2,12 @@
set -e
-case "$1" in
- configure|abort-upgrade)
- update-alternatives --install /usr/games/doom doom \
- /usr/games/chocolate-doom 50 \
- --slave /usr/share/man/man6/doom.6.gz \
- doom.6.gz /usr/share/man/man6/chocolate-doom.6.gz
- update-alternatives --install /usr/games/heretic heretic \
- /usr/games/chocolate-heretic 50 \
- --slave /usr/share/man/man6/heretic.6.gz \
- heretic.6.gz /usr/share/man/man6/chocolate-heretic.6.gz
- update-alternatives --install /usr/games/hexen hexen \
- /usr/games/chocolate-hexen 50 \
- --slave /usr/share/man/man6/hexen.6.gz \
- hexen.6.gz /usr/share/man/man6/chocolate-hexen.6.gz
- update-alternatives --install /usr/games/strife strife \
- /usr/games/chocolate-strife 50 \
- --slave /usr/share/man/man6/strife.6.gz \
- strife.6.gz /usr/share/man/man6/chocolate-strife.6.gz
- ;;
-
- abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
+if [ "$1" = "abort-upgrade" ] || [ "$1" = "configure" ]
+then
+ update-alternatives \
+ --install /usr/games/doom doom /usr/games/chocolate-doom 50 \
+ --slave /usr/share/man/man6/doom.6.gz doom.6.gz /usr/share/man/man6/chocolate-doom.6.gz
+fi
#DEBHELPER#
diff --git a/debian/chocolate-doom.preinst b/debian/chocolate-doom.preinst
new file mode 100644
index 0000000..4fd3133
--- /dev/null
+++ b/debian/chocolate-doom.preinst
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]
+then
+ if dpkg --compare-versions "$2" lt-nl "2.1.0-2~"
+ then
+ update-alternatives --remove heretic /usr/games/chocolate-heretic
+ update-alternatives --remove hexen /usr/games/chocolate-hexen
+ update-alternatives --remove strife /usr/games/chocolate-strife
+ fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/chocolate-doom.prerm b/debian/chocolate-doom.prerm
index 85fcade..f1ecd67 100644
--- a/debian/chocolate-doom.prerm
+++ b/debian/chocolate-doom.prerm
@@ -2,20 +2,10 @@
set -e
-case "$1" in
- remove)
- update-alternatives --remove doom /usr/games/chocolate-doom
- update-alternatives --remove heretic /usr/games/chocolate-heretic
- update-alternatives --remove hexen /usr/games/chocolate-hexen
- update-alternatives --remove strife /usr/games/chocolate-strife
- ;;
- upgrade|deconfigure|failed-upgrade)
- ;;
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]
+then
+ update-alternatives --remove doom /usr/games/chocolate-doom
+fi
#DEBHELPER#
diff --git a/debian/chocolate-heretic.install b/debian/chocolate-heretic.install
new file mode 100644
index 0000000..7ef7e43
--- /dev/null
+++ b/debian/chocolate-heretic.install
@@ -0,0 +1,6 @@
+usr/games/chocolate-heretic
+usr/share/applications/chocolate-heretic.desktop
+usr/share/doc/chocolate-heretic
+usr/share/man/man5/chocolate-heretic.cfg.5
+usr/share/man/man5/heretic.cfg.5
+usr/share/man/man6/chocolate-heretic.6
diff --git a/debian/chocolate-heretic.links b/debian/chocolate-heretic.links
new file mode 100644
index 0000000..70b2e1d
--- /dev/null
+++ b/debian/chocolate-heretic.links
@@ -0,0 +1,2 @@
+usr/games/chocolate-setup usr/games/chocolate-heretic-setup
+usr/share/man/man6/chocolate-setup.6.gz usr/share/man/man6/chocolate-heretic-setup.6.gz
diff --git a/debian/chocolate-heretic.lintian-overrides b/debian/chocolate-heretic.lintian-overrides
new file mode 100644
index 0000000..9da7bad
--- /dev/null
+++ b/debian/chocolate-heretic.lintian-overrides
@@ -0,0 +1,2 @@
+# This contains legitimate information
+chocolate-heretic: package-contains-upstream-install-documentation usr/share/doc/chocolate-heretic/INSTALL.heretic
diff --git a/debian/chocolate-heretic.menu b/debian/chocolate-heretic.menu
new file mode 100644
index 0000000..efe12f3
--- /dev/null
+++ b/debian/chocolate-heretic.menu
@@ -0,0 +1,7 @@
+?package(chocolate-heretic):\
+ needs="X11"\
+ section="Games/Action"\
+ hints="Doom,Heretic,First person"\
+ title="Chocolate Heretic"\
+ command="/usr/games/chocolate-heretic"\
+ icon="/usr/share/pixmaps/chocolate-doom.xpm"
diff --git a/debian/chocolate-heretic.postinst b/debian/chocolate-heretic.postinst
new file mode 100644
index 0000000..8e00283
--- /dev/null
+++ b/debian/chocolate-heretic.postinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "abort-upgrade" ] || [ "$1" = "configure" ]
+then
+ update-alternatives \
+ --install /usr/games/heretic heretic /usr/games/chocolate-heretic 50 \
+ --slave /usr/share/man/man6/heretic.6.gz heretic.6.gz /usr/share/man/man6/chocolate-heretic.6.gz
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/chocolate-heretic.prerm b/debian/chocolate-heretic.prerm
new file mode 100644
index 0000000..79af684
--- /dev/null
+++ b/debian/chocolate-heretic.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]
+then
+ update-alternatives --remove heretic /usr/games/chocolate-heretic
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/chocolate-hexen.install b/debian/chocolate-hexen.install
new file mode 100644
index 0000000..e48d7dc
--- /dev/null
+++ b/debian/chocolate-hexen.install
@@ -0,0 +1,6 @@
+usr/games/chocolate-hexen
+usr/share/applications/chocolate-hexen.desktop
+usr/share/doc/chocolate-hexen
+usr/share/man/man5/chocolate-hexen.cfg.5
+usr/share/man/man5/hexen.cfg.5
+usr/share/man/man6/chocolate-hexen.6
diff --git a/debian/chocolate-hexen.links b/debian/chocolate-hexen.links
new file mode 100644
index 0000000..8b4fc1e
--- /dev/null
+++ b/debian/chocolate-hexen.links
@@ -0,0 +1,2 @@
+usr/games/chocolate-setup usr/games/chocolate-hexen-setup
+usr/share/man/man6/chocolate-setup.6.gz usr/share/man/man6/chocolate-hexen-setup.6.gz
diff --git a/debian/chocolate-hexen.lintian-overrides b/debian/chocolate-hexen.lintian-overrides
new file mode 100644
index 0000000..bc492b0
--- /dev/null
+++ b/debian/chocolate-hexen.lintian-overrides
@@ -0,0 +1,2 @@
+# This contains legitimate information
+chocolate-hexen: package-contains-upstream-install-documentation usr/share/doc/chocolate-hexen/INSTALL.hexen
diff --git a/debian/chocolate-hexen.menu b/debian/chocolate-hexen.menu
new file mode 100644
index 0000000..e515a58
--- /dev/null
+++ b/debian/chocolate-hexen.menu
@@ -0,0 +1,7 @@
+?package(chocolate-hexen):\
+ needs="X11"\
+ section="Games/Action"\
+ hints="Doom,Hexen,First person"\
+ title="Chocolate Hexen"\
+ command="/usr/games/chocolate-hexen"\
+ icon="/usr/share/pixmaps/chocolate-doom.xpm"
diff --git a/debian/chocolate-hexen.postinst b/debian/chocolate-hexen.postinst
new file mode 100644
index 0000000..bab57bc
--- /dev/null
+++ b/debian/chocolate-hexen.postinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "abort-upgrade" ] || [ "$1" = "configure" ]
+then
+ update-alternatives \
+ --install /usr/games/hexen hexen /usr/games/chocolate-hexen 50 \
+ --slave /usr/share/man/man6/hexen.6.gz hexen.6.gz /usr/share/man/man6/chocolate-hexen.6.gz
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/chocolate-hexen.prerm b/debian/chocolate-hexen.prerm
new file mode 100644
index 0000000..cea1e1b
--- /dev/null
+++ b/debian/chocolate-hexen.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]
+then
+ update-alternatives --remove hexen /usr/games/chocolate-hexen
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/chocolate-strife.install b/debian/chocolate-strife.install
new file mode 100644
index 0000000..9633f0c
--- /dev/null
+++ b/debian/chocolate-strife.install
@@ -0,0 +1,6 @@
+usr/games/chocolate-strife
+usr/share/applications/chocolate-strife.desktop
+usr/share/doc/chocolate-strife
+usr/share/man/man5/chocolate-strife.cfg.5
+usr/share/man/man5/strife.cfg.5
+usr/share/man/man6/chocolate-strife.6
diff --git a/debian/chocolate-strife.links b/debian/chocolate-strife.links
new file mode 100644
index 0000000..6d403b6
--- /dev/null
+++ b/debian/chocolate-strife.links
@@ -0,0 +1,2 @@
+usr/games/chocolate-setup usr/games/chocolate-strife-setup
+usr/share/man/man6/chocolate-setup.6.gz usr/share/man/man6/chocolate-strife-setup.6.gz
diff --git a/debian/chocolate-strife.lintian-overrides b/debian/chocolate-strife.lintian-overrides
new file mode 100644
index 0000000..417702d
--- /dev/null
+++ b/debian/chocolate-strife.lintian-overrides
@@ -0,0 +1,2 @@
+# This contains legitimate information
+chocolate-strife: package-contains-upstream-install-documentation usr/share/doc/chocolate-strife/INSTALL.strife
diff --git a/debian/chocolate-strife.menu b/debian/chocolate-strife.menu
new file mode 100644
index 0000000..8565d47
--- /dev/null
+++ b/debian/chocolate-strife.menu
@@ -0,0 +1,7 @@
+?package(chocolate-strife):\
+ needs="X11"\
+ section="Games/Action"\
+ hints="Doom,Strife,First person"\
+ title="Chocolate Strife"\
+ command="/usr/games/chocolate-strife"\
+ icon="/usr/share/pixmaps/chocolate-doom.xpm"
diff --git a/debian/chocolate-strife.postinst b/debian/chocolate-strife.postinst
new file mode 100644
index 0000000..c79e6b8
--- /dev/null
+++ b/debian/chocolate-strife.postinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "abort-upgrade" ] || [ "$1" = "configure" ]
+then
+ update-alternatives \
+ --install /usr/games/strife strife /usr/games/chocolate-strife 50 \
+ --slave /usr/share/man/man6/strife.6.gz strife.6.gz /usr/share/man/man6/chocolate-strife.6.gz
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/chocolate-strife.prerm b/debian/chocolate-strife.prerm
new file mode 100644
index 0000000..c3fa22b
--- /dev/null
+++ b/debian/chocolate-strife.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]
+then
+ update-alternatives --remove strife /usr/games/chocolate-strife
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/control b/debian/control
index e36b17f..14b8f6e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: chocolate-doom
-Section: contrib/games
+Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders:
@@ -19,35 +19,140 @@ Vcs-Git: git://anonscm.debian.org/pkg-games/chocolate-doom.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/chocolate-doom.git
Homepage: http://chocolate-doom.org/
-Package: chocolate-doom
+Package: chocolate-common
Architecture: any
Depends:
- doom-wad-shareware | doom-wad | heretic-wad | hexen-wad | strife-wad | game-data-packager,
${misc:Depends},
${shlibs:Depends}
Suggests:
zenity
+Breaks:
+ chocolate-doom (<< 2.1.0-2~)
+Replaces:
+ chocolate-doom (<< 2.1.0-2~)
+Description: Common files for Chocolate Doom/Heretic/Hexen/Strife
+ Chocolate Doom aims to accurately reproduce the original DOS version of
+ Doom and other games based on the Doom engine in a form that can be
+ run on modern computers. Unlike most modern Doom engines, Chocolate Doom
+ is not derived from the Boom source port and does not inherit its
+ features (or bugs).
+ .
+ Originally, Chocolate Doom was only a Doom source port. The project
+ now includes ports of Heretic and Hexen, and Strife.
+ .
+ This package contains the dedicated server for multiplayer games and
+ the common configuration tool for all four ports.
+
+Package: chocolate-doom
+Architecture: any
+Depends:
+ chocolate-common (= ${binary:Version}),
+ freedm (>= 0.9) | doom-wad | game-data-packager,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends:
+ chocolate-heretic,
+ chocolate-hexen,
+ chocolate-strife
Provides:
- doom-engine,
- heretic-engine,
- hexen-engine,
- strife-engine
+ doom-engine
Breaks:
freedm (<< 0.6.4-4),
freedoom (<< 0.6.4-4)
-Description: Doom engine closely-compatible with vanilla doom
+Description: Doom engine closely-compatible with Vanilla Doom
Chocolate Doom aims to accurately reproduce the original DOS version of
Doom and other games based on the Doom engine in a form that can be
run on modern computers. Unlike most modern Doom engines, Chocolate Doom
is not derived from the Boom source port and does not inherit its
features (or bugs).
.
- Originally, Chocolate Doom was only a Doom source port. The project
- now includes ports of Heretic and Hexen, and Strife.
+ Chocolate Doom is a port of Id Software's 1993 game "Doom" that is designed
+ to behave as similar to the original DOS version of Doom as is possible.
.
Chocolate Doom requires game data to play. Commercial game data can be
packaged using "game-data-packager". Chocolate Doom supports all flavors
of Doom, including The Ultimate Doom, Doom 2 and Final Doom as well as
- Chex(R) Quest and HACX. Heretic, Hexen and Strife are supported by
- Chocolate Heretic, Chocolate Hexen and Chocolate Strife, respectively,
- which are also included in this package.
+ Chex(R) Quest, HACX and FreeDM.
+
+Package: chocolate-heretic
+Section: contrib/games
+Architecture: any
+Depends:
+ chocolate-common (= ${binary:Version}),
+ heretic-wad | game-data-packager,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Provides:
+ heretic-engine
+Breaks:
+ chocolate-doom (<< 2.1.0-2~)
+Replaces:
+ chocolate-doom (<< 2.1.0-2~)
+Description: Heretic engine closely-compatible with Vanilla Heretic
+ Chocolate Doom aims to accurately reproduce the original DOS version of
+ Doom and other games based on the Doom engine in a form that can be
+ run on modern computers. Unlike most modern Doom engines, Chocolate Doom
+ is not derived from the Boom source port and does not inherit its
+ features (or bugs).
+ .
+ Chocolate Heretic is a port of Raven Software's 1994 game "Heretic" that
+ aims to behave as similar to the original DOS version of Heretic as possible.
+ .
+ Chocolate Heretic requires game data to play. Commercial game data can be
+ packaged using "game-data-packager".
+
+Package: chocolate-hexen
+Section: contrib/games
+Architecture: any
+Depends:
+ chocolate-common (= ${binary:Version}),
+ hexen-wad | game-data-packager,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Provides:
+ hexen-engine
+Breaks:
+ chocolate-doom (<< 2.1.0-2~)
+Replaces:
+ chocolate-doom (<< 2.1.0-2~)
+Description: Hexen engine closely-compatible with Vanilla Hexen
+ Chocolate Doom aims to accurately reproduce the original DOS version of
+ Doom and other games based on the Doom engine in a form that can be
+ run on modern computers. Unlike most modern Doom engines, Chocolate Doom
+ is not derived from the Boom source port and does not inherit its
+ features (or bugs).
+ .
+ Chocolate Hexen is a port of Raven Software's 1995 game "Hexen" that aims
+ to behave as similar to the original DOS version of Hexen as possible.
+ .
+ Chocolate Hexen requires game data to play. Commercial game data can be
+ packaged using "game-data-packager".
+
+Package: chocolate-strife
+Section: contrib/games
+Architecture: any
+Depends:
+ chocolate-common (= ${binary:Version}),
+ strife-wad | game-data-packager,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Provides:
+ strife-engine
+Breaks:
+ chocolate-doom (<< 2.1.0-2~)
+Replaces:
+ chocolate-doom (<< 2.1.0-2~)
+Description: Strife engine closely-compatible with Vanilla Strife
+ Chocolate Doom aims to accurately reproduce the original DOS version of
+ Doom and other games based on the Doom engine in a form that can be
+ run on modern computers. Unlike most modern Doom engines, Chocolate Doom
+ is not derived from the Boom source port and does not inherit its
+ features (or bugs).
+ .
+ Chocolate Strife is an accurate and complete recreation of Rogue
+ Entertainment's "Strife: Quest for the Sigil". It was created through more
+ than two years of reverse engineering effort with the blessings of the
+ original programmers of the game.
+ .
+ Chocolate Strife requires game data to play. Commercial game data can be
+ packaged using "game-data-packager".
diff --git a/debian/patches/0001-man-Use-to-denote-dashes.-Fixes-512.patch b/debian/patches/0001-man-Use-to-denote-dashes.-Fixes-512.patch
new file mode 100644
index 0000000..32308e5
--- /dev/null
+++ b/debian/patches/0001-man-Use-to-denote-dashes.-Fixes-512.patch
@@ -0,0 +1,25 @@
+From ad027ef6dbfeebabe0e6701eec968e9d474e497f Mon Sep 17 00:00:00 2001
+From: Mike Swanson <mikeonthecomputer at gmail.com>
+Date: Wed, 25 Mar 2015 16:06:11 -0700
+Subject: [PATCH] man: Use \- to denote dashes. Fixes #512
+
+---
+ man/docgen | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/man/docgen b/man/docgen
+index d9535be..3b11ad8 100755
+--- a/man/docgen
++++ b/man/docgen
+@@ -425,6 +425,8 @@ def manpage_output(targets, template_file):
+ for t in targets:
+ content += t.manpage_output() + "\n"
+
++ content = content.replace("-", "\\-")
++
+ print_template(template_file, content)
+
+ def wiki_output(targets, template):
+--
+2.1.4
+
diff --git a/debian/patches/0001-man-fix-one-last-hyphen-used-as-minus-sign.patch b/debian/patches/0001-man-fix-one-last-hyphen-used-as-minus-sign.patch
new file mode 100644
index 0000000..efe557d
--- /dev/null
+++ b/debian/patches/0001-man-fix-one-last-hyphen-used-as-minus-sign.patch
@@ -0,0 +1,25 @@
+From d5fe304162c433dabdbf12abb6e174d6466bbd2b Mon Sep 17 00:00:00 2001
+From: Fabian Greffrath <fabian at greffrath.com>
+Date: Fri, 1 May 2015 13:50:45 +0200
+Subject: [PATCH] man: fix one last hyphen used as minus sign
+
+---
+ man/environ.man | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/environ.man b/man/environ.man
+index 502e965..171b25d 100644
+--- a/man/environ.man
++++ b/man/environ.man
+@@ -1,7 +1,7 @@
+ .TP
+ \fBDOOMWADDIR\fR, \fBDOOMWADPATH\fR
+ These environment variables provide paths to search for Doom .WAD files when
+-looking for a game IWAD file or a PWAD file specified with the `-file' option.
++looking for a game IWAD file or a PWAD file specified with the `\-file' option.
+ \fBDOOMWADDIR\fR specifies a single path in which to look for WAD files,
+ while \fBDOOMWWADPATH\fR specifies a colon-separated list of paths to search.
+ .TP
+--
+2.1.4
+
diff --git a/debian/patches/0001-man-fix-the-very-last-hyphen-used-as-minus-sign.patch b/debian/patches/0001-man-fix-the-very-last-hyphen-used-as-minus-sign.patch
new file mode 100644
index 0000000..13237fe
--- /dev/null
+++ b/debian/patches/0001-man-fix-the-very-last-hyphen-used-as-minus-sign.patch
@@ -0,0 +1,25 @@
+From 4ee95eb27f4a71f78450d492a62e5abcd881c5c4 Mon Sep 17 00:00:00 2001
+From: Fabian Greffrath <fabian at greffrath.com>
+Date: Fri, 1 May 2015 13:54:36 +0200
+Subject: [PATCH] man: fix the very last hyphen used as minus sign
+
+---
+ man/chocolate-server.6 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/chocolate-server.6 b/man/chocolate-server.6
+index f37173f..74dc6f4 100644
+--- a/man/chocolate-server.6
++++ b/man/chocolate-server.6
+@@ -13,7 +13,7 @@ as similar to the original doom game as is possible.
+ is a dedicated server for Chocolate Doom. It is equivalent to
+ running
+ .B chocolate\-doom
+-with the "-dedicated" option.
++with the "\-dedicated" option.
+ .PP
+ Game options are not specified to the server, which merely acts to
+ retransmit data between players in the game; parameters for the
+--
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..466351e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-man-Use-to-denote-dashes.-Fixes-512.patch
+0001-man-fix-one-last-hyphen-used-as-minus-sign.patch
+0001-man-fix-the-very-last-hyphen-used-as-minus-sign.patch
diff --git a/debian/rules b/debian/rules
index fe7231f..bd61d24 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,-z,defs
+
debian/chocolate-doom.xpm: data/doom.png
convert -resize 32x32 $^ $@
@@ -16,10 +18,10 @@ override_dh_auto_configure:
override_dh_auto_install:
dh_auto_install --max-parallel=1 -- \
SETUP_BINARIES=chocolate-setup \
- DOC_FILES="README README.Music PHILOSOPHY TODO" \
- hereticdocsdir=/usr/share/doc/chocolate-doom \
- hexendocsdir=/usr/share/doc/chocolate-doom \
- strifedocsdir=/usr/share/doc/chocolate-doom
+ DOC_FILES="README README.Music PHILOSOPHY TODO"
override_dh_installchangelogs:
dh_installchangelogs NEWS
+
+override_dh_install:
+ dh_install --list-missing
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/chocolate-doom.git
More information about the Pkg-games-commits
mailing list