[wolf4sdl] 01/01: add Apogee v1.1 (-wl6a1) as another supported variant of the game
Fabian Greffrath
fabian-guest at moszumanska.debian.org
Mon Jan 19 05:41:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
fabian-guest pushed a commit to branch master
in repository wolf4sdl.
commit ffde57ad51687079bbbfd8ce75ee3867c9648bc7
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date: Mon Jan 19 06:36:50 2015 +0100
add Apogee v1.1 (-wl6a1) as another supported variant of the game
---
debian/README.Debian | 4 ++--
debian/local/wolf4sdl | 9 +++++++++
debian/man/wolf4sdl.6 | 5 +++++
debian/rules | 17 +++++++++++------
debian/wolf4sdl.links | 11 ++++++-----
5 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 334aaec..15ae21c 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -6,8 +6,8 @@ Wolf4SDL for Debian
contains no data files, but 'game-data-packager' from version 27 onward is
able to generate suitable data packages for wolf4sdl.
- * The wolf4sdl package in Debian supports five variants of the game:
- Wolf3d Full v1.4 Apogee (with ReadThis), Wolf3d Full v1.4 GT/ID/Activision,
+ * The wolf4sdl package in Debian supports six variants of the game:
+ Wolf3d Full v1.1 and v1.4 Apogee (with ReadThis), Wolf3d Full v1.4 GT/ID/Activision,
Wolf3d Shareware v1.4, Spear of Destiny Full and Mission Disks, Spear of
Destiny Demo. The corresponding binaries are named 'wolf4sdl-wl6a',
'wolf4sdl-wl6', 'wolf4sdl-wl1', 'wolf4sdl-sod' and 'wolf4sdl-sdm',
diff --git a/debian/local/wolf4sdl b/debian/local/wolf4sdl
index b93285d..3cee35a 100755
--- a/debian/local/wolf4sdl
+++ b/debian/local/wolf4sdl
@@ -30,15 +30,24 @@ file_matches()
fi
}
+# see game-data-packager/data/wolf3d.yaml
+
+# Wolf3d Full v1.4 GT/ID/Activision
if `file_matches "vgagraph.wl6, 275774"`
then
ENGINE=wolf4sdl-wl6
elif `file_matches "vgagraph.wl6, 276096"`
then
ENGINE=wolf4sdl-wl6
+# Wolf3d Full v1.4 Apogee (with ReadThis)
elif `file_matches "vgagraph.wl6, 334506"`
then
ENGINE=wolf4sdl-wl6a
+# Wolf3d Full v1.1 Apogee (with ReadThis)
+elif `file_matches "vgagraph.wl6, 302374"`
+then
+ ENGINE=wolf4sdl-wl6a1
+# Wolf3d Shareware v1.4
elif `file_matches "vgagraph.wl1, 326568"`
then
ENGINE=wolf4sdl-wl1
diff --git a/debian/man/wolf4sdl.6 b/debian/man/wolf4sdl.6
index 2eb93e8..9dbf44c 100644
--- a/debian/man/wolf4sdl.6
+++ b/debian/man/wolf4sdl.6
@@ -13,6 +13,9 @@ wolf4sdl \- An open-source port of id Software's classic first-person shooter
.B wolf4sdl-wl6a
.RI [ options ]
+.B wolf4sdl-wl6a1
+.RI [ options ]
+
.B wolf4sdl-wl1
.RI [ options ]
@@ -33,6 +36,7 @@ to the cross-plattform multimedia library
The
.B wolf4sdl-wl6,
.B wolf4sdl-wl6a,
+.B wolf4sdl-wl6a1,
.B wolf4sdl-wl1,
.B wolf4sdl-sod
and
@@ -40,6 +44,7 @@ and
binaries start the
.B Wolf3d Full v1.4 GT/ID/Activision,
.B Wolf3d Full v1.4 Apogee (with ReadThis),
+.B Wolf3d Full v1.1 Apogee (with ReadThis),
.B Wolf3d Shareware v1.4,
.B Spear of Destiny Full and Mission Disks
and
diff --git a/debian/rules b/debian/rules
index 9b27ac1..861dae9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,31 +32,36 @@ debian/wolf4sdl.png: debian/wolf4sdl.svg
override_dh_auto_build:
# Wolf3d Full v1.4 GT/ID/Activision
$(MAKE) clean
- $(call set_defines,-SPEAR -SPEARDEMO -UPLOAD +GOODTIMES +CARMACIZED)
+ $(call set_defines,-SPEAR -SPEARDEMO -UPLOAD +GOODTIMES +CARMACIZED -APOGEE_1_1)
dh_auto_build -O--parallel -- BINARY=wolf4sdl-wl6
# Wolf3d Full v1.4 Apogee (with ReadThis)
$(MAKE) clean
- $(call set_defines,-SPEAR -SPEARDEMO -UPLOAD -GOODTIMES +CARMACIZED)
+ $(call set_defines,-SPEAR -SPEARDEMO -UPLOAD -GOODTIMES +CARMACIZED +APOGEE_1_1)
dh_auto_build -O--parallel -- BINARY=wolf4sdl-wl6a
+ # Wolf3d Full v1.1 Apogee (with ReadThis)
+ $(MAKE) clean
+ $(call set_defines,-SPEAR -SPEARDEMO -UPLOAD -GOODTIMES +CARMACIZED -APOGEE_1_1)
+ dh_auto_build -O--parallel -- BINARY=wolf4sdl-wl6a1
+
# Wolf3d Shareware v1.4
$(MAKE) clean
- $(call set_defines,-SPEAR -SPEARDEMO +UPLOAD -GOODTIMES +CARMACIZED)
+ $(call set_defines,-SPEAR -SPEARDEMO +UPLOAD -GOODTIMES +CARMACIZED -APOGEE_1_1)
dh_auto_build -O--parallel -- BINARY=wolf4sdl-wl1
# Spear of Destiny Full and Mission Disks (and GOODTIMES for no FormGen quiz)
$(MAKE) clean
- $(call set_defines,+SPEAR -SPEARDEMO -UPLOAD +GOODTIMES +CARMACIZED)
+ $(call set_defines,+SPEAR -SPEARDEMO -UPLOAD +GOODTIMES +CARMACIZED -APOGEE_1_1)
dh_auto_build -O--parallel -- BINARY=wolf4sdl-sod
# Spear of Destiny Demo
$(MAKE) clean
- $(call set_defines,+SPEAR +SPEARDEMO -UPLOAD -GOODTIMES +CARMACIZED)
+ $(call set_defines,+SPEAR +SPEARDEMO -UPLOAD -GOODTIMES +CARMACIZED -APOGEE_1_1)
dh_auto_build -O--parallel -- BINARY=wolf4sdl-sdm
override_dh_auto_clean:
- $(call set_defines,-SPEAR -SPEARDEMO -UPLOAD +GOODTIMES +CARMACIZED)
+ $(call set_defines,-SPEAR -SPEARDEMO -UPLOAD +GOODTIMES +CARMACIZED -APOGEE_1_1)
dh_auto_clean
override_dh_auto_install:
diff --git a/debian/wolf4sdl.links b/debian/wolf4sdl.links
index e7502ab..f481229 100644
--- a/debian/wolf4sdl.links
+++ b/debian/wolf4sdl.links
@@ -1,5 +1,6 @@
-usr/share/man/man6/wolf4sdl.6.gz usr/share/man/man6/wolf4sdl-wl6.6.gz
-usr/share/man/man6/wolf4sdl.6.gz usr/share/man/man6/wolf4sdl-wl6a.6.gz
-usr/share/man/man6/wolf4sdl.6.gz usr/share/man/man6/wolf4sdl-wl1.6.gz
-usr/share/man/man6/wolf4sdl.6.gz usr/share/man/man6/wolf4sdl-sod.6.gz
-usr/share/man/man6/wolf4sdl.6.gz usr/share/man/man6/wolf4sdl-sdm.6.gz
+usr/share/man/man6/wolf4sdl.6.gz usr/share/man/man6/wolf4sdl-wl6.6.gz
+usr/share/man/man6/wolf4sdl.6.gz usr/share/man/man6/wolf4sdl-wl6a.6.gz
+usr/share/man/man6/wolf4sdl.6.gz usr/share/man/man6/wolf4sdl-wl6a1.6.gz
+usr/share/man/man6/wolf4sdl.6.gz usr/share/man/man6/wolf4sdl-wl1.6.gz
+usr/share/man/man6/wolf4sdl.6.gz usr/share/man/man6/wolf4sdl-sod.6.gz
+usr/share/man/man6/wolf4sdl.6.gz usr/share/man/man6/wolf4sdl-sdm.6.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/wolf4sdl.git
More information about the Pkg-games-commits
mailing list