[game-data-packager] 04/25: change default install_to: folder

[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 ab97fca49f0e25629caaa2196220db2501587504
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon Feb 9 13:09:08 2015 +0100

    change default install_to: folder
    
    that impacts all game that doesn't explicitely set install_to:,
    like rtcw
---
 data/doom3.yaml                | 3 +--
 data/rott.yaml                 | 1 -
 data/tyrian.yaml               | 1 -
 game_data_packager/__init__.py | 5 ++++-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/doom3.yaml b/data/doom3.yaml
index 40249eb..b72b7fe 100644
--- a/data/doom3.yaml
+++ b/data/doom3.yaml
@@ -9,7 +9,6 @@ packages:
       engine: doom3-dhewm3
     steam:
       id: 9050
-    install_to: usr/share/games/dhewm3
     install:
     - base/pak000.pk4
     - base/pak001.pk4
@@ -26,7 +25,7 @@ packages:
     expansion_for: doom3-data
     steam:
       id: 9070
-    install_to: usr/share/games/dhewm3
+    install_to: usr/share/games/doom3
     install:
     - d3xp/pak000.pk4
     - d3xp/pak001.pk4
diff --git a/data/rott.yaml b/data/rott.yaml
index 33d58b4..8b76be0 100644
--- a/data/rott.yaml
+++ b/data/rott.yaml
@@ -9,7 +9,6 @@ steam:
 
 packages:
   rott-data:
-    install_to: usr/share/games/rott
     longname: "Rise of the Triad: The HUNT begins"
     debian:
       engine: rott
diff --git a/data/tyrian.yaml b/data/tyrian.yaml
index cea848d..28ea4a5 100644
--- a/data/tyrian.yaml
+++ b/data/tyrian.yaml
@@ -14,7 +14,6 @@ packages:
     # there are two identical files in the zip
     symlinks:
       usr/share/games/tyrian/netset.pcx: usr/share/games/tyrian/tyrset.pcx
-    install_to: usr/share/games/tyrian
     install_files_from_cksums: |
       2480546301 36169   cubetxt1.dat
       1486908798 8108    cubetxt2.dat
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 4505fef..bba1c17 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -331,7 +331,10 @@ class GameDataPackage(object):
         # a WantedFile with install_as='baseq3/pak1.pk3' then we would
         # put 'usr/share/games/quake3/baseq3/pak1.pk3' in the .deb.
         # The default is 'usr/share/games/' plus the binary package's name.
-        self.install_to = 'usr/share/games/' + name
+        if name.endswith('-data'):
+            self.install_to = 'usr/share/games/' + name[:len(name) - 5]
+        else:
+            self.install_to = 'usr/share/games/' + name
 
         # Prefixes of files that get installed to /usr/share/doc/PACKAGE
         # instead

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