[game-data-packager] 08/11: Install Heretic and Hexen to /usr/share/games/doom again

[Simon McVittie]

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 bf6a941c355c59559273591d412543763cefdc77
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jan 12 21:58:01 2015 +0000

    Install Heretic and Hexen to /usr/share/games/doom again
---
 data/doom-common.desktop.in           | 2 +-
 data/heretic.yaml                     | 4 ++--
 data/hexen-deathkings-data.desktop.in | 2 +-
 data/hexen.yaml                       | 6 +++---
 debian/changelog                      | 1 +
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/data/doom-common.desktop.in b/data/doom-common.desktop.in
index bc98c00..09e10db 100644
--- a/data/doom-common.desktop.in
+++ b/data/doom-common.desktop.in
@@ -2,7 +2,7 @@
 Name=LONG
 GenericName=First Person Shooter Game
 TryExec=ENGINE
-Exec=ENGINE -iwad /usr/share/games/ENGINE/GAME.wad
+Exec=ENGINE -iwad /usr/share/games/doom/GAME.wad
 Icon=GAME.png
 Terminal=false
 Type=Application
diff --git a/data/heretic.yaml b/data/heretic.yaml
index 4864c4d..b69919d 100644
--- a/data/heretic.yaml
+++ b/data/heretic.yaml
@@ -19,14 +19,14 @@ help_text: |
 
 packages:
   heretic-wad:
-    install_to: usr/share/games/heretic
+    install_to: usr/share/games/doom
     type: full
     install:
     - heretic.wad
 
   # Not supported yet
   #heretic-shareware-wad:
-  #  install_to: usr/share/games/heretic
+  #  install_to: usr/share/games/doom
   #  type: demo
 
 files:
diff --git a/data/hexen-deathkings-data.desktop.in b/data/hexen-deathkings-data.desktop.in
index 7079532..2774afa 100644
--- a/data/hexen-deathkings-data.desktop.in
+++ b/data/hexen-deathkings-data.desktop.in
@@ -2,7 +2,7 @@
 Name=Hexen: Deathkings of the Dark Citadel
 GenericName=First Person Shooter Game
 TryExec=ENGINE
-Exec=ENGINE -iwad /usr/share/games/ENGINE/hexen.wad -file /usr/share/games/ENGINE/GAME.wad
+Exec=ENGINE -iwad /usr/share/games/doom/hexen.wad -file /usr/share/games/doom/GAME.wad
 Icon=GAME.png
 Terminal=false
 Type=Application
diff --git a/data/hexen.yaml b/data/hexen.yaml
index c74e9aa..2153308 100644
--- a/data/hexen.yaml
+++ b/data/hexen.yaml
@@ -25,14 +25,14 @@ doom_engine: hexen
 
 packages:
   hexen-wad:
-    install_to: usr/share/games/hexen
+    install_to: usr/share/games/doom
     type: full
     install:
     - hexen.wad
 
   hexen-deathkings-data:
     longname: "Hexen: Deathkings of the Dark Citadel"
-    install_to: usr/share/games/hexen
+    install_to: usr/share/games/doom
     type: expansion
     install:
     - hexdd.wad
@@ -40,7 +40,7 @@ packages:
   # Disabled, doesn't seem to work
   #hexen-demo-data:
   #  longname: "Hexen: Beyond Heretic (demo)"
-  #  install_to: usr/share/games/hexen
+  #  install_to: usr/share/games/doom
   #   type: demo
   #  install:
   #  - hexendemo.wad
diff --git a/debian/changelog b/debian/changelog
index d087808..d6ddf5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,7 @@ game-data-packager (39) UNRELEASED; urgency=medium
     (Closes: #775152)
   * Add support for flagging files in YAML as known-but-unsuitable,
     and use it for older versions of various .wad files
+  * Install Heretic and Hexen to /usr/share/games/doom again
 
  -- Simon McVittie <smcv at debian.org>  Mon, 05 Jan 2015 19:38:04 +0000
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git