[deng] 04/04: release 1.15.0-1
Michael Gilbert
mgilbert at moszumanska.debian.org
Sun Jun 28 22:44:44 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 f6de51c79390a469766173cd51fd1d3ac8beeab4
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sun Jun 28 18:43:04 2015 -0400
release 1.15.0-1
---
debian/changelog | 11 +++++++++++
debian/clean | 3 ++-
debian/control | 9 ++++++++-
debian/copyright | 14 ++++++++++++--
debian/doomsday-compat | 47 ++++++++++++++++++++++++++++++++++++++++++++---
debian/lintian-overrides | 2 ++
debian/watch | 4 +---
7 files changed, 80 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b046ea8..944832c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+doomsday (1.15.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update debian/copyright (closes: #789882).
+ * Update debian/watch for new tarball naming scheme.
+ * Use abort instead of exit for some of the shared library failure modes.
+ * More robust doomsday-compat (closes: #787985, #788053, #788058, #789882).
+ - Many thanks to Fabian Greffrath.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sun, 28 Jun 2015 19:51:14 +0000
+
doomsday (1.14.5-3) unstable; urgency=medium
* Fix lintian warnings.
diff --git a/debian/clean b/debian/clean
index 09b0aa9..c6fab09 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1,3 @@
doomsday/*.pk3
-doomsday/*.pack
+doomsday/*client*pack
+doomsday/*stdlib*pack
diff --git a/debian/control b/debian/control
index 9679d2c..299b51b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,11 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Michael Gilbert <mgilbert at debian.org>
Build-Depends:
debhelper (>= 9),
+ libassimp-dev,
libqt4-dev,
libqt4-opengl-dev,
libfluidsynth-dev,
- libsdl-mixer1.2-dev,
+ libsdl2-mixer-dev,
libx11-dev,
libxrandr-dev,
libxxf86vm-dev,
@@ -54,6 +55,8 @@ Depends:
doomsday-common (>= ${source:Version}), doomsday-common (<< ${source:Version}.1~),
Replaces:
doomsday (<= 1.14.5-2),
+Breaks:
+ 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
@@ -69,6 +72,8 @@ Depends:
${shlibs:Depends},
Replaces:
doomsday (<= 1.14.5-2),
+Breaks:
+ 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
@@ -86,6 +91,8 @@ Recommends:
freedoom | game-data-packager | boom-wad | doom-wad | heretic-wad | hexen-wad,
Replaces:
doomsday (<= 1.14.5-2),
+Breaks:
+ 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
diff --git a/debian/copyright b/debian/copyright
index 66eed49..ace2e89 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,16 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
Source: http://dengine.net/source
Upstream-Name: Doomsday Engine
-Upstream-Contact: http://dengine.net/forums/
+Upstream-Contact: http://dengine.net/forums
Files-Excluded:
distrib
snowberry
doomsday/external/zlib
+ doomsday/external/assimp
doomsday/external/fluidsynth
doomsday/external/lzss/win32
+ doomsday/client/net.dengine.client.pack/defaultstyle.pack/fonts
+ doomsday/tests/test_appfw/net.dengine.test.appfw.pack/defaultstyle.pack/fonts
Files: *
Copyright: 1986, Gary S. Brown
@@ -29,7 +32,11 @@ Copyright: 1986, Gary S. Brown
2006-2008, Jamie Jones <jamie_jones_au at yahoo.com.au>
License: GPL-2+
-Files: doomsday/libgui/src/imKStoUCS_x11.c
+Files: doomsday/libshell/include/de/shell/textwidget.h doomsday/libappfw/include/de/framework/persistentstate.h doomsday/libgui/include/de/gui/displaymode.h
+Copyright: Copyright (c) 2012-2014 Jaakko Keränen <jaakko.keranen at iki.fi>
+License: LGPL-3+
+
+Files: doomsday/libgui/src/input/imKStoUCS_x11.c
Copyright: 1994-2003, The XFree86 Project, Inc.
License: Expat
@@ -83,6 +90,9 @@ License: Public-Domain
License: GPL-2+
See /usr/share/common-licenses/GPL-2.
+License: LGPL-3+
+ See /usr/share/common-licenses/LGPL-3.
+
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-compat b/debian/doomsday-compat
index a0fb1f4..23ee96f 100755
--- a/debian/doomsday-compat
+++ b/debian/doomsday-compat
@@ -6,7 +6,7 @@
# - Doomsday expects the -iwad parameter to give a directory containing
# IWAD files and loads one depending on the additional -game parameter.
-# Copyright © 2013 Fabian Greffrath <fabian+debian at greffrath.com>
+# Copyright © 2013-2015 Fabian Greffrath <fabian at debian.org>
# This package is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
@@ -28,8 +28,8 @@ DOOMSDAY="doomsday"
next_is_iwad=0
next_is_pwad=0
-iwaddir=""
-gamemode=""
+iwaddir="$(awk '/^iwaddir/{print $2}' /etc/doomsday/paths)"
+gamemode="doom2"
for arg in "$@"
do
@@ -59,12 +59,31 @@ do
next_is_pwad=0
pwadpath=$arg
pwadfile=$(basename $arg)
+ if [ ! -f $pwadpath -a -f $iwaddir/$pwadpath ]
+ then
+ pwadpath=$iwaddir/$pwadpath
+ fi
continue
fi
cmdline="$cmdline $arg"
done
+# if no -iwad parameter is given, guess from executable name
+if [ -z "$iwadfile" ]
+then
+ case "$(basename $0)" in
+ heretic)
+ iwadfile=heretic.wad
+ iwadpath=$iwaddir/$iwadfile
+ ;;
+ hexen)
+ iwadfile=hexen.wad
+ iwadpath=$iwaddir/$iwadfile
+ ;;
+ esac
+fi
+
case "$(echo $iwadfile | tr '[:upper:]' '[:lower:]')" in
doom1.wad)
gamemode=doom1-share
@@ -134,6 +153,25 @@ case "$(echo $pwadfile | tr '[:upper:]' '[:lower:]')" in
;;
esac
+# fall back to alternatives
+if [ $gamemode = "doom2" \
+ -a ! -f $iwaddir/doom2.wad \
+ -a ! -f $iwaddir/doom2f.wad \
+ -a -f $iwaddir/freedoom2.wad ]
+then
+ gamemode=freedoom2
+elif [ \( $gamemode = "heretic" -o $gamemode = "heretic-ext" \) \
+ -a ! -f $iwaddir/heretic.wad \
+ -a -f $iwaddir/heretic1.wad ]
+then
+ gamemode=heretic-share
+elif [ $gamemode = "hexen" \
+ -a ! -f $iwaddir/hexen.wad \
+ -a -f $iwaddir/hexendemo.wad ]
+then
+ gamemode=hexen-demo
+fi
+
if [ -n "$pwadpath" ]
then
cmdline="-file $pwadpath $cmdline"
@@ -142,6 +180,9 @@ fi
if [ -n "$iwaddir" -a -n "$gamemode" ]
then
eval $DOOMSDAY -iwad $iwaddir -game $gamemode $cmdline
+elif [ -n "$gamemode" ]
+then
+ eval $DOOMSDAY -game $gamemode $cmdline
else
eval $DOOMSDAY "$@"
fi
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644
index 0000000..74b3923
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1,2 @@
+# no upstream changelog provided
+no-upstream-changelog
diff --git a/debian/watch b/debian/watch
index 15d53f2..ed4e5fa 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
-# Compulsory line, this is a version 3 file
version=3
-# Find new files on sourceforge, for devscripts >= 2.9
-http://sf.net/deng/doomsday-([\d.]+)\.tar\.gz
+http://sf.net/deng/doomsday-stable-([\d.]+)\.tar\.gz
--
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