[game-data-packager] 35/39: Switch Hexen II to YAML style, and add support for the Portal of Praevus expansion and the HexenWorld addon.
Simon McVittie
smcv at debian.org
Sun Jan 11 01:52:24 UTC 2015
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 de913e01ae1ac7bf31c88a4617675262b27677d3
Author: Simon McVittie <smcv at debian.org>
Date: Sun Jan 11 01:37:01 2015 +0000
Switch Hexen II to YAML style, and add support for the Portal of Praevus expansion and the HexenWorld addon.
---
Makefile | 2 -
.../control.in => data/hexen2-data.control.in | 8 +--
.../copyright.in => data/hexen2-data.copyright | 2 +-
data/hexen2-hexenworld-data.control.in | 18 ++++++
.../hexen2-hexenworld-data.copyright | 6 +-
data/hexen2-portals-data.control.in | 18 ++++++
.../hexen2-portals-data.copyright | 6 +-
data/hexen2.yaml | 71 ++++++++++++++++++++++
debian/changelog | 2 +
hexen2.mk | 48 ---------------
supported/hexen2 | 29 +--------
11 files changed, 121 insertions(+), 89 deletions(-)
diff --git a/Makefile b/Makefile
index b3903a2..8e2bdce 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,6 @@ default: $(DIRS)
make -f quake2.mk VERSION=$(VERSION) PACKAGE=quake2-music
make -f quake2.mk VERSION=$(VERSION) PACKAGE=quake2-xatrix
make -f quake2.mk VERSION=$(VERSION) PACKAGE=quake2-rogue
- make -f hexen2.mk VERSION=$(VERSION)
make -f rott.mk VERSION=$(VERSION)
make -f wolf3d.mk VERSION=$(VERSION)
make -f lgeneral.mk LONG="LGeneral" VERSION=$(VERSION)
@@ -91,7 +90,6 @@ clean:
make -f quake2.mk VERSION=$(VERSION) PACKAGE=quake2-music clean
make -f quake2.mk VERSION=$(VERSION) PACKAGE=quake2-xatrix clean
make -f quake2.mk VERSION=$(VERSION) PACKAGE=quake2-rogue clean
- make -f hexen2.mk VERSION=$(VERSION) clean
make -f rott.mk VERSION=$(VERSION) clean
make -f wolf3d.mk VERSION=$(VERSION) clean
make -f lgeneral.mk LONG="LGeneral" VERSION=$(VERSION) clean
diff --git a/hexen2-data/DEBIAN/control.in b/data/hexen2-data.control.in
similarity index 60%
rename from hexen2-data/DEBIAN/control.in
rename to data/hexen2-data.control.in
index d045cd1..29a449d 100644
--- a/hexen2-data/DEBIAN/control.in
+++ b/data/hexen2-data.control.in
@@ -7,11 +7,11 @@ Multi-Arch: foreign
Recommends: hexen2-engine
Installed-Size: 500000
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Description: Hexen 2 commercial data files
- Hexen 2 requires an engine and game data to play. This package contains
- the commercial data from Raven Software's game "LONG",
+Description: Hexen II commercial data files
+ Hexen II requires an engine and game data to play. This package contains
+ the commercial data from Raven Software's game Hexen II,
and was generated using the "game-data-packager" program from the Debian
package of the same name.
.
- To play Hexen using this data, install a package providing the
+ To play Hexen II using this data, install a package providing the
"hexen2-engine" virtual package.
diff --git a/hexen2-data/copyright.in b/data/hexen2-data.copyright
similarity index 93%
copy from hexen2-data/copyright.in
copy to data/hexen2-data.copyright
index ffdb5d3..5bee890 100644
--- a/hexen2-data/copyright.in
+++ b/data/hexen2-data.copyright
@@ -1,4 +1,4 @@
-The PACKAGE package was generated using game-data-packager.
+The hexen2-data package was generated using game-data-packager.
Copyright © 2008-2012 Jon Dowland <jmtd at debian.org>.
The files under "/usr/share/games/hexen2" are user-supplied
diff --git a/data/hexen2-hexenworld-data.control.in b/data/hexen2-hexenworld-data.control.in
new file mode 100644
index 0000000..a2dae96
--- /dev/null
+++ b/data/hexen2-hexenworld-data.control.in
@@ -0,0 +1,18 @@
+Package: hexen2-hexenworld-data
+Version: VERSION
+Section: non-free/games
+Priority: optional
+Architecture: all
+Multi-Arch: foreign
+Depends: hexen2-data
+Recommends: hexen2-engine
+Installed-Size: 500000
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Description: Hexen II: HexenWorld
+ Hexen II requires an engine and game data to play. This package contains
+ the commercial data from HexenWorld, the multiplayer module for Hexen II,
+ and was generated using the "game-data-packager" program from
+ the Debian package of the same name.
+ .
+ To play Hexen II using this data, install a package providing the
+ "hexen2-engine" virtual package.
diff --git a/hexen2-data/copyright.in b/data/hexen2-hexenworld-data.copyright
similarity index 78%
copy from hexen2-data/copyright.in
copy to data/hexen2-hexenworld-data.copyright
index ffdb5d3..254bfd5 100644
--- a/hexen2-data/copyright.in
+++ b/data/hexen2-hexenworld-data.copyright
@@ -1,9 +1,9 @@
-The PACKAGE package was generated using game-data-packager.
+The hexen2-hexenworld-data package was generated using game-data-packager.
Copyright © 2008-2012 Jon Dowland <jmtd at 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,
+files that are not covered by the copyright or licence of this
+package; they are Copyright © 1997-1998 Id Software, Activision,
Raven Software.
The remainder of this package is covered by the following
diff --git a/data/hexen2-portals-data.control.in b/data/hexen2-portals-data.control.in
new file mode 100644
index 0000000..ad14c77
--- /dev/null
+++ b/data/hexen2-portals-data.control.in
@@ -0,0 +1,18 @@
+Package: hexen2-portals-data
+Version: VERSION
+Section: non-free/games
+Priority: optional
+Architecture: all
+Multi-Arch: foreign
+Depends: hexen2-data
+Recommends: hexen2-engine
+Installed-Size: 500000
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Description: Hexen II Mission Pack: Portal of Praevus
+ Hexen II requires an engine and game data to play. This package contains
+ the commercial data from Raven Software's Hexen II Mission Pack: Portal
+ of Praevus, and was generated using the "game-data-packager" program from
+ the Debian package of the same name.
+ .
+ To play Hexen II using this data, install a package providing the
+ "hexen2-engine" virtual package.
diff --git a/hexen2-data/copyright.in b/data/hexen2-portals-data.copyright
similarity index 79%
rename from hexen2-data/copyright.in
rename to data/hexen2-portals-data.copyright
index ffdb5d3..31b29c5 100644
--- a/hexen2-data/copyright.in
+++ b/data/hexen2-portals-data.copyright
@@ -1,9 +1,9 @@
-The PACKAGE package was generated using game-data-packager.
+The hexen2-portals-data package was generated using game-data-packager.
Copyright © 2008-2012 Jon Dowland <jmtd at 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,
+files that are not covered by the copyright or licence of this
+package; they are Copyright © 1997-1998 Id Software, Activision,
Raven Software.
The remainder of this package is covered by the following
diff --git a/data/hexen2.yaml b/data/hexen2.yaml
new file mode 100644
index 0000000..ab5b4bf
--- /dev/null
+++ b/data/hexen2.yaml
@@ -0,0 +1,71 @@
+%YAML 1.2
+---
+shortname: hexen2
+longname: Hexen II
+
+help_text: |
+ For hexen2-data, you must provide the version 1.11 patched versions
+ of data1/pak0.pak and data1/pak1.pak, or a directory containing them.
+
+ For the hexen2-praevus addon pack, you must also provide portals/pak3.pak.
+
+ Hexen II is available on Steam, <http://store.steampowered.com/app/9060/>.
+ Steam installations would typically be found in:
+ C:/Program Files/Steam/steamapps/common/Hexen 2
+
+packages:
+ hexen2-data:
+ steam:
+ id: 9060
+ path: "common/Hexen 2"
+ type: full
+ install_to: usr/share/games/hexen2-data
+ install_files_from_cksums: |
+ 2912412704 22704056 data1/pak0.pak
+ 4210700438 75601170 data1/pak1.pak
+
+ hexen2-portals-data:
+ type: expansion
+ install_files_from_cksums: |
+ 1873146513 49089114 portals/pak3.pak
+
+ hexen2-hexenworld-data:
+ type: expansion
+ install_files_from_cksums: |
+ _ 10780245 hw/pak4.pak
+
+files:
+ hexenworld-pakfiles-0.15.tgz:
+ size: 4948641
+ provides:
+ - hw/pak4.pak
+ # FIXME: if we list this as downloadable, then g-d-p will download it
+ # every time we try to package something else. Downloadable expansions
+ # should be a little less enthusiastic
+ #download: http://downloads.sourceforge.net/project/uhexen2/Hexen2%20GameData/hexenworld-pakfiles/hexenworld-pakfiles-0.15.tgz?r=http%3A%2F%2Fuhexen2.sourceforge.net%2Fdownload.html
+ unpack:
+ format: tar.gz
+
+md5sums: |
+ c9675191e75dd25a3b9ed81ee7e05eff data1/pak0.pak
+ c2ac5b0640773eed9ebe1cda2eca2ad0 data1/pak1.pak
+ 77ae298dd0dcd16ab12f4a68067ff2c3 portals/pak3.pak
+ 88109ee385d9723ac5f1015e034a44dd hw/pak4.pak
+ 9ac598a80765daa0862893bd0aac765a hexenworld-pakfiles-0.15.tgz
+
+sha1sums: |
+ 7c6b19d76ce85771026ea8dbdc397cd1109355b7 data1/pak0.pak
+ 34c17f508bb6cd9ae4401307d0930a6f00761826 data1/pak1.pak
+ 84aaba667060e1f9c50fb4d140fb301ac7e81cb7 portals/pak3.pak
+ b21ecc51b15785b7d468dd353bce67cc13e7615a hw/pak4.pak
+ a7600b80b4205788b64fb57191e194c28b55b522 hexenworld-pakfiles-0.15.tgz
+
+sha256sums: |
+ 57936acc4cd9abed7acb480dd9c6d59c7c98e96e4eca4e2d04f390d2dfa5ffde data1/pak0.pak
+ 6940cc03dc731f9c19f4e8a21259d7f191bd60a7487b50ceed3f8268e0d32a56 data1/pak1.pak
+ f5f53e360d49af9d7f8bd3b136a0ebab70e9ddcace13cf8aa5e182d986a0a48c portals/pak3.pak
+ 140664a9a1c0b38d1dd9fc7cd1b9b051e0132d33ed5bf17117c1fc831eea0741 hw/pak4.pak
+ 49462cdf984deee7350d03c7d192d1c34d682647ffc9d06de4308e0a7c71c4d9 hexenworld-pakfiles-0.15.tgz
+
+...
+# vim:set sw=2 sts=2 et:
diff --git a/debian/changelog b/debian/changelog
index b221bc1..ba1c651 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ game-data-packager (39) UNRELEASED; urgency=medium
historical command-line options
* Add --demo option to all YAML games with a demo/shareware version,
which will download/create the demo even if the full game is available
+ * Switch Hexen II to YAML style, and add support for the
+ Portal of Praevus expansion and the HexenWorld addon.
-- Simon McVittie <smcv at debian.org> Mon, 05 Jan 2015 19:38:04 +0000
diff --git a/hexen2.mk b/hexen2.mk
deleted file mode 100644
index f9c42b8..0000000
--- a/hexen2.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# VERSION must be supplied by caller
-
-srcdir = $(CURDIR)
-builddir = $(CURDIR)/build
-outdir = $(CURDIR)/out
-PACKAGE=hexen2-data
-LONG=Hexen 2
-
-HEXEN2DEB = $(outdir)/$(PACKAGE)_$(VERSION)_all.deb
-
-$(HEXEN2DEB): \
- $(builddir)/$(PACKAGE)/DEBIAN/md5sums \
- $(builddir)/$(PACKAGE)/DEBIAN/control \
- fixperms
- install -d $(builddir)/$(PACKAGE)/usr/share/games/hexen2/data1
- cd $(builddir) && \
- if [ `id -u` -eq 0 ]; then \
- dpkg-deb -b $(PACKAGE) $@ ; \
- else \
- fakeroot dpkg-deb -b $(PACKAGE) $@ ; \
- fi
-
-$(builddir)/$(PACKAGE)/DEBIAN/md5sums: \
- $(builddir)/$(PACKAGE)/usr/share/doc/$(PACKAGE)/changelog.gz \
- $(builddir)/$(PACKAGE)/usr/share/doc/$(PACKAGE)/copyright
- install -d `dirname $@`
- cd $(builddir)/$(PACKAGE) && find usr/ -type f -print0 |\
- xargs -0 md5sum >DEBIAN/md5sums
-
-$(builddir)/$(PACKAGE)/usr/share/doc/$(PACKAGE)/changelog.gz: debian/changelog
- install -d `dirname $@`
- gzip -c9 debian/changelog > $@
-
-$(builddir)/$(PACKAGE)/usr/share/doc/$(PACKAGE)/copyright: hexen2-data/copyright.in
- install -d `dirname $@`
- m4 -DPACKAGE=$(PACKAGE) hexen2-data/copyright.in > $@
-
-$(builddir)/$(PACKAGE)/DEBIAN/control: hexen2-data/DEBIAN/control.in
- install -d `dirname $@`
- m4 -DVERSION=$(VERSION) -DPACKAGE=$(PACKAGE) -DLONG="$(LONG)" \
- < hexen2-data/DEBIAN/control.in > $@
-
-fixperms:
- find $(builddir)/$(PACKAGE) -type f -print0 | xargs -0 chmod 644
- find $(builddir)/$(PACKAGE) -type d -print0 | xargs -0 chmod 755
-
-clean:
- rm -rf $(HEXEN2DEB) $(builddir)/$(PACKAGE)
diff --git a/supported/hexen2 b/supported/hexen2
index e781324..2a89531 100644
--- a/supported/hexen2
+++ b/supported/hexen2
@@ -1,31 +1,4 @@
SHORTNAME=hexen2
LONGNAME="Hexen II"
-hexen2_usage() {
- echo "game-data-packager ${SHORTNAME} arguments:"
- printf "\tgame-data-packager ${SHORTNAME} path \t\tpath\t\tpath to a hexen2 directory\n"
-}
-
-go() {
- if [ $# -lt 1 ]; then
- hexen2_usage
- die "wrong number of arguments"
- fi
- dir=`unravel "$1"`
- verify_directory "$dir"
- verify_directory "$dir/data1"
- for f in pak0.pak pak1.pak; do
- verify_file "$dir/data1/$f"
- done
-
- verify_md5sum "$dir/data1/pak0.pak" c9675191e75dd25a3b9ed81ee7e05eff
- verify_md5sum "$dir/data1/pak1.pak" c2ac5b0640773eed9ebe1cda2eca2ad0
-
- DEBBASE="${SHORTNAME}-data_${GAME_PACKAGE_VERSION}_all.deb"
- DEB="$DATADIR/$DEBBASE"
- OUTFILE=`unravel "$OUTDIR"`"/$DEBBASE"
- cp -p "$DEB" "$OUTFILE"
- slipstream "$OUTFILE" "usr/share/games/hexen2/data1" \
- "$dir/data1/pak0.pak" \
- "$dir/data1/pak1.pak"
-}
+. $LIBDIR/via-python
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git
More information about the Pkg-games-commits
mailing list