[game-data-packager] 14/25: make check: verify internal depedencies
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager. commit 1a02318c5100ebb693ac2b7bced5af33bb29da00 Author: Alexandre Detiste alexandre.deti...@gmail.com Date: Wed Jan 28 21:32:43 2015 +0100 make check: verify internal depedencies --- game_data_packager/__init__.py | 8 1 file changed, 8 insertions(+) diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py index b32865b..0f5c743 100644 --- a/game_data_packager/__init__.py +++ b/game_data_packager/__init__.py @@ -637,6 +637,14 @@ class GameData(object): for installable in package.optional: assert installable in self.files, installable +# check internal depedencies +for demo_for_item in package.demo_for: +assert demo_for_item in self.packages, demo_for_item +assert (not package.expansion_for or + package.expansion_for in self.packages), package.expansion_for +assert (not package.better_version or + package.better_version in self.packages), package.better_version + for filename, wanted in self.files.items(): if wanted.unpack: assert 'format' in wanted.unpack, filename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 12/25: make_template: fix install_to:
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository game-data-packager.
commit 9a6cc3e0ab925cecb766044c0767708a1c9e017b
Author: Alexandre Detiste alexandre.deti...@gmail.com
Date: Wed Jan 28 19:09:48 2015 +0100
make_template: fix install_to:
---
game_data_packager/make_template.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/game_data_packager/make_template.py
b/game_data_packager/make_template.py
index 82000a4..1295224 100644
--- a/game_data_packager/make_template.py
+++ b/game_data_packager/make_template.py
@@ -43,7 +43,7 @@ def do_one_dir(destdir,lower):
data = dict(files={})
package = data.setdefault('packages', {}).setdefault('FIXME', {})
package['install'] = []
-package['install_to'] = destdir
+package['install_to'] = destdir.lstrip('/')
sums = dict(sha1={}, md5={}, sha256={}, ck={})
for dirpath, dirnames, filenames in os.walk(destdir):
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/game-data-packager.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 10/25: descent1: add basic support
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager. commit 98cd1ea4bf857fab3a8b46068306ca1308bde7b2 Author: Alexandre Detiste alexandre.deti...@gmail.com Date: Wed Jan 28 16:56:00 2015 +0100 descent1: add basic support - only demo - only repacking, reading .tar.gz doesn't work yet (subdir ?) - getting it to read the multipart ARJ would be much harder --- data/descent1-demo-data.copyright | 31 ++ data/descent1-full-data.copyright | 24 data/descent1.yaml| 124 ++ 3 files changed, 179 insertions(+) diff --git a/data/descent1-demo-data.copyright b/data/descent1-demo-data.copyright new file mode 100644 index 000..6f45ed1 --- /dev/null +++ b/data/descent1-demo-data.copyright @@ -0,0 +1,31 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Files: * + © 1994 Parallax Software Corporation +License: + DESCENT is a trademark of Interplay Productions, Inc. + . + GIVE SHAREWARE DESCENT TO EVERYONE YOU KNOW! + . + THIS GAME MAY BE FREELY DISTRIBUTED + . + Shareware Descent is freely distributable to anyone and everyone so + long as it is distributed in UNMODIFIED FORM and no fees are charged. + . + This data was packaged with game-data-packager. + +Files: /usr/share/doc/descent1-demo/data/changelog.gz + © 2008-2014 Jonathan Dowland j...@debian.org. + © 2014-2015 Simon McVittie + © 2015 Alexandre Detiste +License: GPL-2 + This program 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 (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + . + You can find the GPL license text on a Debian system under + /usr/share/common-licenses/GPL-2. diff --git a/data/descent1-full-data.copyright b/data/descent1-full-data.copyright new file mode 100644 index 000..771fdcb --- /dev/null +++ b/data/descent1-full-data.copyright @@ -0,0 +1,24 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Files: * + © 1994 Parallax Software Corporation +License: + DESCENT is a trademark of Interplay Productions, Inc. + . + This data was packaged with game-data-packager. + +Files: /usr/share/doc/descent1-demo/data/changelog.gz + © 2008-2014 Jonathan Dowland j...@debian.org. + © 2014-2015 Simon McVittie + © 2015 Alexandre Detiste +License: GPL-2 + This program 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 (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + . + You can find the GPL license text on a Debian system under + /usr/share/common-licenses/GPL-2. diff --git a/data/descent1.yaml b/data/descent1.yaml new file mode 100644 index 000..3b54d4d --- /dev/null +++ b/data/descent1.yaml @@ -0,0 +1,124 @@ +%YAML 1.2 +--- +longname: Descent: First Strike + +packages: + descent1-demo-data: +longname: Descent: First Strike (demo) +demo_for: descent1-full-data +debian: + engine: d1x-rebirth + conflicts: descent1-full-data +install: +- descent.hog +- descent.pig +optional: +- readme.txt +- refcard.txt +install_to: usr/share/games/d1x-rebirth/ + + descent1-full-data: +longname: Descent: First Strike +debian: + engine: d1x-rebirth + conflicts: descent1-demo-data +install: +- descent.hog_full +- descent.pig_full +install_to: usr/share/games/d1x-rebirth/ + +files: + readme.txt: +install_to: $docdir + refcard.txt: +install_to: $docdir + + desc14sw.tar.gz: +download: http://icculus.org/d2x/data/desc14sw.tar.gz +unpack: + format: tar.gz + unpack: + - desc14sw/descent.hog + - desc14sw/descent.pig + - desc14sw/readme.txt + - desc14sw/refcard.txt +prodives: +- descent.hog +- descent.pig +- readme.txt +- refcard.txt + + descent.hog_full: +install_as: descent.hog + + descent.pig_full: +install_as: descent.pig + + #desc14sw.exe: + # provides: + # - descent1.sow + # - descent2.sow + # format: zip + #descent1.sow: + # prodives: + # - descent.hog + # - readme.txt + # - refcard.txt + # - descent.pig_part1 + # format: arj + #descent2.sow: + # # needs to be unpacked after descent1.sow in the same working folder + # # in order to add data to existing descent.pig + # # without that, we get a
[game-data-packager] 07/25: warn about broken expansion - full game depedency
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository game-data-packager.
commit 95ea030f01e515e2502bb147bdb8d80663d95693
Author: Alexandre Detiste alexandre.deti...@gmail.com
Date: Tue Jan 27 13:40:17 2015 +0100
warn about broken expansion - full game depedency
---
game_data_packager/__init__.py | 7 +++
1 file changed, 7 insertions(+)
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index d87bfa5..b32865b 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -2074,6 +2074,13 @@ class GameData(object):
'%s is also avaible', package.name,
package.better_version)
continue
+if (package.expansion_for
+ and self.packages[package.expansion_for] not in possible
+ and not os.path.exists('/usr/share/doc/' +
package.expansion_for)):
+ logger.warning('will generate %s expansion, but full game '
+ '%s is not avaible nor already installed.',
+ package.name, package.expansion_for)
+
abort = False
if not build_demos:
for demo_for in package.demo_for:
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/game-data-packager.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[vcmi] 01/05: change my email in Uploaders field to jo...@debian.org
This is an automated email from the git hooks/post-receive script. josch-guest pushed a commit to branch master in repository vcmi. commit 0ac3558e18b0b1dbc17e825974317fb9d19cadba Author: josch j.scha...@email.de Date: Wed Feb 4 15:32:11 2015 +0100 change my email in Uploaders field to jo...@debian.org --- debian/changelog | 6 ++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c8808c3..3ccf03e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vcmi (0.97+dfsg-4) UNRELEASED; urgency=medium + + * change my email in Uploaders field to jo...@debian.org + + -- Johannes Schauer jo...@debian.org Wed, 04 Feb 2015 15:31:31 +0100 + vcmi (0.97+dfsg-3) unstable; urgency=medium [ Johannes Schauer ] diff --git a/debian/control b/debian/control index 2f3c9b0..809b6f4 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: vcmi Section: contrib/games Priority: optional Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org -Uploaders: Stephen Kitt sk...@debian.org, Johannes Schauer jo...@mister-muffin.de +Uploaders: Stephen Kitt sk...@debian.org, Johannes Schauer jo...@debian.org Build-Depends: debhelper (= 9), cmake, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/vcmi.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[vcmi] 03/05: d/rules: add get-orig-source target
This is an automated email from the git hooks/post-receive script. josch-guest pushed a commit to branch master in repository vcmi. commit ed302daa6bf602b346a06b842fc28e8b25cdbdce Author: josch j.scha...@email.de Date: Wed Feb 4 15:36:28 2015 +0100 d/rules: add get-orig-source target --- debian/changelog | 1 + debian/rules | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 22429d1..4086669 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ vcmi (0.97+dfsg-4) UNRELEASED; urgency=medium * change my email in Uploaders field to jo...@debian.org * d/watch: use repacksuffix and use dversionmangle instead of uversionmangle + * d/rules: add get-orig-source target -- Johannes Schauer jo...@debian.org Wed, 04 Feb 2015 15:31:31 +0100 diff --git a/debian/rules b/debian/rules index 2f0608c..cc3f1f8 100755 --- a/debian/rules +++ b/debian/rules @@ -44,3 +44,6 @@ override_dh_auto_clean: rm -f vcmimanual.4ct vcmimanual.4tc vcmimanual.aux vcmimanual.css \ vcmimanual.dvi vcmimanual.html vcmimanual.idv vcmimanual.lg \ vcmimanual.log vcmimanual.tmp vcmimanual.xref + +get-orig-source: + uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --repack --compression=xz --download-current-version -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/vcmi.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[vcmi] branch master updated (0b3bc5a - bec08cb)
This is an automated email from the git hooks/post-receive script. josch-guest pushed a change to branch master in repository vcmi. from 0b3bc5a Release. new 0ac3558 change my email in Uploaders field to jo...@debian.org new 2a16591 d/watch: use repacksuffix and use dversionmangle instead of uversionmangle new ed302da d/rules: add get-orig-source target new 623ce83 add debian/patches/20150204-let-vcmibuilder-be-case-insensitive new bec08cb release 0.97+dfsg-4 The 5 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 10 +++ debian/control | 2 +- .../20150204-let-vcmibuilder-be-case-insensitive | 32 ++ debian/patches/series | 1 + debian/rules | 3 ++ debian/watch | 2 +- 6 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 debian/patches/20150204-let-vcmibuilder-be-case-insensitive -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/vcmi.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[vcmi] 02/05: d/watch: use repacksuffix and use dversionmangle instead of uversionmangle
This is an automated email from the git hooks/post-receive script. josch-guest pushed a commit to branch master in repository vcmi. commit 2a16591c0fe1248bebb7292b12944d1b707686b5 Author: josch j.scha...@email.de Date: Wed Feb 4 15:35:30 2015 +0100 d/watch: use repacksuffix and use dversionmangle instead of uversionmangle --- debian/changelog | 1 + debian/watch | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3ccf03e..22429d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ vcmi (0.97+dfsg-4) UNRELEASED; urgency=medium * change my email in Uploaders field to jo...@debian.org + * d/watch: use repacksuffix and use dversionmangle instead of uversionmangle -- Johannes Schauer jo...@debian.org Wed, 04 Feb 2015 15:31:31 +0100 diff --git a/debian/watch b/debian/watch index ea94c6a..adec97e 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 -opts=uversionmangle=s/$/\+dfsg/ \ +opts=repacksuffix=+dfsg,dversionmangle=s/\+dfsg$// \ https://github.com/vcmi/vcmi/releases (?:.*/)(\d[\d\.]*)\.tar\.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/vcmi.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[vcmi] 04/05: add debian/patches/20150204-let-vcmibuilder-be-case-insensitive
This is an automated email from the git hooks/post-receive script. josch-guest pushed a commit to branch master in repository vcmi. commit 623ce8366076672971c814461b9d1858b783b18f Author: josch j.scha...@email.de Date: Wed Feb 4 15:42:11 2015 +0100 add debian/patches/20150204-let-vcmibuilder-be-case-insensitive --- debian/changelog | 2 ++ .../20150204-let-vcmibuilder-be-case-insensitive | 32 ++ debian/patches/series | 1 + 3 files changed, 35 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4086669..1aa813b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ vcmi (0.97+dfsg-4) UNRELEASED; urgency=medium * change my email in Uploaders field to jo...@debian.org * d/watch: use repacksuffix and use dversionmangle instead of uversionmangle * d/rules: add get-orig-source target + * add debian/patches/20150204-let-vcmibuilder-be-case-insensitive +(Closes: #771300) -- Johannes Schauer jo...@debian.org Wed, 04 Feb 2015 15:31:31 +0100 diff --git a/debian/patches/20150204-let-vcmibuilder-be-case-insensitive b/debian/patches/20150204-let-vcmibuilder-be-case-insensitive new file mode 100644 index 000..6e947e9 --- /dev/null +++ b/debian/patches/20150204-let-vcmibuilder-be-case-insensitive @@ -0,0 +1,32 @@ +Author: josch j.scha...@email.de +Subject: let data, maps and mp3 directory be truly case insensitive +Forwarded: https://github.com/vcmi/vcmi/pull/63 + +diff --git a/vcmibuilder b/vcmibuilder +index 59ac71e..36de603 100755 +--- a/vcmibuilder b/vcmibuilder +@@ -209,17 +209,13 @@ fi + + if [[ -n $data_dir ]] + then +- cp -r $data_dir/Data $dest_dir +- cp -r $data_dir/Maps $dest_dir +- + # this folder is named differently from time to time +- # vcmi can handle any case but script can't +- if [ -d $data_dir/MP3 ] +- then +- cp -r $data_dir/MP3 $dest_dir +- else +- cp -r $data_dir/Mp3 $dest_dir +- fi ++ # bash also has `shopt -s nocaseglob` but we don't want this to ++ # accidentally influence other parts of this script ++ # since the directory names are short, we use this pattern matching ++ cp -r $data_dir/[Dd][Aa][Tt][Aa] $dest_dir ++ cp -r $data_dir/[Mm][Aa][Pp][Ss] $dest_dir ++ cp -r $data_dir/[Mm][Pp]3 $dest_dir + fi + + if [[ -n $download ]] diff --git a/debian/patches/series b/debian/patches/series index df2364e..f5bf5b3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 20141103-disable-privacy-breach 20141117-add-FL_CPP11-preprocessor-define 20141117-add-kfreebsd-and-hurd-support +20150204-let-vcmibuilder-be-case-insensitive -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/vcmi.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[vcmi] 05/05: release 0.97+dfsg-4
This is an automated email from the git hooks/post-receive script. josch-guest pushed a commit to branch master in repository vcmi. commit bec08cb864f13991a6a8637c69f7334e0394225f Author: josch j.scha...@email.de Date: Wed Feb 4 16:21:16 2015 +0100 release 0.97+dfsg-4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1aa813b..bf8f279 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -vcmi (0.97+dfsg-4) UNRELEASED; urgency=medium +vcmi (0.97+dfsg-4) unstable; urgency=medium * change my email in Uploaders field to jo...@debian.org * d/watch: use repacksuffix and use dversionmangle instead of uversionmangle @@ -6,7 +6,7 @@ vcmi (0.97+dfsg-4) UNRELEASED; urgency=medium * add debian/patches/20150204-let-vcmibuilder-be-case-insensitive (Closes: #771300) - -- Johannes Schauer jo...@debian.org Wed, 04 Feb 2015 15:31:31 +0100 + -- Johannes Schauer jo...@debian.org Wed, 04 Feb 2015 16:20:56 +0100 vcmi (0.97+dfsg-3) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/vcmi.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[vcmi] annotated tag debian/0.97+dfsg-4 created (now 6e54f6f)
This is an automated email from the git hooks/post-receive script. josch-guest pushed a change to annotated tag debian/0.97+dfsg-4 in repository vcmi. at 6e54f6f (tag) tagging bec08cb864f13991a6a8637c69f7334e0394225f (commit) replaces debian/0.97+dfsg-3 tagged by josch on Wed Feb 4 16:59:23 2015 +0100 - Log - vcmi Debian release 0.97+dfsg-4 josch (5): change my email in Uploaders field to jo...@debian.org d/watch: use repacksuffix and use dversionmangle instead of uversionmangle d/rules: add get-orig-source target add debian/patches/20150204-let-vcmibuilder-be-case-insensitive release 0.97+dfsg-4 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/vcmi.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 25/25: doom2 master levels: don't ship borked .desktop and icon
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager. commit 4fd1c57f69478ecdc62db336b1dea7abd56549a6 Author: Alexandre Detiste alexandre.deti...@gmail.com Date: Mon Feb 2 12:05:24 2015 +0100 doom2 master levels: don't ship borked .desktop and icon --- data/doom2.yaml | 1 + game_data_packager/games/doom_common.py | 5 + 2 files changed, 6 insertions(+) diff --git a/data/doom2.yaml b/data/doom2.yaml index 1d38639..f7d8189 100644 --- a/data/doom2.yaml +++ b/data/doom2.yaml @@ -30,6 +30,7 @@ packages: doom2-masterlevels-wad: longname: Master Levels for DOOM II expansion_for: doom2-wad +create_desktop_file: false steam: id: 9160 path: common/Master Levels of Doom diff --git a/game_data_packager/games/doom_common.py b/game_data_packager/games/doom_common.py index 0bc2d0d..c76945f 100644 --- a/game_data_packager/games/doom_common.py +++ b/game_data_packager/games/doom_common.py @@ -83,6 +83,9 @@ class DoomGameData(GameData): package.engine = self.yaml['packages'][package.name].get( 'doom_engine') +package.create_desktop_file = self.yaml['packages'][package.name].get( +'create_desktop_file', True) + def construct_package(self, binary): return WadPackage(binary) @@ -126,6 +129,8 @@ class DoomGameData(GameData): def fill_extra_files(self, package, destdir): super(DoomGameData, self).fill_extra_files(package, destdir) +if not package.create_desktop_file: +return main_wad = package.main_wad wad_base = os.path.splitext(main_wad)[0] -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] annotated tag upstream/1.36+u20150114+dfsg1 created (now 56c11bb)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to annotated tag upstream/1.36+u20150114+dfsg1 in repository ioquake3. at 56c11bb (tag) tagging 06c072c0048d695009ac37c2ba7c7106fa29d25d (commit) replaces upstream/1.36+u20140929+g918eed9+dfsg1 tagged by Simon McVittie on Thu Jan 22 22:01:15 2015 + - Log - Upstream version 1.36+u20150114+dfsg1 Simon McVittie (1): Imported Upstream version 1.36+u20150114+dfsg1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quake] branch master updated (b4b43ed - 57f3956)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to branch master in repository quake. from b4b43ed prepare release new 57f3956 quake3: fix installed-location detection by looking for pak0.pk3, not pak0.pak The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 7 +++ quake3.in| 8 2 files changed, 11 insertions(+), 4 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quake.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quake] annotated tag debian/11 created (now 82ab91b)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to annotated tag debian/11 in repository quake. at 82ab91b (tag) tagging 57f3956d5a9d9f16c1e7f7f7c626e3d641b34c36 (commit) replaces debian/10 tagged by Simon McVittie on Wed Feb 4 11:25:19 2015 + - Log - quake Debian release 11 Simon McVittie (1): quake3: fix installed-location detection by looking for pak0.pk3, not pak0.pak --- This annotated tag includes the following new commits: new 57f3956 quake3: fix installed-location detection by looking for pak0.pk3, not pak0.pak The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quake.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quake] 01/01: quake3: fix installed-location detection by looking for pak0.pk3, not pak0.pak
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository quake. commit 57f3956d5a9d9f16c1e7f7f7c626e3d641b34c36 Author: Simon McVittie s...@debian.org Date: Wed Feb 4 11:17:41 2015 + quake3: fix installed-location detection by looking for pak0.pk3, not pak0.pak --- debian/changelog | 7 +++ quake3.in| 8 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 742959e..47722a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +quake (11) experimental; urgency=low + + * quake3: fix installed-location detection by looking for pak0.pk3, +not pak0.pak + + -- Simon McVittie s...@debian.org Wed, 04 Feb 2015 11:17:00 + + quake (10) experimental; urgency=low * quake2: execute debian_server.cfg again, reverting a change from v9. diff --git a/quake3.in b/quake3.in index 2c1d540..a645e2e 100644 --- a/quake3.in +++ b/quake3.in @@ -52,13 +52,13 @@ done if [ -n $DEMO ]; then BASEPATH=/usr/lib/quake3/demo -elif [ -e /usr/lib/quake3/ta/missionpack/pak0.pak ]; then +elif [ -e /usr/lib/quake3/ta/missionpack/pak0.pk3 ]; then BASEPATH=/usr/lib/quake3/ta -elif [ -e /usr/lib/quake3/base/baseq3/pak0.pak ]; then +elif [ -e /usr/lib/quake3/base/baseq3/pak0.pk3 ]; then BASEPATH=/usr/lib/quake3/base -elif [ -e $BASEPATH/baseq3/pak0.pak ]; then +elif [ -e $BASEPATH/baseq3/pak0.pk3 ]; then : -elif [ -e /usr/lib/quake3/demo/demoq3/pak0.pak ]; then +elif [ -e /usr/lib/quake3/demo/demoq3/pak0.pk3 ]; then BASEPATH=/usr/lib/quake3/demo DEMO=1 fi -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quake.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 16/25: re-enable make-template
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager. commit 423954fa1b67f65dedcb42cbac51aca0f4a34113 Author: Alexandre Detiste alexandre.deti...@gmail.com Date: Thu Jan 29 00:09:37 2015 +0100 re-enable make-template --- run | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/run b/run index ec61db4..afcc1fc 100755 --- a/run +++ b/run @@ -12,7 +12,16 @@ else fi export PYTHONPATH -# FIXME: undocumented feature currently disabled: -# python3 -m game_data_packager.make_template $@ +if [ $# -eq 0 ]; then + exec python3 -m game_data_packager +fi -exec python3 -m game_data_packager $@ +case $1 in + 'make-template') + shift + exec python3 -m game_data_packager.make_template $@ + ;; + *) + exec python3 -m game_data_packager $@ + ;; +esac -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 02/25: quake2: add customer_support.html from v3.05
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager. commit f178f4fd18b406e3d3c9e7c1bf7516cd0639a924 Author: Alexandre Detiste alexandre.deti...@gmail.com Date: Mon Jan 26 14:49:37 2015 +0100 quake2: add customer_support.html from v3.05 --- data/quake2.yaml | 16 ++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/data/quake2.yaml b/data/quake2.yaml index fa00b43..5ee11a2 100644 --- a/data/quake2.yaml +++ b/data/quake2.yaml @@ -75,7 +75,7 @@ packages: - readme.txt_3.20 - quake2_manual/bottom.html - quake2_manual/credits.html -- quake2_manual/customer_support.html_steam +- quake2_manual/customer_support.html - quake2_manual/enemy_barracuda_shark.html - quake2_manual/enemy_berserker.html - quake2_manual/enemy_brains.html @@ -932,8 +932,20 @@ files: md5:71a8fc7089eddda402ab11d3443aaae2 sha1: 40974c7cb195dc1c3e43a011a7efef8fdc10a971 sha256: d338256ee5b8cafbdd1e0a023aa96a917e79ff4acca1afd5a16b78329cea + + quake2_manual/customer_support.html: +alternatives: +- quake2_manual/customer_support.html_steam +- quake2_manual/customer_support.html_3.05 quake2_manual/customer_support.html_steam: -install_as: quake2_manual/customer_support.html +look_for: [quake2_manual/customer_support.html] + quake2_manual/customer_support.html_3.05: +look_for: [quake2_manual/customer_support.html] +size: 5073 +md5:525c98cd717fc7e6ea18b5fd758a2f97 +sha1: 1b5569bbe7abf42b5113401dd2b84a0a3b3d814c +sha256: b90985c9c5a201ce42ef80ebb489110f0df8767862aa77a107c43dc618cce7d7 + quake2_manual/technical_information.html_steam: install_as: quake2_manual/technical_information.html -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 06/25: fix some debug messages
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository game-data-packager.
commit 75bce5b53bdc6a0953cb559d137b562e3bb79a3a
Author: Alexandre Detiste alexandre.deti...@gmail.com
Date: Tue Jan 27 13:23:45 2015 +0100
fix some debug messages
---
game_data_packager/__init__.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 0ea8485..d87bfa5 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -2061,7 +2061,7 @@ class GameData(object):
package.name, self.get_architecture())
possible.discard(package)
-logger.debug('possible packages: %r', possible)
+logger.debug('possible packages: %r', set(p.name for p in possible))
if not possible:
raise NoPackagesPossible()
@@ -2110,7 +2110,7 @@ class GameData(object):
raise DownloadNotAllowed()
raise DownloadsFailed()
-logger.debug('packages ready for building: %r', ready)
+logger.debug('packages ready for building: %r', set(p.name for p in
ready))
return ready
def build_packages(self, ready, destination, compress):
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/game-data-packager.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 05/25: quake3: add licensing for the native Linux retail version by Loki
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager. commit 8122fe2d7264cf593cbb6224d93f7e1678a6e667 Author: Alexandre Detiste alexandre.deti...@gmail.com Date: Mon Jan 26 16:36:04 2015 +0100 quake3: add licensing for the native Linux retail version by Loki --- data/quake3.yaml | 17 + 1 file changed, 17 insertions(+) diff --git a/data/quake3.yaml b/data/quake3.yaml index 02ad74f..4ed967a 100644 --- a/data/quake3.yaml +++ b/data/quake3.yaml @@ -118,6 +118,11 @@ packages: _ 383888 missionpack/pak1.pk3 _ 376234 missionpack/pak2.pk3 _ 384282 missionpack/pak3.pk3 +install_to_docdir: + - Help +optional: + - Help/Q3A_CELA.txt + - Help/Q3A_EULA.txt_loki quake3-team-arena-data: longname: Quake III Team Arena @@ -760,6 +765,10 @@ files: - Help/DedicatedServer.html - Help/BotCommands.html + Help/Q3A_EULA.txt_loki: +look_for: [Help/Q3A_EULA.txt] +install_as: Help/Q3A_EULA.txt + cksums: | 2320976398 49289300 linuxq3ademo-1.11-6.x86.gz.sh 3701968173 6122 botfiles/chars.h @@ -1004,8 +1013,10 @@ cksums: | 728666811 7341 Help/Manual/navart/weapons/shotguna.jpg 2701614114 7194 Help/Manual/navart/weapons/shotgunh.jpg 453620289 7327 Help/Manual/navart/weapons/teleport.jpg + 2022830651 21415 Help/Q3A_CELA.txt 3837091335 30480 Help/Q3A_EULA.html 2895569138 9958 Help/Q3A_EULA.txt + 3210348088 14411 Help/Q3A_EULA.txt_loki 3350442675 1119 Help/Quake3World.html 13572043 13845 Help/Readme.html 868039883 2684 Help/Support/CustomerSupport/Customer_Support.htm @@ -1270,8 +1281,10 @@ md5sums: | 5fa082bfcca6552e51cae94e42da1835 Help/Manual/navart/weapons/shotguna.jpg 302c03eb5bce2a55f249aa31c6639a9e Help/Manual/navart/weapons/shotgunh.jpg 5abeb8ff2aa01ace0189315c839df443 Help/Manual/navart/weapons/teleport.jpg + aa4d3ac8f85cd202eadf9de0c07af67d Help/Q3A_CELA.txt e74300fd0f5d4766d3d8cbd57774b7de Help/Q3A_EULA.html 124cd297370aa2cc9b42be239d19756c Help/Q3A_EULA.txt + 7382ad04f3fd168a344a45926fd3bd24 Help/Q3A_EULA.txt_loki 5df9a70f7a694ae37d8e502d90c9cfee Help/Quake3World.html e7306d73bb92768e5d76697894134dca Help/Readme.html 5100e0920972e2e60114a098fcbbe6b8 Help/Support/CustomerSupport/Customer_Support.htm @@ -1536,8 +1549,10 @@ sha1sums: | 3546c6d7cdcd2850d8140286049d311d8ea3a9f2 Help/Manual/navart/weapons/shotguna.jpg 730f3ff7a815280f9d030754aa935432a892263d Help/Manual/navart/weapons/shotgunh.jpg 4baa623cef246fe1fe17276bc4bb3ad08f3c2a90 Help/Manual/navart/weapons/teleport.jpg + 0252513e9aeb0b4eda200c299e00636412a07c56 Help/Q3A_CELA.txt fcae69b619846459049a05e67833424df63786a2 Help/Q3A_EULA.html d82469cc8b90d38623f1a153cdac121271c650cd Help/Q3A_EULA.txt + 8593879d72aee066e28cff56a978a84faa031cb6 Help/Q3A_EULA.txt_loki 09fb42cccb8086c7feb138d4851e0ad6479a51ab Help/Quake3World.html 23ad420bb65a42a10a5a9657b7746856ef71461a Help/Readme.html f7a4ba51849bfda94414d6d2b36e837e6bad7471 Help/Support/CustomerSupport/Customer_Support.htm @@ -1802,8 +1817,10 @@ sha256sums: | e6f3d2998aa80a63cc60487d4027d5a9c68807eca66fee10ea654b938b4f5358 Help/Manual/navart/weapons/shotguna.jpg 567533db76b91e0f5a43352d51e3df1dd782e99efe579854d8208bcd6b9d1f80 Help/Manual/navart/weapons/shotgunh.jpg 09c02f084b5471e9841af146d1462afcc8cd63022ed520c0e4c8468e1ce663aa Help/Manual/navart/weapons/teleport.jpg + 1d199e5d0ceaafb90db5d8236c441519dcb32cb9e62187d67fb869a907f1085a Help/Q3A_CELA.txt 2d473a168d9a19df17cb64362cd6e08d2e48a4d8c0f4846b0221f775705cdb3b Help/Q3A_EULA.html 23ed30a9ea5875261791549f16875576e7428365ff82dd943cc07339f1173673 Help/Q3A_EULA.txt + b5fb337e43b03729e7062ce6ef92d2e920d51ac0df0822369805713acd644578 Help/Q3A_EULA.txt_loki 0e51b4ce2e13e8cca2865e1c6b995636467a2e56e6fef759b388d10fd2bd1da5 Help/Quake3World.html 99aedc13cc99c86e4f199846a2b1433ab042d159ba3d52fb3d1b997b29e3cfd1 Help/Readme.html b279932005296d0b67cd3ef718e925ac7a30fdf30b8d295118ca601414027543 Help/Support/CustomerSupport/Customer_Support.htm -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 09/25: make_template: add a switch to make the files lowercase
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository game-data-packager.
commit 2e0c670150aafc33b97d6df8ad70421d4ca199cf
Author: Alexandre Detiste alexandre.deti...@gmail.com
Date: Wed Jan 28 15:18:18 2015 +0100
make_template: add a switch to make the files lowercase
---
game_data_packager/make_template.py | 21 +
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/game_data_packager/make_template.py
b/game_data_packager/make_template.py
index 1b25a49..16ec749 100644
--- a/game_data_packager/make_template.py
+++ b/game_data_packager/make_template.py
@@ -39,7 +39,7 @@ def is_doc(file):
return True
return False
-def do_one_dir(destdir):
+def do_one_dir(destdir,lower):
data = dict(files={})
package = data.setdefault('packages', {}).setdefault('FIXME', {})
package['install'] = []
@@ -52,6 +52,9 @@ def do_one_dir(destdir):
assert path.startswith(destdir + '/')
name = path[len(destdir) + 1:]
+out_name = name
+if lower:
+out_name = out_name.lower()
if os.path.isdir(path):
continue
@@ -60,16 +63,16 @@ def do_one_dir(destdir):
elif os.path.islink(path):
package.setdefault('symlinks', {})[name] =
os.path.realpath(path).lstrip('/')
elif os.path.isfile(path):
-package['install'].append(name)
+package['install'].append(out_name)
#data['files'][name] = dict(size=os.path.getsize(path))
if is_doc(fn):
- data['files'][name] = dict(install_to='$docdir')
+ data['files'][out_name] = dict(install_to='$docdir')
hf = HashedFile.from_file(name, open(path, 'rb'))
-sums['ck'][name] = os.path.getsize(path)
-sums['md5'][name] = hf.md5
-sums['sha1'][name] = hf.sha1
-sums['sha256'][name] = hf.sha256
+sums['ck'][out_name] = os.path.getsize(path)
+sums['md5'][out_name] = hf.md5
+sums['sha1'][out_name] = hf.sha1
+sums['sha256'][out_name] = hf.sha256
else:
logger.warning('ignoring unknown file type at %s' % path)
@@ -198,11 +201,13 @@ def main():
'based on an existing .deb file or installed directory',
prog='game-data-packager guess-contents')
parser.add_argument('args', nargs='+', metavar='DEB|DIRECTORY')
+parser.add_argument('-l', '--lower', action='store_true', dest='lower',
+help='make all files lowercase')
args = parser.parse_args()
for arg in args.args:
if os.path.isdir(arg):
-do_one_dir(arg.rstrip('/'))
+do_one_dir(arg.rstrip('/'),args.lower)
else:
do_one_deb(arg)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/game-data-packager.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 08/25: make_template: ignore .386 binary files
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository game-data-packager.
commit 7f8e0e6ecc28dbfbc2698b29553ae110e0769329
Author: Alexandre Detiste alexandre.deti...@gmail.com
Date: Wed Jan 28 15:10:19 2015 +0100
make_template: ignore .386 binary files
---
game_data_packager/make_template.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/game_data_packager/make_template.py
b/game_data_packager/make_template.py
index c57fa6d..1b25a49 100644
--- a/game_data_packager/make_template.py
+++ b/game_data_packager/make_template.py
@@ -55,7 +55,7 @@ def do_one_dir(destdir):
if os.path.isdir(path):
continue
-elif os.path.splitext(fn.lower())[1] in ('.exe', '.ovl', '.dll',
'.bat'):
+elif os.path.splitext(fn.lower())[1] in ('.exe', '.ovl', '.dll',
'.bat', '.386'):
logger.warning('ignoring dos/windows binary at %s' % path)
elif os.path.islink(path):
package.setdefault('symlinks', {})[name] =
os.path.realpath(path).lstrip('/')
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/game-data-packager.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 04/25: quake2: add 5 more images only in v3.05
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager. commit dbcfaa38287bb9bfcb7e520709da82080b96159d Author: Alexandre Detiste alexandre.deti...@gmail.com Date: Mon Jan 26 15:50:17 2015 +0100 quake2: add 5 more images only in v3.05 --- data/quake2.yaml | 29 + 1 file changed, 29 insertions(+) diff --git a/data/quake2.yaml b/data/quake2.yaml index 672a11d..1404db0 100644 --- a/data/quake2.yaml +++ b/data/quake2.yaml @@ -112,6 +112,7 @@ packages: - quake2_manual/images/buttons.jpg - quake2_manual/images/cells.gif - quake2_manual/images/chaingun.gif +- quake2_manual/images/cloaker.gif - quake2_manual/images/commandant_james.gif - quake2_manual/images/credits_main.gif - quake2_manual/images/door.jpg @@ -124,6 +125,7 @@ packages: - quake2_manual/images/first_aid.gif - quake2_manual/images/flyer.gif - quake2_manual/images/gladiator.gif +- quake2_manual/images/goggles.gif - quake2_manual/images/grenade_launcher.gif - quake2_manual/images/grenades.gif - quake2_manual/images/gunner.gif @@ -131,6 +133,7 @@ packages: - quake2_manual/images/heavy_pack.gif - quake2_manual/images/hyper_blaster.gif - quake2_manual/images/icarus.gif +- quake2_manual/images/invisibility.gif - quake2_manual/images/invulnerability.gif - quake2_manual/images/iron_maiden.gif - quake2_manual/images/lava.jpg @@ -159,10 +162,12 @@ packages: - quake2_manual/images/rail_gun.gif - quake2_manual/images/rocket_launcher.gif - quake2_manual/images/rockets.gif +- quake2_manual/images/scope.gif - quake2_manual/images/secret_door.jpg - quake2_manual/images/shells.gif - quake2_manual/images/shotgun.gif - quake2_manual/images/shotgun_guard.gif +- quake2_manual/images/sights.gif - quake2_manual/images/silencer.gif - quake2_manual/images/slime.jpg - quake2_manual/images/start_network_server_screen1.gif @@ -1649,6 +1654,13 @@ cksums: | 1083749212 787 readme-dm64.txt 3695062650 6635508 baseq2/sewer64.bsp + # extra images found in 3.05 + _ 3148 quake2_manual/images/cloaker.gif + _ 2771 quake2_manual/images/goggles.gif + _ 4118 quake2_manual/images/invisibility.gif + _ 2795 quake2_manual/images/scope.gif + _ 2795 quake2_manual/images/sights.gif + md5sums: | 1ec55a724dc3109fd50dde71ab581d70 baseq2/pak0.pak_1dd586a 36fdaddd1c1b56ba10472466e4486ff8 baseq2/video/end.cin @@ -2133,6 +2145,12 @@ md5sums: | 917611eec2f2f699b1b0ca149ac66244 readme-dm64.txt 19a07f706332c48a83164d13d77b6729 baseq2/sewer64.bsp + d67f1ff8c52ef8994b57f7d7f00a4734 quake2_manual/images/cloaker.gif + 3dd7372f74c44d28e3e6cd4c46d33253 quake2_manual/images/goggles.gif + 6e1ae4235e32c624b2d7218f29c9634f quake2_manual/images/invisibility.gif + 1a3af7e6b381b11cc4c80782ad156500 quake2_manual/images/scope.gif + 3b964fb8caf8f97debc0e1f2cbcc6374 quake2_manual/images/sights.gif + sha1sums: | 452fbe9a1175c38fbd76042a3e43a6d2c2da6a1d quake2-rogue-2.00.tar.xz d23b281d29247d5e1c4a059233b16cda840d35c1 quake2-xatrix-2.01.tar.xz @@ -2516,6 +2534,12 @@ sha1sums: | 2c5832c6256592504502b6f5d0999612abeb779e readme-dm64.txt 6d9a210bde080e7c5a27146c2323b7a6c72f44cb baseq2/sewer64.bsp + fa3bab0b06bb97c55ade27a01d7612ebf01c8f42 quake2_manual/images/cloaker.gif + ca9e4578781565acc817836693211dff80b5d05e quake2_manual/images/goggles.gif + b004a7e5b0626c4f3d47c3a4ae7f97a174d0e5a9 quake2_manual/images/invisibility.gif + 64e3890c56cbd6cd6478172adc9c0e929f1e449d quake2_manual/images/scope.gif + 4a4e5445e3038f549e5a086c87e4fd12a7fd79a7 quake2_manual/images/sights.gif + sha256sums: | fa3f4ad38a73b6007cf8bd2992318952555ee7d91734bc0a7d1af6016186eac5 quake2-rogue-2.00.tar.xz 973adbb3665d23c30a5e2117cc7227042c15db1b7bc8d375c5c6b8d98893e958 quake2-xatrix-2.01.tar.xz @@ -2898,5 +2922,10 @@ sha256sums: | 88abca6ad0ee1fd19a503f3fd957f98b9274a81ad9cb0bd8fef3ea4ec77c4d45 readme-dm64.txt 66e3278bfe4b16983ea9a22d7300af813f05747db6d9941caa1fea38bb14d435 baseq2/sewer64.bsp + bef5d74e19f312076432abbff26b8cb7cdf2e534dc2af7f08b76441a6043bea3 quake2_manual/images/cloaker.gif + b00ceb46e9f4087ac2aa3b30749ab69a3b601396470f17f2046ef97d040c3326 quake2_manual/images/goggles.gif + e48de92a79a1bc1fe8a49a698ffb0349b99b6ca76c0c5937e8f5d46a99596246 quake2_manual/images/invisibility.gif + 49b0b5cca0e8bb1a60ad421e7350ec9240c61725b9cb0304e70a7ee7060275cd quake2_manual/images/scope.gif + 591268000b5f50f4b06c22f119720580371bad0b932f269aec6cd732335802dd quake2_manual/images/sights.gif ... # vim:set sw=2 sts=2 et: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org
[game-data-packager] 01/25: don't tag all files coming from cdrom as executable
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository game-data-packager.
commit 90f2d229035246c67d57dddbd71652b5717ee747
Author: Alexandre Detiste alexandre.deti...@gmail.com
Date: Mon Jan 26 14:20:39 2015 +0100
don't tag all files coming from cdrom as executable
this still handle hipnotic-tryexec.sh as expected
---
game_data_packager/__init__.py | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 4c9e2ed..0ea8485 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -1638,9 +1638,12 @@ class GameData(object):
stat_res = os.lstat(full)
if stat.S_ISLNK(stat_res.st_mode):
continue
-elif (stat.S_ISDIR(stat_res.st_mode) or
-(stat.S_IMODE(stat_res.st_mode) 0o111) != 0):
-# make directories and executable files rwxr-xr-x
+elif stat.S_ISDIR(stat_res.st_mode):
+# make directories rwxr-xr-x
+os.chmod(full, 0o755)
+elif ((stat.S_IMODE(stat_res.st_mode) 0o111) != 0
+ and fn.endswith('.sh')):
+# make executable files rwxr-xr-x
os.chmod(full, 0o755)
else:
# make other files rw-r--r--
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/game-data-packager.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quake] 02/10: quake3: modify quake3-server configuration
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository quake. commit 2f29ad4ab075032c69c28eeef9921b9b09a48d5e Author: Simon McVittie s...@debian.org Date: Mon Jan 26 09:33:04 2015 + quake3: modify quake3-server configuration - remove START_DAEMON from /etc/default/quake3-server - put defaults for START_DAEMON and DAEMON_OPTS in /etc/init.d/quake3-server so it can operate without /e/d/q3-s --- debian/changelog | 4 debian/quake3-server.default | 9 - debian/quake3-server.init| 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3ce3764..78b1c9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ quake (10) UNRELEASED; urgency=medium * quake2: execute debian_server.cfg again, reverting a change from v9. Unlike quake and quake3, quake2's default configuration file is named debian_server.cfg, and the demo and full game have different versions. + * quake3: modify quake3-server configuration +- remove START_DAEMON from /etc/default/quake3-server +- put defaults for START_DAEMON and DAEMON_OPTS in + /etc/init.d/quake3-server so it can operate without /e/d/q3-s * quake3: prefer to load game data from /usr/lib/quake3/base or /usr/lib/quake3/ta, where ioquake3 can provide native-code game modules - this requires ioquake3 (= 1.36+u20150114+dfsg1-1~) and diff --git a/debian/quake3-server.default b/debian/quake3-server.default index 8d725f4..e4e4437 100644 --- a/debian/quake3-server.default +++ b/debian/quake3-server.default @@ -2,11 +2,10 @@ # sourced by /etc/init.d/quake3-server # installed at /etc/default/quake3-server by the maintainer scripts -# To disable the server, please use the normal mechanisms provided by init: -# see /usr/share/doc/quake3-server/README.Debian.gz. Changing the value -# of this variable is deprecated. -START_DAEMON=unless-disabled-by-upgrade - # Additional options that are passed to the daemon. # For most options it's better to edit server.cfg instead. DAEMON_OPTS=+exec etc/quake3-server/server.cfg + +# To disable the server, please use the normal mechanisms provided by init: +# see /usr/share/doc/quake3-server/README.Debian.gz. The START_DAEMON +# variable is deprecated and should not be used. diff --git a/debian/quake3-server.init b/debian/quake3-server.init index 4e0296a..5a5596f 100644 --- a/debian/quake3-server.init +++ b/debian/quake3-server.init @@ -17,6 +17,8 @@ DESC=Quake III Arena dedicated server PIDFILE=/var/run/$NAME.pid BINARY=/usr/lib/ioquake3/ioq3ded USER=Debian-quake3 +START_DAEMON=unless-disabled-by-upgrade +DAEMON_OPTS=+exec etc/quake3-server/server.cfg test -x $DAEMON || exit 0 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quake.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quake] 07/10: add optional instanced systemd units for multiple servers per machine
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository quake.
commit 940fad63056ec01e6066d22b4a008d33cda82b31
Author: Simon McVittie s...@debian.org
Date: Mon Jan 26 11:21:48 2015 +
add optional instanced systemd units for multiple servers per machine
---
debian/changelog | 1 +
debian/quake-server.install | 1 +
debian/quake-server.service | 2 ++
debian/{quake-server.service = quake-server@.service} | 7 ---
debian/quake2-server.install | 1 +
debian/quake2-server.service | 3 +++
debian/{quake2-server.service = quake2-server@.service} | 5 +++--
debian/quake3-server.install | 1 +
debian/quake3-server.service | 3 +++
debian/{quake3-server.service = quake3-server@.service} | 6 +++---
10 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a106f4e..678e529 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ quake (10) UNRELEASED; urgency=medium
operate without /etc/default/quake*-server
- +exec etc/quake*-server/server.cfg is no longer part of DAEMON_OPTS
- add native systemd units
+- add optional instanced systemd units for multiple servers per machine
* quake3: prefer to load game data from /usr/lib/quake3/base
or /usr/lib/quake3/ta, where ioquake3 can provide native-code game modules
- this requires ioquake3 (= 1.36+u20150114+dfsg1-1~) and
diff --git a/debian/quake-server.install b/debian/quake-server.install
index 2c8e03a..e2f7583 100644
--- a/debian/quake-server.install
+++ b/debian/quake-server.install
@@ -1,2 +1,3 @@
build/quake-server /usr/games
debian/server.cfg /etc/quake-server
+debian/quake-server@.service lib/systemd/system
diff --git a/debian/quake-server.service b/debian/quake-server.service
index 55895c4..135b481 100644
--- a/debian/quake-server.service
+++ b/debian/quake-server.service
@@ -1,6 +1,8 @@
[Unit]
Description=Quake game server
After=network.target
+# This server and the @server instance would try to use the same configuration
+Conflicts=quake-server@server.service
[Service]
Type=simple
diff --git a/debian/quake-server.service b/debian/quake-server@.service
similarity index 69%
copy from debian/quake-server.service
copy to debian/quake-server@.service
index 55895c4..df93bba 100644
--- a/debian/quake-server.service
+++ b/debian/quake-server@.service
@@ -1,13 +1,14 @@
[Unit]
-Description=Quake game server
+Description=Quake game server (instance: %i)
After=network.target
[Service]
Type=simple
User=quake-server
Environment=DAEMON_OPTS=
-EnvironmentFile=-/etc/default/quake-server
-ExecStart=/usr/games/quake-server $DAEMON_OPTS +exec
etc/quake-server/server.cfg
+Environment=HOME=/var/games/quake-server/%i.home
+EnvironmentFile=-/etc/default/quake-server@%i
+ExecStart=/usr/games/quake-server $DAEMON_OPTS +exec etc/quake-server/%i.cfg
Restart=on-failure
RestartPreventExitStatus=72
# hardening
diff --git a/debian/quake2-server.install b/debian/quake2-server.install
index 1932242..7ea70ef 100644
--- a/debian/quake2-server.install
+++ b/debian/quake2-server.install
@@ -1,3 +1,4 @@
build/quake2-server /usr/games
debian/q2/debian_server.cfg /etc/quake2-server
debian/q2/demo/debian_server.cfg /etc/quake2-server/demo
+debian/quake2-server@.service lib/systemd/system
diff --git a/debian/quake2-server.service b/debian/quake2-server.service
index 1284c7d..d798a78 100644
--- a/debian/quake2-server.service
+++ b/debian/quake2-server.service
@@ -1,6 +1,9 @@
[Unit]
Description=Quake II game server
After=network.target
+# This server and the @debian_server instance would try to use the same
+# configuration
+Conflicts=quake2-server@debian_server.service
[Service]
Type=simple
diff --git a/debian/quake2-server.service b/debian/quake2-server@.service
similarity index 64%
copy from debian/quake2-server.service
copy to debian/quake2-server@.service
index 1284c7d..e02c2cf 100644
--- a/debian/quake2-server.service
+++ b/debian/quake2-server@.service
@@ -1,13 +1,14 @@
[Unit]
-Description=Quake II game server
+Description=Quake II game server (instance: %i)
After=network.target
[Service]
Type=simple
User=quake2-server
Environment=DAEMON_OPTS=
+Environment=HOME=/var/games/quake2-server/%i.home
EnvironmentFile=-/etc/default/quake2-server
-ExecStart=/usr/games/quake2-server $DAEMON_OPTS +exec debian_server.cfg
+ExecStart=/usr/games/quake2-server $DAEMON_OPTS +exec etc/quake2-server/%i.cfg
Restart=on-failure
RestartPreventExitStatus=72
# hardening
diff --git a/debian/quake3-server.install b/debian/quake3-server.install
index ae86946..570f6e7 100644
--- a/debian/quake3-server.install
+++ b/debian/quake3-server.install
@@ -1,3 +1,4 @@
README.quake3-data
[ioquake3] branch debian-experimental updated (0443ffa - d29d782)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to branch debian-experimental in repository ioquake3. from 0443ffa Install symlinks to native-code cgame, qagame and ui modules for quake3 new d29d782 prepare release The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quake] 10/10: prepare release
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository quake. commit b4b43ed7852cdf6f5f6f8959dce98a8c1402de6a Author: Simon McVittie s...@debian.org Date: Wed Feb 4 10:19:16 2015 + prepare release --- debian/changelog | 4 ++-- debian/copyright | 2 +- debian/quake-server.NEWS | 4 ++-- debian/quake2-server.NEWS | 4 ++-- debian/quake3-server.NEWS | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 678e529..742959e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -quake (10) UNRELEASED; urgency=medium +quake (10) experimental; urgency=low * quake2: execute debian_server.cfg again, reverting a change from v9. Unlike quake and quake3, quake2's default configuration file is named @@ -24,7 +24,7 @@ quake (10) UNRELEASED; urgency=medium exact sizes (Closes: #762823) * quake-server, quake2-server: if no data, exit 72 like quake3-server does - -- Simon McVittie s...@debian.org Thu, 22 Jan 2015 23:48:36 + + -- Simon McVittie s...@debian.org Wed, 04 Feb 2015 10:18:27 + quake (9) experimental; urgency=low diff --git a/debian/copyright b/debian/copyright index 76ff67a..e4f8b1d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,7 +13,7 @@ Copyright: © 2006 Damien Laniel © 2008 Jack Coulter © 2008 Peter Eisentraut - © 2010-2013 Simon McVittie + © 2010-2015 Simon McVittie © 2011-2013 David Banks License: GPL-2+ diff --git a/debian/quake-server.NEWS b/debian/quake-server.NEWS index db91d36..0766c15 100644 --- a/debian/quake-server.NEWS +++ b/debian/quake-server.NEWS @@ -1,4 +1,4 @@ -quake-server (10) experimental; urgency=medium +quake-server (10) experimental; urgency=low quake-server configuration has changed significantly in this version. @@ -17,4 +17,4 @@ quake-server (10) experimental; urgency=medium and /etc/quake-server/INSTANCE.cfg instead. See /usr/share/doc/quake-server/README.Debian for details. - -- Simon McVittie s...@debian.org Fri, 23 Jan 2015 09:42:55 + + -- Simon McVittie s...@debian.org Wed, 04 Feb 2015 10:18:27 + diff --git a/debian/quake2-server.NEWS b/debian/quake2-server.NEWS index 0c4147a..6836d97 100644 --- a/debian/quake2-server.NEWS +++ b/debian/quake2-server.NEWS @@ -1,4 +1,4 @@ -quake2-server (10) experimental; urgency=medium +quake2-server (10) experimental; urgency=low quake2-server configuration has changed significantly in this version. @@ -14,4 +14,4 @@ quake2-server (10) experimental; urgency=medium and /etc/quake2-server/INSTANCE.cfg instead. See /usr/share/doc/quake2-server/README.Debian for details. - -- Simon McVittie s...@debian.org Fri, 23 Jan 2015 09:42:55 + + -- Simon McVittie s...@debian.org Wed, 04 Feb 2015 10:18:27 + diff --git a/debian/quake3-server.NEWS b/debian/quake3-server.NEWS index 140202e..39e7e48 100644 --- a/debian/quake3-server.NEWS +++ b/debian/quake3-server.NEWS @@ -1,4 +1,4 @@ -quake3-server (10) experimental; urgency=medium +quake3-server (10) experimental; urgency=low quake3-server configuration has changed significantly in this version. @@ -17,7 +17,7 @@ quake3-server (10) experimental; urgency=medium and /etc/quake3-server/INSTANCE.cfg instead. See /usr/share/doc/quake3-server/README.Debian for details. - -- Simon McVittie s...@debian.org Fri, 23 Jan 2015 09:42:55 + + -- Simon McVittie s...@debian.org Wed, 04 Feb 2015 10:18:27 + quake3-server (1.4) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quake.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quake] 04/10: Modify quake*-server configuration
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository quake.
commit ad77dd783701b51894a495acd52aa858c139e1b9
Author: Simon McVittie s...@debian.org
Date: Mon Jan 26 10:44:35 2015 +
Modify quake*-server configuration
- put default for DAEMON_OPTS in /etc/init.d/quake*-server so it can
operate without /etc/default/quake*-server
- +exec etc/quake*-server/server.cfg is no longer part of DAEMON_OPTS
---
debian/changelog | 7 ---
debian/quake-server.default | 7 +--
debian/quake-server.init | 5 -
debian/quake2-server.default | 8 ++--
debian/quake2-server.init| 4 +++-
debian/quake3-server.default | 7 +--
debian/quake3-server.init| 6 --
7 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e0e19f6..f8a0460 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,10 @@ quake (10) UNRELEASED; urgency=medium
* quake, quake3: remove support for START_DAEMON
- if the server was previously disabled via START_DAEMON,
do a one-time migration to update-rc.d $SERVICE disable
- * quake3: modify quake3-server configuration
-- put default for DAEMON_OPTS in /etc/init.d/quake3-server so it can
- operate without /e/d/q3-s
+ * Modify quake*-server configuration
+- put default for DAEMON_OPTS in /etc/init.d/quake*-server so it can
+ operate without /etc/default/quake*-server
+- +exec etc/quake*-server/server.cfg is no longer part of DAEMON_OPTS
* quake3: prefer to load game data from /usr/lib/quake3/base
or /usr/lib/quake3/ta, where ioquake3 can provide native-code game modules
- this requires ioquake3 (= 1.36+u20150114+dfsg1-1~) and
diff --git a/debian/quake-server.default b/debian/quake-server.default
index 5b5b7b7..826ea66 100644
--- a/debian/quake-server.default
+++ b/debian/quake-server.default
@@ -2,9 +2,12 @@
# sourced by /etc/init.d/quake-server
# installed at /etc/default/quake-server by the maintainer scripts
-# Additional options that are passed to the daemon.
+# Options that are passed to the daemon.
+#
+# In addition to these options, the server will execute commands from
+# /etc/quake-server/server.cfg using +exec etc/quake-server/server.cfg.
# For most options it's better to edit server.cfg instead.
-DAEMON_OPTS=+exec etc/quake-server/server.cfg
+DAEMON_OPTS=
# To disable the server, please use the normal mechanisms provided by init:
# update-rc.d quake-server disable. The START_DAEMON variable is no
diff --git a/debian/quake-server.init b/debian/quake-server.init
index 42c4511..17b99a1 100644
--- a/debian/quake-server.init
+++ b/debian/quake-server.init
@@ -16,6 +16,7 @@ DESC=Quake dedicated server
PIDFILE=/var/run/$NAME.pid
BINARY=/usr/lib/quake/quake-engine-server
USER=$NAME
+DAEMON_OPTS=
test -x $DAEMON || exit 0
@@ -33,7 +34,9 @@ do_start() {
start-stop-daemon --start --quiet --pidfile $PIDFILE --oknodo \
--background --exec $BINARY --startas $DAEMON \
--make-pidfile --chuid $USER \
- -- $DAEMON_OPTS /dev/null 21 || return 1
+ -- $DAEMON_OPTS \
+ +exec etc/quake-server/server.cfg \
+/dev/null 21 || return 1
return 0
}
diff --git a/debian/quake2-server.default b/debian/quake2-server.default
index 69849bb..cce4eaf 100644
--- a/debian/quake2-server.default
+++ b/debian/quake2-server.default
@@ -2,6 +2,10 @@
# sourced by /etc/init.d/quake2-server
# installed at /etc/default/quake2-server by the maintainer scripts
-# Additional options that are passed to the daemon.
+# Options that are passed to the daemon.
+#
+# In addition to these options, the server will execute commands from
+# /etc/quake2-server/debian_server.cfg or
+# /etc/quake2-server/demo/debian_server.cfg using +exec debian_server.cfg.
# For most options it's better to edit debian_server.cfg instead.
-DAEMON_OPTS=+exec debian_server.cfg
+DAEMON_OPTS=
diff --git a/debian/quake2-server.init b/debian/quake2-server.init
index 7ce83ac..dbcce23 100644
--- a/debian/quake2-server.init
+++ b/debian/quake2-server.init
@@ -16,6 +16,7 @@ DESC=Quake II dedicated server
PIDFILE=/var/run/$NAME.pid
BINARY=/usr/lib/quake2/quake2-engine-server
USER=$NAME
+DAEMON_OPTS=
test -x $DAEMON || exit 0
@@ -33,7 +34,8 @@ do_start() {
start-stop-daemon --start --quiet --pidfile $PIDFILE --oknodo \
--background --exec $BINARY --startas $DAEMON \
--make-pidfile --chuid $USER \
- -- $DAEMON_OPTS /dev/null 21 || return 1
+ -- $DAEMON_OPTS +exec debian_server.cfg \
+/dev/null 21 || return 1
return 0
}
diff --git a/debian/quake3-server.default b/debian/quake3-server.default
index 4e477bc..7b37dbc 100644
--- a/debian/quake3-server.default
+++ b/debian/quake3-server.default
@@ -2,9 +2,12 @@
# sourced by /etc/init.d/quake3-server
# installed at /etc/default/quake3-server by the maintainer
[game-data-packager] 18/25: hexen2 demo: add alternate source with automatic download
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager. commit 56b3220e465e3930785d03ab94e6d760edfe7865 Author: Alexandre Detiste alexandre.deti...@gmail.com Date: Thu Jan 29 01:48:44 2015 +0100 hexen2 demo: add alternate source with automatic download --- data/hexen2.yaml | 13 + 1 file changed, 13 insertions(+) diff --git a/data/hexen2.yaml b/data/hexen2.yaml index 8acd601..62511f5 100644 --- a/data/hexen2.yaml +++ b/data/hexen2.yaml @@ -69,6 +69,14 @@ files: unpack: format: tar.gz + hexen2demo_nov1997-linux-i586.tgz: +download: http://sourceforge.net/project/downloading.php?group_id=124987filename=hexen2demo_nov1997-linux-i586.tgz +provides: +- data1/pak0.pak_demo +- HEXEN II SUBLICENSE.doc +unpack: + format: tar.gz + h2demoupd.exe: unpack: format: zip @@ -81,6 +89,7 @@ files: install_as: data1/pak0.pak HEXEN II SUBLICENSE.doc: +look_for: [HEXEN II SUBLICENSE.doc, SUBLICENSE.doc] install_to: $docdir install_as: hexen_II_sublicense.doc @@ -88,6 +97,7 @@ cksums: | 1099843119 27750257 data1/pak0.pak_demo _ 30208HEXEN II SUBLICENSE.doc _ 15334912 h2demoupd.exe + _ 19585198 hexen2demo_nov1997-linux-i586.tgz md5sums: | c9675191e75dd25a3b9ed81ee7e05eff data1/pak0.pak @@ -98,6 +108,7 @@ md5sums: | 8e598d82bf53436ed7a0e133aa4b9f09 data1/pak0.pak_demo f610eb93304c4cd2cdce97bdb9140e4e HEXEN II SUBLICENSE.doc d058ecd35e419a5b8bdf17003a006843 h2demoupd.exe + b486f7b7a01b359ad801eac9486ba25f hexen2demo_nov1997-linux-i586.tgz sha1sums: | 7c6b19d76ce85771026ea8dbdc397cd1109355b7 data1/pak0.pak @@ -108,6 +119,7 @@ sha1sums: | a8cfd8790819c47998141adb97c14d1680cf8738 data1/pak0.pak_demo 1aadeaf00dc72726e03bcfeb2fa0af93107852a7 HEXEN II SUBLICENSE.doc dcb5ab7c92352a8af4975151bd089354723d9417 h2demoupd.exe + 1633010f5c33afcf00931425d7d190eaffeed579 hexen2demo_nov1997-linux-i586.tgz sha256sums: | 57936acc4cd9abed7acb480dd9c6d59c7c98e96e4eca4e2d04f390d2dfa5ffde data1/pak0.pak @@ -118,6 +130,7 @@ sha256sums: | 0d4aa01a9909771dfa8e5be27db5d6628dc92f1406998c1a89c27d4748aaf151 data1/pak0.pak_demo b9841c4b9c2de220d393ab06650779782cdb905f4721367607abf1dd56316da4 HEXEN II SUBLICENSE.doc b349824ba09ddf0e95ca8a0f1783640d745c560b67da20a9cc31d1e816e63ab8 h2demoupd.exe + f1f5ec95a33ca6a81eb27034b82b3c76d29004585baf6cfa2a1a21ab089b7ae1 hexen2demo_nov1997-linux-i586.tgz ... # vim:set sw=2 sts=2 et: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 20/25: chmod heuristic: handle package scripts correclty
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository game-data-packager.
commit 504c0a3e3c035be10d063b18e893fb4cbbd985b3
Author: Alexandre Detiste alexandre.deti...@gmail.com
Date: Fri Jan 30 11:39:00 2015 +0100
chmod heuristic: handle package scripts correclty
---
game_data_packager/__init__.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index a83f63a..6e6a6b1 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -1649,7 +1649,9 @@ class GameData(object):
# make directories rwxr-xr-x
os.chmod(full, 0o755)
elif ((stat.S_IMODE(stat_res.st_mode) 0o111) != 0
- and fn.endswith('.sh')):
+ and (fn.endswith('.sh')
+or dirpath.endswith('/usr/games')
+or dirpath.endswith('/DEBIAN'))):
# make executable files rwxr-xr-x
os.chmod(full, 0o755)
else:
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/game-data-packager.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 22/25: add Steam data for Doom games
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager. commit ed4f14e00d3e7481a601487a0250735a0560ccb7 Author: Alexandre Detiste alexandre.deti...@gmail.com Date: Sun Feb 1 13:10:03 2015 +0100 add Steam data for Doom games --- data/doom.yaml | 3 +++ data/doom2.yaml | 3 +++ data/final-doom.yaml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/data/doom.yaml b/data/doom.yaml index e19492c..4f09a49 100644 --- a/data/doom.yaml +++ b/data/doom.yaml @@ -25,6 +25,9 @@ packages: debian: engine: chocolate-doom | doom-engine conflicts: freedoom ( 0.6.4-4), freedm ( 0.6.4-4) +steam: + id: 2290 + path: common/Final Doom install_to: usr/share/games/doom longname: Doom install: diff --git a/data/doom2.yaml b/data/doom2.yaml index d73a910..29a0717 100644 --- a/data/doom2.yaml +++ b/data/doom2.yaml @@ -20,6 +20,9 @@ packages: engine: chocolate-doom | doom-engine provides: doom-wad conflicts: freedoom ( 0.6.4-4), freedm ( 0.6.4-4) +steam: + id: 2300 + path: common/Doom 2 install_to: usr/share/games/doom install: - doom2.wad diff --git a/data/final-doom.yaml b/data/final-doom.yaml index e5de59b..07ad62d 100644 --- a/data/final-doom.yaml +++ b/data/final-doom.yaml @@ -6,6 +6,9 @@ shortname: final-doom longname: Final Doom aliases: [tnt, plutonia] +steam: + id: 2290 + path: common/Final Doom plugin: doom_common -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 23/25: doom2: Master Levels, w.i.p.
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager. commit c82f8db74f631796665b3bbbe8a4bf1d43a37731 Author: Alexandre Detiste alexandre.deti...@gmail.com Date: Sun Feb 1 14:36:16 2015 +0100 doom2: Master Levels, w.i.p. the contents of the .desktop and the name of the icon are currently random see bug #776279 that suggests a Zenity promp --- data/doom2.yaml | 213 1 file changed, 213 insertions(+) diff --git a/data/doom2.yaml b/data/doom2.yaml index 29a0717..1d38639 100644 --- a/data/doom2.yaml +++ b/data/doom2.yaml @@ -27,6 +27,56 @@ packages: install: - doom2.wad + doom2-masterlevels-wad: +longname: Master Levels for DOOM II +expansion_for: doom2-wad +steam: + id: 9160 + path: common/Master Levels of Doom +install_to: usr/share/games/doom +install: +- attack.wad +- blacktwr.wad +- bloodsea.wad +- canyon.wad +- catwalk.wad +- combine.wad +- fistula.wad +- garrison.wad +- geryon.wad +- manor.wad +- mephisto.wad +- minos.wad +- nessus.wad +- paradox.wad +- subspace.wad +- subterra.wad +- teeth.wad +- ttrap.wad +- vesperas.wad +- virgil.wad +optional: +- attack.txt +- blacktwr.txt +- bloodsea.txt +- canyon.txt +- catwalk.txt +- combine.txt +- fistula.txt +- garrison.txt +- geryon.txt +- manor.txt +- mephisto.txt +- minos.txt +- nessus.txt +- paradox.txt +- subspace.txt +- subterra.txt +- teeth.txt +- ttrap.txt +- vesperas.txt +- virgil.txt + files: doom2.wad: alternatives: @@ -81,6 +131,89 @@ files: look_for: [doom2.wad] unsuitable: Doom 2 v1.9 is required + attack.txt: +install_to: $docdir + blacktwr.txt: +install_to: $docdir + bloodsea.txt: +install_to: $docdir + canyon.txt: +install_to: $docdir + catwalk.txt: +install_to: $docdir + combine.txt: +install_to: $docdir + fistula.txt: +install_to: $docdir + garrison.txt: +install_to: $docdir + geryon.txt: +install_to: $docdir + manor.txt: +install_to: $docdir + mephisto.txt: +install_to: $docdir + minos.txt: +install_to: $docdir + nessus.txt: +install_to: $docdir + paradox.txt: +install_to: $docdir + subspace.txt: +install_to: $docdir + subterra.txt: +install_to: $docdir + teeth.txt: +install_to: $docdir + ttrap.txt: +install_to: $docdir + vesperas.txt: +install_to: $docdir + virgil.txt: +install_to: $docdir + +cksums: | + _ 1581 attack.txt + _ 185135attack.wad + _ 4872 blacktwr.txt + _ 199534blacktwr.wad + _ 5349 bloodsea.txt + _ 258942bloodsea.wad + _ 1585 canyon.txt + _ 157529canyon.wad + _ 1280 catwalk.txt + _ 151817catwalk.wad + _ 1239 combine.txt + _ 141548combine.wad + _ 1280 fistula.txt + _ 104654fistula.wad + _ 1193 garrison.txt + _ 116403garrison.wad + _ 2239 geryon.txt + _ 221009geryon.wad + _ 2903 manor.txt + _ 245444manor.wad + _ 4695 mephisto.txt + _ 121406mephisto.wad + _ 2631 minos.txt + _ 351712minos.wad + _ 3037 nessus.txt + _ 158514nessus.wad + _ 3174 paradox.txt + _ 223555paradox.wad + _ 1278 subspace.txt + _ 105780subspace.wad + _ 1215 subterra.txt + _ 127480subterra.wad + _ 5190 teeth.txt + _ 190531teeth.wad + _ 2734 ttrap.txt + _ 286220ttrap.wad + _ 1697 vesperas.txt + _ 235353vesperas.wad + _ 2813 virgil.txt + _ 171232virgil.wad + md5sums: | 25e1459ca71d321525f84628f45ca8cd doom2.wad_1.9 c3bea40570c23e511a7ed3ebcd9865f7 doom2.wad_bfg @@ -94,6 +227,46 @@ md5sums: | a793ebcdd790afad4a1f39cc39a893bd doom2.wad_xbox_roe 4c3db5f23b145fccd24c9b84aba3b7dd doom2.wad_psn 9640fc4b2c8447bbd28f2080725d5c51 doom2.wad_tapwave_zodiac + b5d81e4014b0e41a977ad837be62015a attack.txt + cb03fd0cd84b10579c2b2b313199d4c1 attack.wad + cd05ef340481c80dd866910fb61de078 blacktwr.txt + a421ca18cea00a2696162f8d2a2beeca blacktwr.wad + 9f55a86718e7d3a9d5e84b7f90391fdd bloodsea.txt + 18eb4ffb3094ddb690e62211dc6169a1 bloodsea.wad + 62841b903a25efbbe07ba04629a472e1 canyon.txt + 33493942592d764e7787fb0ad7d03044 canyon.wad + 77464c420be047460fdf01a927679e18 catwalk.txt + e7c273033376824edf95e1328261e7de catwalk.wad + 30e17b85fb58f45bfd54076bca1d6c4f combine.txt + 77c179948df47a7a613bd1181c959892 combine.was + 055cb6078dc8c02d687a46cff0efdf99 fistula.txt + cbf714b499ebdef2682990eaf93fdb5f fistula.wad + c4804663d959554267e031f020f024a6 garrison.txt + f000701a3ed1f49249ee08550c03dfa5 garrison.wad + 8b87125eef93282b724ebca5c2bf46b9 geryon.txt + a1efff02df6d873762ebac6b12358bbc geryon.wad +
[tenmado] branch master updated (85885bc - 21f3363)
This is an automated email from the git hooks/post-receive script. apo-guest pushed a change to branch master in repository tenmado. from 85885bc Debian leaves the choice to its users and doesn't limit them more than Upstream intends to new 21f3363 Remove myself from Uploaders. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/control | 1 - 1 file changed, 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/tenmado.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[tenmado] 01/01: Remove myself from Uploaders.
This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository tenmado. commit 21f336309d26beb2eee7e713c4241b31224ece8f Author: Markus Koschany a...@gambaru.de Date: Wed Feb 4 13:33:55 2015 + Remove myself from Uploaders. --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 4e36343..26fcbc0 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,6 @@ Section: games Priority: optional Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org Uploaders: - Markus Koschany a...@gambaru.de Build-Depends: debhelper (= 9), dh-autoreconf, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/tenmado.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[tenmado] branch master updated (c169f41 - 85885bc)
This is an automated email from the git hooks/post-receive script. rhonda pushed a change to branch master in repository tenmado. from c169f41 Replace deprecated dot notation with colon. new 85885bc Debian leaves the choice to its users and doesn't limit them more than Upstream intends to The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/copyright | 219 ++- 1 file changed, 215 insertions(+), 4 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/tenmado.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[tenmado] 01/01: Debian leaves the choice to its users and doesn't limit them more than Upstream intends to
This is an automated email from the git hooks/post-receive script. rhonda pushed a commit to branch master in repository tenmado. commit 85885bce1dde3e0f79e6d78a94f557b75f8daa37 Author: Rhonda D'Vine rho...@debian.org Date: Wed Feb 4 14:18:56 2015 +0100 Debian leaves the choice to its users and doesn't limit them more than Upstream intends to --- debian/copyright | 219 ++- 1 file changed, 215 insertions(+), 4 deletions(-) diff --git a/debian/copyright b/debian/copyright index 649a662..3f86775 100644 --- a/debian/copyright +++ b/debian/copyright @@ -52,7 +52,218 @@ License: GPL-2 or Artistic-License-2.0beta5 . On Debian systems, a copy of the GNU General Public License version 2 can be found at /usr/share/common-licenses/GPL-2. -Comment: - Debian distributes Tenmado and the debian directory under the terms of the GNU - General Public license 2. Please see /usr/share/common-licenses/GPL-2 for the - complete license text. + +License: Artistic-License-2.0beta5 + The Artistic License + Version 2.0beta5, October 2001 + . + Copyright (C) 2000, 2001 Larry Wall, Bradley M. Kuhn. +Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + . + Preamble + . + This copyright license states the terms under which a given free software + Package may be copied, modified and/or redistributed, while the + Originator(s) maintain some artistic control over the future development of + that Package (at least as much artistic control as can be given under + copyright law while still making the Package open source and free software). + . + This license is bound by copyright law, and thus it legally applies only to + works which the copyright holder has permitted copying, distribution or + modification under the terms of the Artistic License, Version 2.0. + . + You are reminded that You are always permitted to make arrangements wholly + outside of a given copyright license directly with the copyright holder(s) + of a given Package. If the terms of this license impede your ability to + make full use of the Package, You are encouraged to contact the copyright + holder(s) and seek a different licensing arrangement. + . + . + Definitions + . + Package refers to the collection of files distributed by the + Originator(s), and derivatives of that collection of files created + through textual modification. + . + Standard Version refers to the Package if it has not been modified, or has +been modified only in ways suggested by the +Originator(s). + . + Modified Version refers to the Package, if it has been changed by You via +textual modification of the source code, and such changes +were not suggested by the Originator(s). + . + Originator refers to the author(s) and/or copyright holder(s) of the +Standard Version of the Package. + . + You and Your refers to any person who would like to copy, distribute, or + modify the Package. + . + Distribution Fee is any fee that You charge for providing a copy of this +Package to another party. It does not refer to licensing +fees. + . + Freely Available means that: + . +(a) no fee is charged for the right to use the item (though a +Distribution Fee may be charged). + . +(b) recipients of the item may redistribute it under the same +conditions they received it. + . +(c) If the item is a binary, object code, bytecode, the complete +corresponding machine-readable source code is included with the +item. + . + . + Permission for Use and Modification Without Redistribution + . + (1) You are permitted to use the Standard Version and create and use + Modified Versions for any purpose without restriction, provided that + you do not redistribute the Modified Version to others outside of your + company or organization. + . + . +Permissions for Redistribution of the Standard Version + . + (2) You may make available verbatim copies of the source code of the + Standard Version of this Package in any medium without restriction, + either gratis or for a Distribution Fee, provided that you duplicate + all of the original copyright notices and associated disclaimers. At + Your discretion, such verbatim copies may or may not include compiled + bytecode, object code or binary versions of the corresponding source + code in the same medium. + . + (3) You may apply any bug fixes, portability changes, and other + modifications made available from any of the Originator(s). The + resulting modified
[game-data-packager] branch master updated (66ae808 - 4fd1c57)
This is an automated email from the git hooks/post-receive script.
smcv pushed a change to branch master
in repository game-data-packager.
from 66ae808 hexen: remove obsolete note about the demo
new 90f2d22 don't tag all files coming from cdrom as executable
new f178f4f quake2: add customer_support.html from v3.05
new 54eb80d quake2: add technical_information.html from v3.05
new dbcfaa3 quake2: add 5 more images only in v3.05
new 8122fe2 quake3: add licensing for the native Linux retail version
by Loki
new 75bce5b fix some debug messages
new 95ea030 warn about broken expansion - full game depedency
new 7f8e0e6 make_template: ignore .386 binary files
new 2e0c670 make_template: add a switch to make the files lowercase
new 98cd1ea descent1: add basic support
new a3eb1e0 make_template: caculate sums for single file
new 9a6cc3e make_template: fix install_to:
new 6cccf44 add support for descent2 demo
new 1a02318 make check: verify internal depedencies
new a45da25 merge 2 identical for ... in ...
new 423954f re-enable make-template
new 0aaffc7 add support for Hexen II demo
new 56b3220 hexen2 demo: add alternate source with automatic download
new 7ce4939 descent1: add optional high-res pack
new 504c0a3 chmod heuristic: handle package scripts correclty
new 94046f4 never attempt to compress .ogg files
new ed4f14e add Steam data for Doom games
new c82f8db doom2: Master Levels, w.i.p.
new e7971d2 steam data: fix bad copy paste
new 4fd1c57 doom2 master levels: don't ship borked .desktop and icon
The 25 revisions listed above as new are entirely new to this
repository and will be described in separate emails. The revisions
listed as adds were already present in the repository and have only
been added to this reference.
Summary of changes:
.../copyright = data/descent1-demo-data.copyright | 31 ++-
.../copyright = data/descent1-full-data.copyright | 24 +--
data/descent1.yaml | 137 +
data/descent2-demo-data.copyright | 62 ++
data/descent2.yaml | 61 ++
data/doom.yaml | 3 +
data/doom2.yaml| 217 +
data/final-doom.yaml | 3 +
...2-data.copyright = hexen2-demo-data.copyright} | 0
data/hexen2.yaml | 58 ++
data/quake2.yaml | 59 +-
data/quake3.yaml | 17 ++
debian/changelog | 2 +
game_data_packager/__init__.py | 35 +++-
game_data_packager/games/doom_common.py| 5 +
game_data_packager/make_template.py| 39 ++--
run| 15 +-
17 files changed, 710 insertions(+), 58 deletions(-)
copy debian/copyright = data/descent1-demo-data.copyright (57%)
copy debian/copyright = data/descent1-full-data.copyright (57%)
create mode 100644 data/descent1.yaml
create mode 100644 data/descent2-demo-data.copyright
create mode 100644 data/descent2.yaml
copy data/{hexen2-data.copyright = hexen2-demo-data.copyright} (100%)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/game-data-packager.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 24/25: steam data: fix bad copy paste
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager. commit e7971d245b25433f4f71dd776b105b0616066ad4 Author: Alexandre Detiste alexandre.deti...@gmail.com Date: Mon Feb 2 11:23:04 2015 +0100 steam data: fix bad copy paste --- data/doom.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/doom.yaml b/data/doom.yaml index 4f09a49..7118216 100644 --- a/data/doom.yaml +++ b/data/doom.yaml @@ -26,8 +26,8 @@ packages: engine: chocolate-doom | doom-engine conflicts: freedoom ( 0.6.4-4), freedm ( 0.6.4-4) steam: - id: 2290 - path: common/Final Doom + id: 2280 + path: common/Ultimate Doom install_to: usr/share/games/doom longname: Doom install: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 13/25: add support for descent2 demo
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager. commit 6cccf440513aaa69caf6bbc8fece90987ecd5224 Author: Alexandre Detiste alexandre.deti...@gmail.com Date: Wed Jan 28 19:26:02 2015 +0100 add support for descent2 demo --- data/descent2-demo-data.copyright | 62 +++ data/descent2.yaml| 61 ++ debian/changelog | 1 + 3 files changed, 124 insertions(+) diff --git a/data/descent2-demo-data.copyright b/data/descent2-demo-data.copyright new file mode 100644 index 000..ee6198c --- /dev/null +++ b/data/descent2-demo-data.copyright @@ -0,0 +1,62 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Files: * + © 1995 Parallax Software Corporation +License: + DESCENT is a trademark of Interplay Productions, Inc. + . + THIS DEMO IS FREELY DISTRIBUTABLE FOR NON-COMMERCIAL PURPOSES + . + SOFTWARE USE LIMITATIONS AND LIMITED LICENSE + . + This special 3-level preview version of Descent 2 (the Software) is + intended solely for your personal noncommercial home entertainment use. + You may not decompile, reverse engineer, or disassemble the Software, except + as permitted by law. Interplay Productions and Parallax Software + Corporation retain all rights and title in the Software including all + intellectual property rights embodied therein and derivatives thereof. You + are granted a revocable, nonassignable limited license to create derivative + works of this Software solely for your own personal noncommercial home + entertainment use and may publicly display such derivative works to the + extent specifically authorized by Interplay in writing. A copy of this + authorization, if any, will be provided on Interplay's World Wide Web site + (http://www.interplay.com), and may also be obtained by contacting the legal + department at Interplay at (714) 553-6655. The Software, including, without + limitation, all code, data structures, characters, images, sounds, text, + screens, game play, derivative works and all other elements of the Software + may not be copied (except as provided below), resold, rented, leased, + distributed (electronically or otherwise), used on pay-per-play, coin-op or + other for-charge basis, or for any commercial purpose. You may make copies + of the Software for your personal noncommercial home entertainment use and + to give to friends and acquaintances on a no cost noncommercial basis. This + limited right to copy the Software expressly excludes any copying or + distribution of the Software on a commercial basis, including, without + limitation, bundling the product with any other product or service and any + give away of the Software in connection with another product or service. Any + permissions granted herein are provided on a temporary basis and can be + withdrawn by Interplay Productions at any time. All rights not expressly + granted are reserved. + . + DESCENT COPYRIGHT (C) 1995 PARALLAX SOFTWARE CORPORATION + ALL RIGHTS RESERVED + . + ALL TRADEMARKS ARE PROPERTY OF INTERPLAY PRODUCTIONS, INC. + INTERPLAY PRODUCTIONS IS THE EXCLUSIVE LICENSEE AND DISTRIBUTOR. + . + This data was packaged with game-data-packager. + +Files: /usr/share/doc/descent1-demo/data/changelog.gz + © 2008-2014 Jonathan Dowland j...@debian.org. + © 2014-2015 Simon McVittie + © 2015 Alexandre Detiste +License: GPL-2 + This program 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 (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + . + You can find the GPL license text on a Debian system under + /usr/share/common-licenses/GPL-2. diff --git a/data/descent2.yaml b/data/descent2.yaml new file mode 100644 index 000..0b5f437 --- /dev/null +++ b/data/descent2.yaml @@ -0,0 +1,61 @@ +%YAML 1.2 +--- +longname: Descent II + +packages: + descent2-demo-data: +longname: Descent II +debian: + engine: d2x-rebirth +install: +- d2demo.pig +- d2demo.ham +- d2demo.hog +- readme.txt +- d2demo.dem +install_to: usr/share/games/d2x-rebirth + +files: + readme.txt: +install_to: $docdir + d2shar10.tar.gz: +download: http://icculus.org/d2x/data/d2shar10.tar.gz +unpack: + format: tar.gz +provides: +- d2demo.pig +- d2demo.ham +- d2demo.hog +- readme.txt +- d2demo.dem + +cksums: | + _ 355173d2demo.dem + _ 1961015 d2demo.ham + _ 2292566 d2demo.hog + _ 2800295 d2demo.pig + _ 88065 readme.txt + _ 4311406 d2shar10.tar.gz + +md5sums: | + 221f42d8896ccef096bb32eccb295d36 d2demo.dem +
[game-data-packager] 03/25: quake2: add technical_information.html from v3.05
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager. commit 54eb80da691d86272b4d31e00faebf90cb26885a Author: Alexandre Detiste alexandre.deti...@gmail.com Date: Mon Jan 26 15:15:43 2015 +0100 quake2: add technical_information.html from v3.05 --- data/quake2.yaml | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/data/quake2.yaml b/data/quake2.yaml index 5ee11a2..672a11d 100644 --- a/data/quake2.yaml +++ b/data/quake2.yaml @@ -192,7 +192,7 @@ packages: - quake2_manual/page_index.html - quake2_manual/setup_controls_screenmenus.html - quake2_manual/story.html -- quake2_manual/technical_information.html_steam +- quake2_manual/technical_information.html - quake2_manual/top_nav.html quake2-demo-data: @@ -946,8 +946,18 @@ files: sha1: 1b5569bbe7abf42b5113401dd2b84a0a3b3d814c sha256: b90985c9c5a201ce42ef80ebb489110f0df8767862aa77a107c43dc618cce7d7 + quake2_manual/technical_information.html: +alternatives: +- quake2_manual/technical_information.html_steam +- quake2_manual/technical_information.html_3.05 quake2_manual/technical_information.html_steam: -install_as: quake2_manual/technical_information.html +look_for: [quake2_manual/technical_information.html] + quake2_manual/technical_information.html_3.05: +look_for: [quake2_manual/technical_information.html] +size: 13079 +md5:43ed8b9aab50fe9cd02c142dcceb030d +sha1: ef3f246b3d75d3d447f7d404beaf89c2e8e3fda5 +sha256: 426277295a0a857805fbd7df60bf05a2af61973aa4b1f4cf8096cb43dfca795d quake2_manual/multiplayer.html: alternatives: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 11/25: make_template: caculate sums for single file
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository game-data-packager.
commit a3eb1e0341418bb8204bd1f6e08d04ee5fc0862b
Author: Alexandre Detiste alexandre.deti...@gmail.com
Date: Wed Jan 28 17:46:26 2015 +0100
make_template: caculate sums for single file
---
game_data_packager/make_template.py | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/game_data_packager/make_template.py
b/game_data_packager/make_template.py
index 16ec749..82000a4 100644
--- a/game_data_packager/make_template.py
+++ b/game_data_packager/make_template.py
@@ -91,6 +91,16 @@ def do_one_dir(destdir,lower):
print('...')
print('')
+def do_one_file(name,lower):
+hf = HashedFile.from_file(name, open(name, 'rb'))
+out_name = os.path.basename(name)
+if lower:
+out_name = out_name.lower()
+print(' _ %-9s %s' % (os.path.getsize(name), out_name))
+print(' %s %s' % (hf.md5, out_name))
+print(' %s %s' % (hf.sha1, out_name))
+print(' %s %s' % (hf.sha256, out_name))
+
def do_one_deb(deb):
control = None
@@ -208,8 +218,10 @@ def main():
for arg in args.args:
if os.path.isdir(arg):
do_one_dir(arg.rstrip('/'),args.lower)
-else:
+elif arg.endswith('.deb'):
do_one_deb(arg)
+else:
+do_one_file(arg,args.lower)
if __name__ == '__main__':
main()
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/game-data-packager.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 15/25: merge 2 identical for ... in ...
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager. commit a45da2561218c4c58e63b4af744e510f403bad54 Author: Alexandre Detiste alexandre.deti...@gmail.com Date: Wed Jan 28 21:33:35 2015 +0100 merge 2 identical for ... in ... --- game_data_packager/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py index 0f5c743..a83f63a 100644 --- a/game_data_packager/__init__.py +++ b/game_data_packager/__init__.py @@ -614,6 +614,7 @@ class GameData(object): if 'steam' in self.yaml: self.steam = self.yaml['steam'] +# consistency check for package in self.packages.values(): for provider in package.install_contents_of: assert provider in self.files, (package.name, provider) @@ -628,8 +629,6 @@ class GameData(object): assert package.rip_cd['encoding'] == 'vorbis', package.name self.rip_cd_packages.add(package) -# consistency check -for package in self.packages.values(): # there had better be something it wants to install assert package.install or package.rip_cd, package.name for installable in package.install: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 21/25: never attempt to compress .ogg files
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager. commit 94046f48ac4bc3c47611971760a088dd6f12ee06 Author: Alexandre Detiste alexandre.deti...@gmail.com Date: Sat Jan 31 22:47:29 2015 +0100 never attempt to compress .ogg files case: quake-music_40_all.deb 88304880 xz compressed 88771824 not xz compressed - less than 0.5% difference --- game_data_packager/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py index 6e6a6b1..d8d1133 100644 --- a/game_data_packager/__init__.py +++ b/game_data_packager/__init__.py @@ -2212,7 +2212,7 @@ class GameData(object): # only compress if the caller says we should and the YAML # says it's worthwhile -if compress and self.compress_deb: +if compress and self.compress_deb and not package.rip_cd: dpkg_deb_args = [] else: dpkg_deb_args = ['-Znone'] -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[game-data-packager] 17/25: add support for Hexen II demo
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager. commit 0aaffc7cf66f4376249b1853ee8d667e13a94b38 Author: Alexandre Detiste alexandre.deti...@gmail.com Date: Thu Jan 29 01:32:35 2015 +0100 add support for Hexen II demo --- data/hexen2-demo-data.copyright | 22 data/hexen2.yaml| 45 + debian/changelog| 1 + 3 files changed, 68 insertions(+) diff --git a/data/hexen2-demo-data.copyright b/data/hexen2-demo-data.copyright new file mode 100644 index 000..5bee890 --- /dev/null +++ b/data/hexen2-demo-data.copyright @@ -0,0 +1,22 @@ +The hexen2-data package was generated using game-data-packager. +Copyright © 2008-2012 Jon Dowland j...@debian.org. + +The files under /usr/share/games/hexen2 are user-supplied +files that are not covered by the copyright or licence of this +package; they are Copyright © 1997 Id Software, Activision, +Raven Software. + +The remainder of this package is covered by the following +Licence: + +This program 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; version 2 of the License. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +On Debian GNU/Linux systems, the complete text of the GNU General Public +License can be found in /usr/share/common-licenses/GPL-2. diff --git a/data/hexen2.yaml b/data/hexen2.yaml index 56e4e0a..8acd601 100644 --- a/data/hexen2.yaml +++ b/data/hexen2.yaml @@ -14,7 +14,23 @@ help_text: | Steam installations would typically be found in: C:/Program Files/Steam/steamapps/common/Hexen 2 + A demo is avaible here: + http://www.fileplanet.com/10770/download/Hexen-II---Demo + packages: + hexen2-demo-data: +longname: Hexen II (demo) +demo_for: hexen2-data +debian: + engine: uhexen2 | hexen2-engine + conflicts: hexen2-data +install_to: usr/share/games/hexen2 +install: +- data1/pak0.pak_demo +optional: +- HEXEN II SUBLICENSE.doc +# Word 6 .doc, can be translated with antiword + hexen2-data: longname: Hexen II debian: @@ -53,12 +69,35 @@ files: unpack: format: tar.gz + h2demoupd.exe: +unpack: + format: zip +provides: +- data1/pak0.pak_demo +- HEXEN II SUBLICENSE.doc + + data1/pak0.pak_demo: +look_for: [data1/pak0.pak] +install_as: data1/pak0.pak + + HEXEN II SUBLICENSE.doc: +install_to: $docdir +install_as: hexen_II_sublicense.doc + +cksums: | + 1099843119 27750257 data1/pak0.pak_demo + _ 30208HEXEN II SUBLICENSE.doc + _ 15334912 h2demoupd.exe + md5sums: | c9675191e75dd25a3b9ed81ee7e05eff data1/pak0.pak c2ac5b0640773eed9ebe1cda2eca2ad0 data1/pak1.pak 77ae298dd0dcd16ab12f4a68067ff2c3 portals/pak3.pak 88109ee385d9723ac5f1015e034a44dd hw/pak4.pak 9ac598a80765daa0862893bd0aac765a hexenworld-pakfiles-0.15.tgz + 8e598d82bf53436ed7a0e133aa4b9f09 data1/pak0.pak_demo + f610eb93304c4cd2cdce97bdb9140e4e HEXEN II SUBLICENSE.doc + d058ecd35e419a5b8bdf17003a006843 h2demoupd.exe sha1sums: | 7c6b19d76ce85771026ea8dbdc397cd1109355b7 data1/pak0.pak @@ -66,6 +105,9 @@ sha1sums: | 84aaba667060e1f9c50fb4d140fb301ac7e81cb7 portals/pak3.pak b21ecc51b15785b7d468dd353bce67cc13e7615a hw/pak4.pak a7600b80b4205788b64fb57191e194c28b55b522 hexenworld-pakfiles-0.15.tgz + a8cfd8790819c47998141adb97c14d1680cf8738 data1/pak0.pak_demo + 1aadeaf00dc72726e03bcfeb2fa0af93107852a7 HEXEN II SUBLICENSE.doc + dcb5ab7c92352a8af4975151bd089354723d9417 h2demoupd.exe sha256sums: | 57936acc4cd9abed7acb480dd9c6d59c7c98e96e4eca4e2d04f390d2dfa5ffde data1/pak0.pak @@ -73,6 +115,9 @@ sha256sums: | f5f53e360d49af9d7f8bd3b136a0ebab70e9ddcace13cf8aa5e182d986a0a48c portals/pak3.pak 140664a9a1c0b38d1dd9fc7cd1b9b051e0132d33ed5bf17117c1fc831eea0741 hw/pak4.pak 49462cdf984deee7350d03c7d192d1c34d682647ffc9d06de4308e0a7c71c4d9 hexenworld-pakfiles-0.15.tgz + 0d4aa01a9909771dfa8e5be27db5d6628dc92f1406998c1a89c27d4748aaf151 data1/pak0.pak_demo + b9841c4b9c2de220d393ab06650779782cdb905f4721367607abf1dd56316da4 HEXEN II SUBLICENSE.doc + b349824ba09ddf0e95ca8a0f1783640d745c560b67da20a9cc31d1e816e63ab8 h2demoupd.exe ... # vim:set sw=2 sts=2 et: diff --git a/debian/changelog b/debian/changelog index 8290212..279434e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ game-data-packager (40) UNRELEASED; urgency=medium * theme-hospital: add support (Closes: #776150); the engine corsix-th still needs to be packaged (RFP: #610087) * add Descent 1 demo Descent 2 demo (part of #775442) + * add
[game-data-packager] 19/25: descent1: add optional high-res pack
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager. commit 7ce49394fab1c555a2c11e16700780c56150fb4e Author: Alexandre Detiste alexandre.deti...@gmail.com Date: Fri Jan 30 09:37:32 2015 +0100 descent1: add optional high-res pack --- data/descent1.yaml | 13 + 1 file changed, 13 insertions(+) diff --git a/data/descent1.yaml b/data/descent1.yaml index 3b54d4d..ef71a4b 100644 --- a/data/descent1.yaml +++ b/data/descent1.yaml @@ -15,6 +15,7 @@ packages: optional: - readme.txt - refcard.txt +- d1xr-hires.dxa install_to: usr/share/games/d1x-rebirth/ descent1-full-data: @@ -25,6 +26,8 @@ packages: install: - descent.hog_full - descent.pig_full +optional: +- d1xr-hires.dxa install_to: usr/share/games/d1x-rebirth/ files: @@ -47,6 +50,11 @@ files: - descent.pig - readme.txt - refcard.txt + + d1xr-hires.dxa: +download: http://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa +provides: +- d1xr-hires.dxa descent.hog_full: install_as: descent.hog @@ -90,6 +98,8 @@ cksums: | _ 1416672 descent.pig_part1 # part 2 size include part1 _ 5092871 descent.pig_part2 + # extensions + _ 1426884 d1xr-hires.dxa md5sums: | cf1caf9c7a0681de80fac8cb593b33eb descent.hog @@ -103,6 +113,7 @@ md5sums: | c36ccd1f35841403a68a8359eb2a01d5 desc14sw.exe c60e75c7f1f4fa5f9000710a501dcb76 descent1.sow 90d2cd03b8b6b2ec44ad3390416ee1cc descent2.sow + 7d978ce3875995e54cbf426167e88b94 d1xr-hires.dxa sha1sums: | 6d45c6c49e085158af990dcb2985ebe079122f0c descent.hog c1be2e728c8cdfb03e3fcaab870b7a6b01e016ba descent.pig @@ -112,6 +123,7 @@ sha1sums: | 0364a8280b8c10ccab009cf7ab8bb64ab6c27d90 desc14sw.exe 3913a034ff4a2c98ab6564788d05c7532a1488a5 descent1.sow 08a259fdd27acc8c2be9943dee619479aa767369 descent2.sow + 0a86f9d74caf8f5ea419a5764f0af976e8d57e09 d1xr-hires.dxa sha256sums: | 26d1e31e7709dfe6dddf17ccd37f5c82e866dce49a0faf07e90ba3213b288eab descent.hog b67865e513452a35887a20270d17fdfb5af1a2edaaae247bc523489f1d84f9ac descent.pig @@ -121,4 +133,5 @@ sha256sums: | 3dadb7fbc01efce2904d0908c55d9a9cf1f402e83bf771970552efaca15efcb0 desc14sw.exe cee9ee57fbd1af8e08d3cd0b409cc1fa4a9d44c7bbced3f28669be98ae45721c descent1.sow 669dc44c9f5b4b4061f698488341fb9540e409b35f6da7ce6b9eeba53c1c001f descent2.sow + b30a164fa9c6dff05eda6d50f77df843968d32053f5cc9453fe89d5bed19 d1xr-hires.dxa ... -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quake] annotated tag debian/10 created (now 3e8057d)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to annotated tag debian/10 in repository quake. at 3e8057d (tag) tagging b4b43ed7852cdf6f5f6f8959dce98a8c1402de6a (commit) replaces debian/9 tagged by Simon McVittie on Wed Feb 4 11:06:38 2015 + - Log - quake Debian release 10 Simon McVittie (14): quake3: prefer /usr/lib/quake/* as fs_basepath, and support the demo Standards-Version 3.9.6 (no changes) control: mention Quake 3 demo data Simplify advice on obtaining game data, and point to game-data-packager's new declarative data files for checksums and exact sizes (Closes: #762823) quake2: execute debian_server.cfg again, reverting a change from v9 quake3: modify quake3-server configuration quake, quake3: remove support for START_DAEMON Modify quake*-server configuration quake-server, quake2-server: if no data, exit 72 like quake3-server does add native systemd units add optional instanced systemd units for multiple servers per machine Document the new server setup deny capabilities to all services prepare release --- This annotated tag includes the following new commits: new 0f76721 quake2: execute debian_server.cfg again, reverting a change from v9 new 2f29ad4 quake3: modify quake3-server configuration new d5de848 quake, quake3: remove support for START_DAEMON new ad77dd7 Modify quake*-server configuration new f11f897 quake-server, quake2-server: if no data, exit 72 like quake3-server does new 8d58baa add native systemd units new 940fad6 add optional instanced systemd units for multiple servers per machine new 3ae15ec Document the new server setup new 5aad614 deny capabilities to all services new b4b43ed prepare release The 10 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quake.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[ioquake3] 01/01: prepare release
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian-experimental in repository ioquake3. commit d29d782db6998061d38b8544b78ede10f48ab498 Author: Simon McVittie s...@debian.org Date: Wed Feb 4 10:18:16 2015 + prepare release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d654f53..ab70843 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ioquake3 (1.36+u20150114+dfsg1-1) UNRELEASED; urgency=medium +ioquake3 (1.36+u20150114+dfsg1-1) experimental; urgency=low * New upstream snapshot * Remove debian/source/local-options, dpkg-source behaves sensibly @@ -15,7 +15,7 @@ ioquake3 (1.36+u20150114+dfsg1-1) UNRELEASED; urgency=medium 1 megabyte, which is tiny compared with the game data) so it can share the compiled qagame modules - -- Simon McVittie s...@debian.org Wed, 31 Dec 2014 11:36:48 + + -- Simon McVittie s...@debian.org Wed, 04 Feb 2015 10:17:51 + ioquake3 (1.36+u20140929+g918eed9+dfsg1-1) experimental; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quake] 03/10: quake, quake3: remove support for START_DAEMON
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository quake.
commit d5de8485f7ebeb61e5d86e7ede44d4c2a66b379a
Author: Simon McVittie s...@debian.org
Date: Mon Jan 26 10:36:56 2015 +
quake, quake3: remove support for START_DAEMON
- if the server was previously disabled via START_DAEMON,
do a one-time migration to update-rc.d $SERVICE disable
---
debian/changelog | 8 +--
debian/quake-server.README.Debian | 7 ---
debian/quake-server.default| 8 +--
debian/quake-server.init | 9
debian/quake-server.lintian-overrides | 2 +
debian/quake-server.preinst| 85 +++
debian/quake3-server.README.Debian | 8 ---
debian/quake3-server.default | 4 +-
debian/quake3-server.init | 15 --
debian/quake3-server.lintian-overrides | 2 +
debian/quake3-server.preinst | 93 +-
11 files changed, 180 insertions(+), 61 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 78b1c9f..e0e19f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,12 @@ quake (10) UNRELEASED; urgency=medium
* quake2: execute debian_server.cfg again, reverting a change from v9.
Unlike quake and quake3, quake2's default configuration file is named
debian_server.cfg, and the demo and full game have different versions.
+ * quake, quake3: remove support for START_DAEMON
+- if the server was previously disabled via START_DAEMON,
+ do a one-time migration to update-rc.d $SERVICE disable
* quake3: modify quake3-server configuration
-- remove START_DAEMON from /etc/default/quake3-server
-- put defaults for START_DAEMON and DAEMON_OPTS in
- /etc/init.d/quake3-server so it can operate without /e/d/q3-s
+- put default for DAEMON_OPTS in /etc/init.d/quake3-server so it can
+ operate without /e/d/q3-s
* quake3: prefer to load game data from /usr/lib/quake3/base
or /usr/lib/quake3/ta, where ioquake3 can provide native-code game modules
- this requires ioquake3 (= 1.36+u20150114+dfsg1-1~) and
diff --git a/debian/quake-server.README.Debian
b/debian/quake-server.README.Debian
index 52d8313..7ed4760 100644
--- a/debian/quake-server.README.Debian
+++ b/debian/quake-server.README.Debian
@@ -46,13 +46,6 @@ and update-rc.d(8) commands like
which should work for all of Debian's supported init systems.
-Disabling the init script
--
-
-To disable the init script, use update-rc.d as described above.
-Changing the value of the START_DAEMON variable in
-/etc/default/quake-server is deprecated and should not be used.
-
Running the server with cron and screen
---
diff --git a/debian/quake-server.default b/debian/quake-server.default
index 04e0485..5b5b7b7 100644
--- a/debian/quake-server.default
+++ b/debian/quake-server.default
@@ -2,10 +2,10 @@
# sourced by /etc/init.d/quake-server
# installed at /etc/default/quake-server by the maintainer scripts
-# Setting this to any value other than 1 is deprecated. If you want to
-# disable the server, please use update-rc.d quake-server disable instead.
-START_DAEMON=1
-
# Additional options that are passed to the daemon.
# For most options it's better to edit server.cfg instead.
DAEMON_OPTS=+exec etc/quake-server/server.cfg
+
+# To disable the server, please use the normal mechanisms provided by init:
+# update-rc.d quake-server disable. The START_DAEMON variable is no
+# longer supported.
diff --git a/debian/quake-server.init b/debian/quake-server.init
index d616ed3..42c4511 100644
--- a/debian/quake-server.init
+++ b/debian/quake-server.init
@@ -26,19 +26,10 @@ if [ -f /etc/default/$NAME ] ; then
. /etc/default/$NAME
fi
-if [ x$START_DAEMON != x1 ]; then
-echo Disabling $NAME via START_DAEMON in /etc/default/$NAME is
deprecated. 2
-echo Please use \update-rc.d $NAME disable\ instead 2
-fi
-
do_start() {
if [ -f $PIDFILE ]; then
return 2
fi
-if [ $START_DAEMON != 1 ]; then
-echo -n (not starting - disabled in /etc/default/$NAME)
-return 0
-fi
start-stop-daemon --start --quiet --pidfile $PIDFILE --oknodo \
--background --exec $BINARY --startas $DAEMON \
--make-pidfile --chuid $USER \
diff --git a/debian/quake-server.lintian-overrides
b/debian/quake-server.lintian-overrides
index 4902b52..d0cd847 100644
--- a/debian/quake-server.lintian-overrides
+++ b/debian/quake-server.lintian-overrides
@@ -1,2 +1,4 @@
# verbatim quote
quake-server binary: spelling-error-in-copyright ment meant
+# it's update-rc.d disable not update-rc.d defaults
+quake-server binary: preinst-calls-updaterc.d quake-server
diff --git a/debian/quake-server.preinst b/debian/quake-server.preinst
new file mode 100644
index 000..1a5d223
--- /dev/null
+++
[ioquake3] annotated tag debian/1.36+u20150114+dfsg1-1 created (now 8980ebf)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to annotated tag debian/1.36+u20150114+dfsg1-1 in repository ioquake3. at 8980ebf (tag) tagging d29d782db6998061d38b8544b78ede10f48ab498 (commit) replaces debian/1.36+u20140929+g918eed9+dfsg1-1 tagged by Simon McVittie on Wed Feb 4 11:07:03 2015 + - Log - ioquake3 Debian release 1.36+u20150114+dfsg1-1 Simon McVittie (12): New upstream snapshot Remove debian/source/local-options, dpkg-source behaves sensibly on its own (unapplies patches iff they were initially applied) Standards-Version: 3.9.6 (no changes) Mangle upstream version correctly in watch file mark patches with forwardedness Imported Upstream version 1.36+u20150114+dfsg1 New upstream snapshot Add patch so the UI can see whether we're playing the demo q3arch: add support for the modified architecture string used by iortcw README.Debian: update instructions for integrating new games to point to src:openarena and src:quake as examples Install symlinks to native-code cgame, qagame and ui modules for quake3 prepare release --- This annotated tag includes the following new commits: new d29d782 prepare release The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quake] 06/10: add native systemd units
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository quake. commit 8d58baa9b2359bab8353f0a248443a7b9ba90b0e Author: Simon McVittie s...@debian.org Date: Mon Jan 26 11:21:14 2015 + add native systemd units --- debian/changelog | 1 + debian/control | 4 +++- debian/quake-server.service | 21 + debian/quake2-server.service | 21 + debian/quake3-server.service | 21 + debian/rules | 2 +- 6 files changed, 68 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e0fc8dc..a106f4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ quake (10) UNRELEASED; urgency=medium - put default for DAEMON_OPTS in /etc/init.d/quake*-server so it can operate without /etc/default/quake*-server - +exec etc/quake*-server/server.cfg is no longer part of DAEMON_OPTS +- add native systemd units * quake3: prefer to load game data from /usr/lib/quake3/base or /usr/lib/quake3/ta, where ioquake3 can provide native-code game modules - this requires ioquake3 (= 1.36+u20150114+dfsg1-1~) and diff --git a/debian/control b/debian/control index 0a59130..18b40af 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,9 @@ Uploaders: David Banks amoe...@gmail.com, Jack Coulter jsci...@gmail.com Section: contrib/games Priority: optional -Build-Depends: debhelper (= 9) +Build-Depends: + debhelper (= 9), + dh-systemd, Build-Depends-Indep: imagemagick, inkscape, xcftools, diff --git a/debian/quake-server.service b/debian/quake-server.service new file mode 100644 index 000..55895c4 --- /dev/null +++ b/debian/quake-server.service @@ -0,0 +1,21 @@ +[Unit] +Description=Quake game server +After=network.target + +[Service] +Type=simple +User=quake-server +Environment=DAEMON_OPTS= +EnvironmentFile=-/etc/default/quake-server +ExecStart=/usr/games/quake-server $DAEMON_OPTS +exec etc/quake-server/server.cfg +Restart=on-failure +RestartPreventExitStatus=72 +# hardening +NoNewPrivileges=true +PrivateDevices=true +PrivateTmp=true +ProtectHome=true +ProtectSystem=full + +[Install] +WantedBy=multi-user.target diff --git a/debian/quake2-server.service b/debian/quake2-server.service new file mode 100644 index 000..1284c7d --- /dev/null +++ b/debian/quake2-server.service @@ -0,0 +1,21 @@ +[Unit] +Description=Quake II game server +After=network.target + +[Service] +Type=simple +User=quake2-server +Environment=DAEMON_OPTS= +EnvironmentFile=-/etc/default/quake2-server +ExecStart=/usr/games/quake2-server $DAEMON_OPTS +exec debian_server.cfg +Restart=on-failure +RestartPreventExitStatus=72 +# hardening +NoNewPrivileges=true +PrivateDevices=true +PrivateTmp=true +ProtectHome=true +ProtectSystem=full + +[Install] +WantedBy=multi-user.target diff --git a/debian/quake3-server.service b/debian/quake3-server.service new file mode 100644 index 000..e8e2364 --- /dev/null +++ b/debian/quake3-server.service @@ -0,0 +1,21 @@ +[Unit] +Description=Quake III Arena game server +After=network.target + +[Service] +Type=simple +User=Debian-quake3 +Environment=DAEMON_OPTS= +EnvironmentFile=-/etc/default/quake3-server +ExecStart=/usr/games/quake3-server +set com_homepath server.q3a $DAEMON_OPTS +exec etc/quake3-server/server.cfg +Restart=on-failure +RestartPreventExitStatus=72 +# hardening +NoNewPrivileges=true +PrivateDevices=true +PrivateTmp=true +ProtectHome=true +ProtectSystem=full + +[Install] +WantedBy=multi-user.target diff --git a/debian/rules b/debian/rules index 2d33f6a..d1decc8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,4 @@ #!/usr/bin/make -f %: - dh $@ + dh $@ --with=systemd -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quake.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quake] 05/10: quake-server, quake2-server: if no data, exit 72 like quake3-server does
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository quake.
commit f11f8973f3ade0ffc253c82a58ad6f012ea9105e
Author: Simon McVittie s...@debian.org
Date: Mon Jan 26 10:55:59 2015 +
quake-server, quake2-server: if no data, exit 72 like quake3-server does
---
debian/changelog | 1 +
quake.in | 3 ++-
quake2.in| 3 ++-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f8a0460..e0fc8dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ quake (10) UNRELEASED; urgency=medium
* Simplify advice on obtaining game data, and point to
game-data-packager's new declarative data files for checksums and
exact sizes (Closes: #762823)
+ * quake-server, quake2-server: if no data, exit 72 like quake3-server does
-- Simon McVittie s...@debian.org Thu, 22 Jan 2015 23:48:36 +
diff --git a/quake.in b/quake.in
index fb435ab..066ad59 100644
--- a/quake.in
+++ b/quake.in
@@ -39,7 +39,8 @@ main() {
if ! [ -f ${data_location}/id1/pak0.pak ]; then
if test ${role} = server; then
-echo $no_data_msg
+echo $no_data_msg 2
+exit 72# EX_OSFILE
else
exec $data_location/need-data.sh $no_data_title $no_data_msg
fi
diff --git a/quake2.in b/quake2.in
index 082a1e5..a4d5ef1 100644
--- a/quake2.in
+++ b/quake2.in
@@ -49,7 +49,8 @@ main() {
if ! [ -f ${use_data_location}/baseq2/pak0.pak ]; then
if test ${role} = server; then
-echo $no_data_msg
+echo $no_data_msg 2
+exit 72# EX_OSFILE
else
exec $data_location/need-data.sh $no_data_title $no_data_msg
fi
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/quake.git
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quake] 01/10: quake2: execute debian_server.cfg again, reverting a change from v9
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository quake. commit 0f76721c9aa3a544458ea66bdd60ee6591863187 Author: Simon McVittie s...@debian.org Date: Mon Jan 26 11:14:54 2015 + quake2: execute debian_server.cfg again, reverting a change from v9 Unlike quake and quake3, quake2's default configuration file is named debian_server.cfg, and the demo and full game have different versions. --- debian/changelog | 3 +++ debian/quake2-server.README.Debian | 9 ++--- debian/quake2-server.default | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index c96efff..3ce3764 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ quake (10) UNRELEASED; urgency=medium + * quake2: execute debian_server.cfg again, reverting a change from v9. +Unlike quake and quake3, quake2's default configuration file is named +debian_server.cfg, and the demo and full game have different versions. * quake3: prefer to load game data from /usr/lib/quake3/base or /usr/lib/quake3/ta, where ioquake3 can provide native-code game modules - this requires ioquake3 (= 1.36+u20150114+dfsg1-1~) and diff --git a/debian/quake2-server.README.Debian b/debian/quake2-server.README.Debian index 7298b5c..832a35c 100644 --- a/debian/quake2-server.README.Debian +++ b/debian/quake2-server.README.Debian @@ -30,11 +30,14 @@ can find Quake files in /var/games/quake2-server/.yq2 or similar. The /etc/quake2-server directory is symlinked into the game engine's search path as etc/quake2-server, so you can place files there and execute them with commands like exec etc/quake2-server/ctf.cfg. -By default, the init script will use etc/quake2-server/server.cfg. + +In addition, debian_server.cfg in the engine's search path is also a symlink +to either /etc/quake2-server/debian_server.cfg or +/etc/quake2-server/demo/debian_server.cfg, depending whether you +are using the demo data or the full game. By default, the init script will +execute debian_server.cfg. For compatibility with older versions of the quake-server package, -debian_server.cfg in the engine's search path is also a symlink to -etc/quake2-server/server.cfg. The server can be managed in the usual way, e.g. via service(8) and update-rc.d(8) commands like diff --git a/debian/quake2-server.default b/debian/quake2-server.default index 3b21382..69849bb 100644 --- a/debian/quake2-server.default +++ b/debian/quake2-server.default @@ -3,5 +3,5 @@ # installed at /etc/default/quake2-server by the maintainer scripts # Additional options that are passed to the daemon. -# For most options it's better to edit server.cfg instead. -DAEMON_OPTS=+exec etc/quake2-server/server.cfg +# For most options it's better to edit debian_server.cfg instead. +DAEMON_OPTS=+exec debian_server.cfg -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quake.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quake] branch master updated (f6c3411 - b4b43ed)
This is an automated email from the git hooks/post-receive script. smcv pushed a change to branch master in repository quake. from f6c3411 Simplify advice on obtaining game data, and point to game-data-packager's new declarative data files for checksums and exact sizes (Closes: #762823) new 0f76721 quake2: execute debian_server.cfg again, reverting a change from v9 new 2f29ad4 quake3: modify quake3-server configuration new d5de848 quake, quake3: remove support for START_DAEMON new ad77dd7 Modify quake*-server configuration new f11f897 quake-server, quake2-server: if no data, exit 72 like quake3-server does new 8d58baa add native systemd units new 940fad6 add optional instanced systemd units for multiple servers per machine new 3ae15ec Document the new server setup new 5aad614 deny capabilities to all services new b4b43ed prepare release The 10 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 19 +- debian/control | 4 +- debian/copyright | 2 +- debian/q3/server.cfg | 12 +++- debian/quake-server.NEWS | 20 ++ debian/quake-server.README.Debian | 70 ++-- debian/quake-server.default| 15 +++-- debian/quake-server.init | 14 ++-- debian/quake-server.install| 1 + debian/quake-server.lintian-overrides | 2 + debian/quake-server.preinst| 85 + debian/quake-server.service| 24 +++ debian/quake-server@.service | 23 +++ debian/quake2-server.NEWS | 17 + debian/quake2-server.README.Debian | 94 ++- debian/quake2-server.default | 10 ++- debian/quake2-server.init | 4 +- debian/quake2-server.install | 1 + debian/quake2-server.service | 25 debian/quake2-server@.service | 23 +++ debian/quake3-server.NEWS | 21 ++ debian/quake3-server.README.Debian | 113 + debian/quake3-server.default | 16 +++-- debian/quake3-server.init | 19 ++ debian/quake3-server.install | 1 + debian/quake3-server.lintian-overrides | 2 + debian/quake3-server.preinst | 93 +++ debian/quake3-server.service | 25 debian/quake3-server@.service | 22 +++ debian/rules | 2 +- quake.in | 3 +- quake2.in | 3 +- 32 files changed, 613 insertions(+), 172 deletions(-) create mode 100644 debian/quake-server.NEWS create mode 100644 debian/quake-server.preinst create mode 100644 debian/quake-server.service create mode 100644 debian/quake-server@.service create mode 100644 debian/quake2-server.NEWS create mode 100644 debian/quake2-server.service create mode 100644 debian/quake2-server@.service create mode 100644 debian/quake3-server.service create mode 100644 debian/quake3-server@.service -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quake.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quake] 09/10: deny capabilities to all services
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository quake. commit 5aad614b3f58f1530cddeabf57dbc19bfafeb627 Author: Simon McVittie s...@debian.org Date: Mon Jan 26 23:53:38 2015 + deny capabilities to all services --- debian/quake-server.service | 1 + debian/quake-server@.service | 1 + debian/quake2-server.service | 1 + debian/quake2-server@.service | 1 + debian/quake3-server.service | 1 + debian/quake3-server@.service | 1 + 6 files changed, 6 insertions(+) diff --git a/debian/quake-server.service b/debian/quake-server.service index 135b481..458f593 100644 --- a/debian/quake-server.service +++ b/debian/quake-server.service @@ -13,6 +13,7 @@ ExecStart=/usr/games/quake-server $DAEMON_OPTS +exec etc/quake-server/server.cfg Restart=on-failure RestartPreventExitStatus=72 # hardening +CapabilityBoundingSet= NoNewPrivileges=true PrivateDevices=true PrivateTmp=true diff --git a/debian/quake-server@.service b/debian/quake-server@.service index df93bba..3aa2c7a 100644 --- a/debian/quake-server@.service +++ b/debian/quake-server@.service @@ -12,6 +12,7 @@ ExecStart=/usr/games/quake-server $DAEMON_OPTS +exec etc/quake-server/%i.cfg Restart=on-failure RestartPreventExitStatus=72 # hardening +CapabilityBoundingSet= NoNewPrivileges=true PrivateDevices=true PrivateTmp=true diff --git a/debian/quake2-server.service b/debian/quake2-server.service index d798a78..257efa2 100644 --- a/debian/quake2-server.service +++ b/debian/quake2-server.service @@ -15,6 +15,7 @@ Restart=on-failure RestartPreventExitStatus=72 # hardening NoNewPrivileges=true +CapabilityBoundingSet= PrivateDevices=true PrivateTmp=true ProtectHome=true diff --git a/debian/quake2-server@.service b/debian/quake2-server@.service index e02c2cf..2f8d114 100644 --- a/debian/quake2-server@.service +++ b/debian/quake2-server@.service @@ -12,6 +12,7 @@ ExecStart=/usr/games/quake2-server $DAEMON_OPTS +exec etc/quake2-server/%i.cfg Restart=on-failure RestartPreventExitStatus=72 # hardening +CapabilityBoundingSet= NoNewPrivileges=true PrivateDevices=true PrivateTmp=true diff --git a/debian/quake3-server.service b/debian/quake3-server.service index 6ed9205..d291c78 100644 --- a/debian/quake3-server.service +++ b/debian/quake3-server.service @@ -14,6 +14,7 @@ ExecStart=/usr/games/quake3-server +set com_homepath server.q3a $DAEMON_OPTS +ex Restart=on-failure RestartPreventExitStatus=72 # hardening +CapabilityBoundingSet= NoNewPrivileges=true PrivateDevices=true PrivateTmp=true diff --git a/debian/quake3-server@.service b/debian/quake3-server@.service index 842f0c0..c31cf43 100644 --- a/debian/quake3-server@.service +++ b/debian/quake3-server@.service @@ -11,6 +11,7 @@ ExecStart=/usr/games/quake3-server +set com_homepath %i.q3a $DAEMON_OPTS +exec e Restart=on-failure RestartPreventExitStatus=72 # hardening +CapabilityBoundingSet= NoNewPrivileges=true PrivateDevices=true PrivateTmp=true -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quake.git ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
[quake] 08/10: Document the new server setup
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository quake. commit 3ae15ecd412733effd2f6f29577c62330f0aab69 Author: Simon McVittie s...@debian.org Date: Mon Jan 26 12:03:03 2015 + Document the new server setup --- debian/q3/server.cfg | 12 - debian/quake-server.NEWS | 20 +++ debian/quake-server.README.Debian | 63 -- debian/quake2-server.NEWS | 17 ++ debian/quake2-server.README.Debian | 85 -- debian/quake3-server.NEWS | 21 debian/quake3-server.README.Debian | 105 + 7 files changed, 232 insertions(+), 91 deletions(-) diff --git a/debian/q3/server.cfg b/debian/q3/server.cfg index 44cf164..8b7fd9b 100644 --- a/debian/q3/server.cfg +++ b/debian/q3/server.cfg @@ -3,8 +3,13 @@ // The Quake III Arena data includes some more elaborate examples: // // apt-get install unzip -// unzip /usr/share/games/quake3/baseq3/pak0.pk3 \ +// unzip /usr/lib/quake3/base/baseq3/pak0.pk3 \ // ctf.config ffa.config teamplay.config tourney.config gamecycle.config +// +// and if you have Quake III: Team Arena (see README.Debian), +// +// unzip /usr/lib/quake3/ta/missionpack/pak0.pk3 \ +// small_maps.cfg large_maps.cfg terrain_maps.cfg // set dedicated to 2 (default is 1) to advertise your server in the global // server list @@ -15,7 +20,7 @@ // You can use the exec command to run one of the example configurations // mentioned above or your own configuration file placed in -// /var/games/quake3-server/.q3a/baseq3, or comment out this line and +// /var/games/quake3-server/INSTANCE.q3a/baseq3, or comment out this line and // add your own configuration below exec ffa.config @@ -24,6 +29,9 @@ exec ffa.config // 1 = tournament 1-on-1 // 3 = team deathmatch // 4 = CTF +// 5 = one-flag CTF (Team Arena only) +// 6 = Obelisk (Team Arena only) +// 7 = Harvester (Team Arena only) //g_gametype 0 // Start this map first diff --git a/debian/quake-server.NEWS b/debian/quake-server.NEWS new file mode 100644 index 000..db91d36 --- /dev/null +++ b/debian/quake-server.NEWS @@ -0,0 +1,20 @@ +quake-server (10) experimental; urgency=medium + + quake-server configuration has changed significantly in this version. + + The DAEMON_OPTS variable in /etc/default/quake-server no longer + contains a configurable +exec command. /etc/quake-server/server.cfg + will always be executed in addition to whatever is specified in + DAEMON_OPTS, and the default DAEMON_OPTS is now empty. + + The START_DAEMON variable in /etc/default/quake-server is no longer + supported. If quake-server was previously disabled via START_DAEMON, + upgrading to this version will run update-rc.d quake-server disable + to disable it in the correct way. + + systemd users can now enable additional instances of the server, + quake-server@INSTANCE.service, which use /etc/default/quake-server@INSTANCE + and /etc/quake-server/INSTANCE.cfg instead. + See /usr/share/doc/quake-server/README.Debian for details. + + -- Simon McVittie s...@debian.org Fri, 23 Jan 2015 09:42:55 + diff --git a/debian/quake-server.README.Debian b/debian/quake-server.README.Debian index 7ed4760..1629daf 100644 --- a/debian/quake-server.README.Debian +++ b/debian/quake-server.README.Debian @@ -15,8 +15,8 @@ including the sizes and checksums of the required files. The shareware episode of Quake is freely downloadable and can also be packaged using game-data-packager. -Running the server via the init script --- +Running one server instance +--- By default, quake-server adds a user under which to run the dedicated server (quake-server) and sets it up to be run by an init script in the conventional @@ -36,6 +36,9 @@ For compatibility with older versions of the quake-server package, debian_server.cfg in the engine's search path is also a symlink to etc/quake-server/server.cfg. +To set command-line options, such as the network port or the mission pack +to play, set DAEMON_OPTS in /etc/default/quake-server. + The server can be managed in the usual way, e.g. via service(8) and update-rc.d(8) commands like @@ -46,28 +49,34 @@ and update-rc.d(8) commands like which should work for all of Debian's supported init systems. -Running the server with cron and screen - -One alternative way to run the server is to run it in a screen(1) session -from a cron @reboot action. This can be used to run multiple instances -of the server; you'll need to set a different port number on each server after -the first, and it's safest to give each server a unique home directory so they -don't overwrite each other's configuration files. - -To do this, you could put something like this in the quake-server user's -crontab (don't break the long lines!): - -
