Commit 812bf42a authored by Jonathan Dowland's avatar Jonathan Dowland

Refresh packaging for 5.2

 • more detail on DFSG source preparation process
 • don't install crispy-server
 • document lintian problems
 • update VCS-* headers
 • better approach for overriding appstream directory
parent 240cd068
crispy-doom (5.0+dfsg1-1) unstable; urgency=medium
crispy-doom (5.2+dfsg1-1) unstable; urgency=medium
* Initial packaging based on chocolate-doom.
Closes: #880972.
* dfsg-adjusted upstream source, see debian/copyright for details.
* We do not build or install the crispy-server program: it is identical
to, and designed to be compatible with, the pre-existing
chocolate-server.
* Lintian has two false positives (privacy-breach-generic), see
#902919 for details.
-- Jonathan Dowland <jmtd@debian.org> Tue, 07 Nov 2017 10:32:59 +0000
-- Jonathan Dowland <jmtd@debian.org> Tue, 03 Jul 2018 21:05:28 +0100
......@@ -13,8 +13,8 @@ Build-Depends:
libsdl2-dev,
python (>= 2.5)
Standards-Version: 4.1.2
Vcs-Git: https://anonscm.debian.org/git/pkg-games/crispy-doom.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/crispy-doom.git/
Vcs-Git: https://salsa.debian.org/debian/crispy-doom.git
Vcs-Browser: https://salsa.debian.org/debian/crispy-doom
Homepage: https://www.chocolate-doom.org/wiki/index.php/Crispy_Doom
Package: crispy-doom
......
......@@ -3,13 +3,18 @@ Upstream-Name: Crispy Doom
Upstream-Contact: Fabian Greffrath <fabian@greffrath.com>
Source: http://www.chocolate-doom.org/wiki/index.php/Crispy_Doom
The pristine upstream source includes some code derived from Id Software's
DoomBSP which unfortunately lacks a clear license.
.
The repacked DFSG sources are the result of manually reverting commit
0d6c6b480d0f59de0d69c7e9f04a00f3bed9a481 from the upstream git repository.
(This commit merged the branch that brings in the DoomBSP code; prior to
that merge, the relevant feature was implemented with alternate,
DFSG-compatible sources).
DoomBSP which unfortunately lacks a clear license. The following changes
were made to it in order to produce the +dfsg1 source:
• The repacked DFSG sources are the result of manually reverting commit
0d6c6b480d0f59de0d69c7e9f04a00f3bed9a481 from the upstream git repository
and performing some small fix-ups. (This commit merged the branch that
brings in the DoomBSP code; prior to that merge, the relevant feature was
implemented with alternate, DFSG-compatible sources).
• README.Crispy.htm erroneously contained a metadata tag that suggested it
was licensed under the CC-BY-SA-NC license, which is not DFSG-free. This
was due to a misconfiguration of upstream's MediaWiki which has since been
corrected. The metadata tag was corrected to avoid triggering a lintian
check.
Files: *
Copyright: 1993-1996, Id Software, Inc
......
commit 502f08f8b76c27f76d4ed3cf66644a65d324a895
Author: Jonathan Dowland <jmtd@debian.org>
Date: Tue Dec 26 23:41:12 2017 +0000
Update AppStream metadata directory
diff --git a/src/Makefile.am b/src/Makefile.am
index e4e4dbe..c8bab13 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -213,7 +213,7 @@ EXTRA_DIST = \
doom-screensaver.desktop.in \
manifest.xml
-appdatadir = $(prefix)/share/appdata
+appdatadir = $(prefix)/share/metainfo
appdata_DATA = \
@PROGRAM_PREFIX@doom.appdata.xml
# @PROGRAM_PREFIX@heretic.appdata.xml \
commit fc55b954f8860b77e9b08ce151a80b8973b6aca3
Author: Jonathan Dowland <jmtd@debian.org>
Date: Thu Dec 14 09:03:47 2017 +0000
Manual page adjustments for Crispy Doom
Some rough sed-substitutions in the man pages inherited from Chocolate
Doom and small other changes.
More thorough reworking of the docs is taking place upstream and
upstream-upstream, this is mostly stop-gap measure to avoid confusion
on Debian systems.
diff --git a/man/chocolate-server.6 b/man/chocolate-server.6
index 74dc6f4..3a25918 100644
--- a/man/chocolate-server.6
+++ b/man/chocolate-server.6
@@ -1,18 +1,18 @@
-.TH chocolate\-server 6
+.TH crispy\-server 6
.SH NAME
-chocolate\-server \- dedicated server for chocolate\-doom
+crispy\-server \- dedicated server for crispy\-doom
.SH SYNOPSIS
-.B chocolate\-server
+.B crispy\-server
[OPTIONS]
.SH DESCRIPTION
.PP
-Chocolate Doom is a modern doom engine designed to behave
+Crispy Doom is a modern doom engine designed to behave
as similar to the original doom game as is possible.
.PP
-.B chocolate\-server
-is a dedicated server for Chocolate Doom. It is equivalent to
+.B crispy\-server
+is a dedicated server for Crispy Doom. It is equivalent to
running
-.B chocolate\-doom
+.B crispy\-doom
with the "\-dedicated" option.
.PP
Game options are not specified to the server, which merely acts to
@@ -36,15 +36,17 @@ Don't register with the global master server.
\fB-servername <name>\fR
Specify a name for the server.
.SH SEE ALSO
-\fBchocolate-doom\fR(6),
-\fBchocolate-setup\fR(6)
+\fBcrispy\-doom\fR(6),
+\fBcrispy\-doom\-setup\fR(6)
.SH AUTHOR
+Crispy Doom is written and maintained by Fabian Greffrath.
Chocolate Doom is written and maintained by Simon Howard.
.PP
This manual was written by Jon Dowland.
.SH COPYRIGHT
Copyright \(co id Software Inc.
-Copyright \(co 2005-8 Simon Howard.
+Copyright \(co 2005-2017 Simon Howard.
+Copyright \(co 2014-2017 Fabian Greffrath.
.br
This is free software. You may redistribute copies of it under the terms of
the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
diff --git a/man/chocolate-setup.6 b/man/chocolate-setup.6
index 21c9d5d..e0c2c49 100644
--- a/man/chocolate-setup.6
+++ b/man/chocolate-setup.6
@@ -1,20 +1,20 @@
-.TH chocolate\-setup 6
+.TH crispy\-doom\-setup 6
.SH NAME
-chocolate\-setup \- configuration tool for chocolate\-doom
+crispy\-doom\-setup \- configuration tool for crispy\-doom
.SH SYNOPSIS
-.B chocolate\-setup
+.B crispy\-doom\-setup
[OPTIONS]
.SH DESCRIPTION
.PP
-Chocolate Doom is a modern Doom engine designed to behave
+Crispy Doom is a modern Doom engine designed to behave
as similar to the original Doom game as is possible.
.PP
-.B chocolate\-setup
-is a tool for configuring Chocolate Doom. It provides a menu\-based
+.B crispy\-doom\-setup
+is a tool for configuring Crispy Doom. It provides a menu\-based
interface for the display, joystick, keyboard, mouse, sound and
compatibility settings.
.PP
-.B chocolate\-setup
+.B crispy\-doom\-setup
can also be used to start and join network games.
.PP
.SH OPTIONS
@@ -23,18 +23,20 @@ can also be used to start and join network games.
Load configuration from the specified file, instead of default.cfg.
.TP
\fB-extraconfig <file>\fR
-Load extra configuration from the specified file, instead of chocolate-doom.cfg.
+Load extra configuration from the specified file, instead of crispy\-doom.cfg.
.SH SEE ALSO
-\fBchocolate-doom\fR(6),
-\fBdefault.cfg\fR(5),
-\fBchocolate-doom.cfg\fR(5)
+\fBcrispy\-doom\fR(6),
+\fBcrispy_default.cfg\fR(5),
+\fBcrispy\-doom.cfg\fR(5)
.SH AUTHOR
+Crispy Doom is written and maintained by Fabian Greffrath.
Chocolate Doom is written and maintained by Simon Howard.
.PP
-This manual was written by Jon Dowland.
+This manual was written by Jonathan Dowland.
.SH COPYRIGHT
Copyright \(co id Software Inc.
-Copyright \(co 2005-8 Simon Howard.
+Copyright \(co 2005-2017 Simon Howard.
+Copyright \(co 2014-2017 Fabian Greffrath.
.br
This is free software. You may redistribute copies of it under the terms of
the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
diff --git a/man/doom.template b/man/doom.template
index 845147a..ea03667 100644
--- a/man/doom.template
+++ b/man/doom.template
@@ -1,41 +1,40 @@
-.TH chocolate\-doom 6
+.TH crispy\-doom 6
.SH NAME
-chocolate\-doom \- historically compatible Doom engine
+crispy\-doom \- historically compatible Doom engine
.SH SYNOPSIS
-.B chocolate\-doom
+.B crispy\-doom
[\fIOPTIONS\fR]
.SH DESCRIPTION
.PP
-Chocolate Doom is a port of Id Software's 1993 game "Doom" that is designed
+Crispy 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.
.br
@content
.SH IWAD SEARCH PATHS
@include iwad_paths.man
.SH ENVIRONMENT
-This section describes environment variables that control Chocolate Doom's
+This section describes environment variables that control Crispy Doom's
behavior.
@include environ.man
.SH FILES
.TP
-\fB$HOME/.local/share/chocolate-doom/default.cfg\fR
-The main configuration file for Chocolate Doom. See \fBdefault.cfg\fR(5).
+\fB$HOME/.local/share/crispy\-doom/default.cfg\fR
+The main configuration file for Crispy Doom. See \fBcrispy_default.cfg\fR(5).
.TP
-\fB$HOME/.local/share/chocolate-doom/chocolate-doom.cfg\fR
-Extra configuration values that are specific to Chocolate Doom and not
-present in Vanilla Doom. See \fBchocolate-doom.cfg\fR(5).
+\fB$HOME/.local/share/crispy\-doom/crispy\-doom.cfg\fR
+Extra configuration values that are specific to Crispy Doom and not
+present in Vanilla Doom. See \fBcrispy\-doom.cfg\fR(5).
.SH SEE ALSO
-\fBchocolate-server\fR(6),
-\fBchocolate-setup\fR(6),
-\fBchocolate-heretic\fR(6),
-\fBchocolate-hexen\fR(6),
-\fBchocolate-strife\fR(6)
+\fBcrispy\-server\fR(6),
+\fBcrispy\-doom\-setup\fR(6)
.SH AUTHOR
+Crispy Doom is written and maintained by Fabian Greffrath.
Chocolate Doom is written and maintained by Simon Howard. It is based on
the LinuxDoom source code, released by Id Software.
.SH COPYRIGHT
Copyright \(co id Software Inc.
-Copyright \(co 2005-2016 Simon Howard.
+Copyright \(co 2005-2017 Simon Howard.
+Copyright \(co 2014-2017 Fabian Greffrath.
.br
This is free software. You may redistribute copies of it under the terms of
the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
diff --git a/src/Makefile.am b/src/Makefile.am
index 868d0028..4f1feba9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,13 +3,14 @@ SUBDIRS = doom setup # heretic hexen strife
execgamesdir = ${bindir}
-execgames_PROGRAMS = @PROGRAM_PREFIX@doom \
- @PROGRAM_PREFIX@server
+execgames_PROGRAMS = @PROGRAM_PREFIX@doom
+
EXTRA_PROGRAMS = @PROGRAM_PREFIX@heretic \
@PROGRAM_PREFIX@hexen \
@PROGRAM_PREFIX@strife
-noinst_PROGRAMS = @PROGRAM_PREFIX@setup
+noinst_PROGRAMS = @PROGRAM_PREFIX@setup \
+ @PROGRAM_PREFIX@server
SETUP_BINARIES = @PROGRAM_PREFIX@doom-setup$(EXEEXT)
# @PROGRAM_PREFIX@heretic-setup$(EXEEXT) \
commit 64a3b01d5a87f5af9c2ad0b27f67fe796679d593
Author: Jonathan Dowland <jmtd@debian.org>
Date: Tue Dec 26 23:41:12 2017 +0000
Remove RSD Edit URL from static HTML document
This is a remnant from the upstream document source (a mediawiki)
but should be removed for the static Debian copy for privacy
reasons.
diff --git a/README.Crispy.htm b/README.Crispy.htm
index 3fbae63..3992f43 100644
--- a/README.Crispy.htm
+++ b/README.Crispy.htm
@@ -18,7 +18,6 @@ mw.user.tokens.set({"editToken":"bec118cc9bc906d9baca8d7f8ff3248f59fde51a+\\","p
<link rel="edit" title="Edit" href="/wiki/index.php?title=Crispy_Doom&amp;action=edit"/>
<link rel="shortcut icon" href="/favicon.png"/>
<link rel="search" type="application/opensearchdescription+xml" href="/wiki/opensearch_desc.php" title="Chocolate Doom (en)"/>
-<link rel="EditURI" type="application/rsd+xml" href="//www.chocolate-doom.org/wiki/api.php?action=rsd"/>
<link rel="copyright" href="http://www.gnu.org/copyleft/fdl.html"/>
<link rel="alternate" type="application/atom+xml" title="Chocolate Doom Atom feed" href="/wiki/index.php?title=Special:RecentChanges&amp;feed=atom"/>
</head>
manpage_fixes.patch
rm_readme_rsd_link.patch
appstream_dir.patch
no_server.patch
......@@ -9,19 +9,14 @@ override_dh_auto_install:
dh_auto_install --max-parallel=1 -- \
SETUP_BINARIES=crispy-doom-setup \
DOC_FILES="README.Crispy.htm" \
execgamesdir=/usr/games
execgamesdir=/usr/games \
appdatadir=/usr/share/metainfo
# avoid clashing with chocolate-doom (contents is currently identical)
mv debian/crispy-doom/usr/share/man/man5/default.cfg.5 \
debian/crispy-doom/usr/share/man/man5/crispy_default.cfg.5
# should be patched upstream eventually
mv debian/crispy-doom/usr/share/man/man6/chocolate-server.6 \
debian/crispy-doom/usr/share/man/man6/crispy-server.6
# duplicate, not needed (same as crispy-setup.6)
# https://github.com/fabiangreffrath/crispy-doom/issues/235
rm -f debian/crispy-doom/usr/share/man/man6/chocolate-setup.6
sed -i 's/Exec=crispy-setup/Exec=crispy-doom-setup/' \
debian/crispy-doom/usr/share/applications/crispy-setup.desktop
# superfluous docs
rm -f debian/crispy-doom/usr/share/doc/crispy-doom/CMDLINE.doom \
rm debian/crispy-doom/usr/share/doc/crispy-doom/CMDLINE.doom \
debian/crispy-doom/usr/share/doc/crispy-doom/INSTALL.doom \
debian/crispy-doom/usr/share/doc/crispy-doom/NOT-BUGS.md
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment