[deng] 01/01: release 1.14.5-3
Michael Gilbert
mgilbert at moszumanska.debian.org
Sat Jun 6 06:40:29 UTC 2015
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository deng.
commit 5313155dc0f2c005fba4a35db5b1b1e4b529268c
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sat Jun 6 02:39:36 2015 -0400
release 1.14.5-3
---
debian/NEWS | 7 +--
debian/changelog | 9 +++
debian/control | 52 +++++++++++++++++-
debian/copyright | 3 -
debian/doomsday-common.install | 1 +
...overrides => doomsday-common.lintian-overrides} | 2 -
debian/doomsday-data.install | 1 +
debian/doomsday-server.install | 1 +
debian/doomsday-server.manpages | 1 +
debian/doomsday.install | 2 +
debian/doomsday.lintian-overrides | 3 -
debian/doomsday.manpages | 1 +
debian/patches/fonts.path | 11 ----
debian/patches/manpages.patch | 64 ++++++++++++++++++++++
debian/patches/series | 3 +
debian/patches/spelling.patch | 59 ++++++++++++++++++++
16 files changed, 196 insertions(+), 24 deletions(-)
diff --git a/debian/NEWS b/debian/NEWS
index 1d80122..f5b643a 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,8 +1,7 @@
doomsday (1.14.5-2) unstable; urgency=medium
- persist.pack files from older doomsday versions can cause this version
- to crash at startup.
-
- This can be fixed by moving ~/.doomsday/runtime/persist.pack somewhere else.
+ persist.pack files from older doomsday versions can cause this version
+ to crash at startup. This can be fixed by moving
+ ~/.doomsday/runtime/persist.pack somewhere else.
-- Michael Gilbert <mgilbert at debian.org> Mon, 25 May 2015 23:15:12 +0000
diff --git a/debian/changelog b/debian/changelog
index 897c063..b046ea8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+doomsday (1.14.5-3) unstable; urgency=medium
+
+ * Fix lintian warnings.
+ * Fix some spelling errors.
+ * Escape hyphens in manpages.
+ * Split into separate binary packages.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sat, 06 Jun 2015 04:32:31 +0000
+
doomsday (1.14.5-2) unstable; urgency=medium
* Update debian/copyrgiht.
diff --git a/debian/control b/debian/control
index 3baf199..9679d2c 100644
--- a/debian/control
+++ b/debian/control
@@ -27,9 +27,10 @@ Architecture: any
Depends:
${misc:Depends},
${shlibs:Depends},
+ doomsday-data (>= ${source:Version}), doomsday-data (<< ${source:Version}.1~),
+ doomsday-common (>= ${source:Version}), doomsday-common (<< ${source:Version}.1~),
Recommends:
fluid-soundfont-gm,
- freedoom | game-data-packager | boom-wad | doom-wad | heretic-wad | hexen-wad,
Provides:
boom-engine,
doom-engine,
@@ -43,3 +44,52 @@ Description: enhanced version of the legendary DOOM game
.
Doomsday Engine (or deng for short) requires an IWAD to play. You can install
your commercial IWADs using game-data-packager.
+
+Package: doomsday-server
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ doomsday-data (>= ${source:Version}), doomsday-data (<< ${source:Version}.1~),
+ doomsday-common (>= ${source:Version}), doomsday-common (<< ${source:Version}.1~),
+Replaces:
+ doomsday (<= 1.14.5-2),
+Description: enhanced version of the legendary DOOM game - server
+ The purpose of the Doomsday Engine project is to create versions of DOOM,
+ Heretic and Hexen that feel the same as the original games but are implemented
+ using modern techniques such as 3D graphics and client/server networking. A
+ lot of emphasis is placed on good-looking graphics.
+ .
+ This package contains the dedicated server.
+
+Package: doomsday-common
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Replaces:
+ doomsday (<= 1.14.5-2),
+Description: enhanced version of the legendary DOOM game - common files
+ The purpose of the Doomsday Engine project is to create versions of DOOM,
+ Heretic and Hexen that feel the same as the original games but are implemented
+ using modern techniques such as 3D graphics and client/server networking. A
+ lot of emphasis is placed on good-looking graphics.
+ .
+ This package includes files common to both server and client packages.
+
+Package: doomsday-data
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ freedoom | game-data-packager | boom-wad | doom-wad | heretic-wad | hexen-wad,
+Replaces:
+ doomsday (<= 1.14.5-2),
+Description: enhanced version of the legendary DOOM game - data files
+ The purpose of the Doomsday Engine project is to create versions of DOOM,
+ Heretic and Hexen that feel the same as the original games but are implemented
+ using modern techniques such as 3D graphics and client/server networking. A
+ lot of emphasis is placed on good-looking graphics.
+ .
+ This package includes architecture-independent data files.
diff --git a/debian/copyright b/debian/copyright
index f735104..66eed49 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -83,9 +83,6 @@ License: Public-Domain
License: GPL-2+
See /usr/share/common-licenses/GPL-2.
-License: LGPL-2+
- See /usr/share/common-licenses/LGPL-2.
-
License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/debian/doomsday-common.install b/debian/doomsday-common.install
new file mode 100644
index 0000000..8f0c750
--- /dev/null
+++ b/debian/doomsday-common.install
@@ -0,0 +1 @@
+usr/lib/games/doomsday
diff --git a/debian/doomsday.lintian-overrides b/debian/doomsday-common.lintian-overrides
similarity index 59%
copy from debian/doomsday.lintian-overrides
copy to debian/doomsday-common.lintian-overrides
index 848a3a2..1563ba5 100644
--- a/debian/doomsday.lintian-overrides
+++ b/debian/doomsday-common.lintian-overrides
@@ -1,5 +1,3 @@
# debhelper bug causes these
postrm-has-useless-call-to-ldconfig
postinst-has-useless-call-to-ldconfig
-# macros that are flagged work correctly
-manpage-has-errors-from-man
diff --git a/debian/doomsday-data.install b/debian/doomsday-data.install
new file mode 100644
index 0000000..ce2b311
--- /dev/null
+++ b/debian/doomsday-data.install
@@ -0,0 +1 @@
+usr/share/games/doomsday
diff --git a/debian/doomsday-server.install b/debian/doomsday-server.install
new file mode 100644
index 0000000..f7d33eb
--- /dev/null
+++ b/debian/doomsday-server.install
@@ -0,0 +1 @@
+usr/games/doomsday-server
diff --git a/debian/doomsday-server.manpages b/debian/doomsday-server.manpages
new file mode 100644
index 0000000..9d6393d
--- /dev/null
+++ b/debian/doomsday-server.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man6/doomsday-server.6
diff --git a/debian/doomsday.install b/debian/doomsday.install
index b78c678..df418ff 100644
--- a/debian/doomsday.install
+++ b/debian/doomsday.install
@@ -2,3 +2,5 @@ debian/doomsday.desktop usr/share/applications
debian/doomsday.xpm usr/share/pixmaps
debian/doomsday-compat usr/games
debian/paths etc/doomsday
+
+usr/games/doomsday
diff --git a/debian/doomsday.lintian-overrides b/debian/doomsday.lintian-overrides
index 848a3a2..a63395c 100644
--- a/debian/doomsday.lintian-overrides
+++ b/debian/doomsday.lintian-overrides
@@ -1,5 +1,2 @@
-# debhelper bug causes these
-postrm-has-useless-call-to-ldconfig
-postinst-has-useless-call-to-ldconfig
# macros that are flagged work correctly
manpage-has-errors-from-man
diff --git a/debian/doomsday.manpages b/debian/doomsday.manpages
new file mode 100644
index 0000000..eda3bc4
--- /dev/null
+++ b/debian/doomsday.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man6/doomsday.6
diff --git a/debian/patches/fonts.path b/debian/patches/fonts.path
deleted file mode 100644
index bee61bd..0000000
--- a/debian/patches/fonts.path
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/doomsday/client/client.pro
-+++ b/doomsday/client/client.pro
-@@ -905,7 +905,7 @@ macx {
- target.path = $$DENG_BIN_DIR
- data.path = $$DENG_DATA_DIR
- startupgfx.path = $$DENG_DATA_DIR/graphics
-- startupfonts.path = $$DENG_DATA_DIR/fonts
-+ startupfonts.path = $$DENG_DATA_DIR
- mod.path = $$DENG_BASE_DIR/modules
-
- win32 {
diff --git a/debian/patches/manpages.patch b/debian/patches/manpages.patch
new file mode 100644
index 0000000..1a166a9
--- /dev/null
+++ b/debian/patches/manpages.patch
@@ -0,0 +1,64 @@
+description: escape hyphens in manpages
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/doomsday/doc/output/doomsday-server.6
++++ b/doomsday/doc/output/doomsday-server.6
+@@ -32,14 +32,14 @@ Specifies a directory where to look for
+ Sets the game to load after startup. See doomsday(6) for a list of available games. For example:
+ .Pp
+ .Bd -ragged -offset indent
+--game doom1-ultimate
++\-game doom1-ultimate
+ .Ed
+ .Pp
+ If
+ .Sy -game
+ is not specified and the server is unable to choose a game automatically, the server will quit.
+ .It Sy -v
+-Print verbose log messages (also -verbose). Specify more than once for extra verbosity.
++Print verbose log messages (also \-verbose). Specify more than once for extra verbosity.
+ .It Sy -file
+ Specify one or more resource files (WAD, LMP, PK3) to load at startup. More files can be loaded at runtime with the
+ .Sy load
+--- a/doomsday/doc/output/doomsday.6
++++ b/doomsday/doc/output/doomsday.6
+@@ -28,18 +28,18 @@ Specifies a directory where to look for
+ Sets the game to load after startup. See GAME MODES for a list of available games. For example:
+ .Pp
+ .Bd -ragged -offset indent
+--game doom1-ultimate
++\-game doom1-ultimate
+ .Ed
+ .Pp
+ If
+ .Sy -game
+ is not specified, Doomsday will start in "ringzero" mode: a plain console with no game loaded.
+ .It Sy -wnd
+-Starts in windowed mode (also -window). The default is to start in fullscreen mode.
++Starts in windowed mode (also \-window). The default is to start in fullscreen mode.
+ .It Sy -wh
+ Sets the size of the Doomsday window. In fullscreen mode specifies which display resolution to use.
+ .It Sy -v
+-Print verbose log messages (also -verbose). Specify more than once for extra verbosity.
++Print verbose log messages (also \-verbose). Specify more than once for extra verbosity.
+ .It Sy -file
+ Specify one or more resource files (WAD, LMP, PK3) to load at startup. More files can be loaded at runtime with the
+ .Sy load
+@@ -557,7 +557,7 @@ A virtual directory mapping is defined u
+ option. It takes the source and destination directories as parameters. For example:
+ .Pp
+ .Bd -ragged -offset indent
+--vdmap /home/username/myauto /usr/share/doomsday/data/jdoom/auto
++\-vdmap /home/username/myauto /usr/share/doomsday/data/jdoom/auto
+ .Ed
+ .Pp
+ You can define an unlimited number of virtual directory mappings using multiple
+@@ -745,7 +745,7 @@ The recommended format for high-resoluti
+ .Pp
+ High-resolution textures can be of any size. The engine will render them scaled so that they fit the size of the original texture. This means the aspect ratio of the new texture doesn't have to be the same as of the original texture. Note that the engine will have to resize all textures so that their dimensions are powers of two (e.g.\& 32, 64, 128, 256). This means TGA/PNG textures whose width and height are already powers of two can be loaded faster.
+ .Pp
+-Color keying allows having transparent pixels in an image format that has no alpha channel. Color keying is applied if the file name of the image ends in "-ck", for example
++Color keying allows having transparent pixels in an image format that has no alpha channel. Color keying is applied if the file name of the image ends in "\-ck", for example
+ .Em brnbigc-ck.png Ns
+ \&. Both cyan (0,255,255) and purple (255,0,255) are used as keys, and will be replaced with transparent pixels.
+ .Pp
diff --git a/debian/patches/series b/debian/patches/series
index b87b462..b12b8c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,9 @@
paths.patch
rpath.patch
+spelling.patch
+manpages.patch
+
freedoom.patch
noexample.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
new file mode 100644
index 0000000..eb6a33a
--- /dev/null
+++ b/debian/patches/spelling.patch
@@ -0,0 +1,59 @@
+description: fix spelling errors
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/doomsday/plugins/wadmapconverter/src/id1map.cpp
++++ b/doomsday/plugins/wadmapconverter/src/id1map.cpp
+@@ -380,7 +380,7 @@ DENG2_PIMPL(Id1Map)
+
+ void transferVertexes()
+ {
+- LOGDEV_MAP_XVERBOSE("Transfering vertexes...");
++ LOGDEV_MAP_XVERBOSE("Transferring vertexes...");
+ int const numVertexes = vertexCount();
+ int *indices = new int[numVertexes];
+ for(int i = 0; i < numVertexes; ++i)
+@@ -393,7 +393,7 @@ DENG2_PIMPL(Id1Map)
+
+ void transferSectors()
+ {
+- LOGDEV_MAP_XVERBOSE("Transfering sectors...");
++ LOGDEV_MAP_XVERBOSE("Transferring sectors...");
+
+ DENG2_FOR_EACH(Sectors, i, sectors)
+ {
+@@ -421,7 +421,7 @@ DENG2_PIMPL(Id1Map)
+
+ void transferLinesAndSides()
+ {
+- LOGDEV_MAP_XVERBOSE("Transfering lines and sides...");
++ LOGDEV_MAP_XVERBOSE("Transferring lines and sides...");
+ DENG2_FOR_EACH(Lines, i, lines)
+ {
+ mside_t *front = ((i)->sides[RIGHT] >= 0? &sides[(i)->sides[RIGHT]] : 0);
+@@ -493,7 +493,7 @@ DENG2_PIMPL(Id1Map)
+ {
+ if(surfaceTints.empty()) return;
+
+- LOGDEV_MAP_XVERBOSE("Transfering surface tints...");
++ LOGDEV_MAP_XVERBOSE("Transferring surface tints...");
+ DENG2_FOR_EACH(SurfaceTints, i, surfaceTints)
+ {
+ int idx = i - surfaceTints.begin();
+@@ -511,7 +511,7 @@ DENG2_PIMPL(Id1Map)
+ {
+ if(polyobjs.empty()) return;
+
+- LOGDEV_MAP_XVERBOSE("Transfering polyobjs...");
++ LOGDEV_MAP_XVERBOSE("Transferring polyobjs...");
+ DENG2_FOR_EACH(Polyobjs, i, polyobjs)
+ {
+ MPE_PolyobjCreate(i->lineIndices.constData(), i->lineIndices.count(),
+@@ -525,7 +525,7 @@ DENG2_PIMPL(Id1Map)
+ {
+ if(things.empty()) return;
+
+- LOGDEV_MAP_XVERBOSE("Transfering things...");
++ LOGDEV_MAP_XVERBOSE("Transferring things...");
+ DENG2_FOR_EACH(Things, i, things)
+ {
+ int idx = i - things.begin();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/deng.git
More information about the Pkg-games-commits
mailing list