[game-data-packager] 17/19: Add support for redirecting files into $docdir and use it for Quake II

[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 803c72aa51981dbd7c9117fffabfb1c510efae01
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Jan 13 11:04:44 2015 +0000

    Add support for redirecting files into $docdir and use it for Quake II
---
 data/quake2.yaml                   |  2 ++
 lib/game_data_packager/__init__.py | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/data/quake2.yaml b/data/quake2.yaml
index 8ef44d4..2746982 100644
--- a/data/quake2.yaml
+++ b/data/quake2.yaml
@@ -24,6 +24,8 @@ packages:
   quake2-demo-data:
     type: demo
     install_to: usr/share/games/quake2-demo
+    install_to_docdir:
+      - quake2_manual
     install_contents_of:
     - q2-314-demo-x86.exe
 
diff --git a/lib/game_data_packager/__init__.py b/lib/game_data_packager/__init__.py
index 41686d9..39fdc2d 100644
--- a/lib/game_data_packager/__init__.py
+++ b/lib/game_data_packager/__init__.py
@@ -272,6 +272,10 @@ class GameDataPackage(object):
         # The default is 'usr/share/games/' plus the binary package's name.
         self.install_to = 'usr/share/games/' + name
 
+        # Prefixes of files that get installed to /usr/share/doc/PACKAGE
+        # instead
+        self.install_to_docdir = []
+
         # symlink => real file (the opposite way round that debhelper does it,
         # because the links must be unique but the real files are not
         # necessarily)
@@ -321,6 +325,7 @@ class GameDataPackage(object):
         return {
             'install': sorted(self.install),
             'install_to': self.install_to,
+            'install_to_docdir': self.install_to_docdir,
             'name': self.name,
             'steam': self.steam,
             'symlinks': self.symlinks,
@@ -583,6 +588,9 @@ class GameData(object):
         if 'install_to' in d:
             package.install_to = d['install_to']
 
+        if 'install_to_docdir' in d:
+            package.install_to_docdir = d['install_to_docdir']
+
         if 'install_contents_of' in d:
             package.install_contents_of = d['install_contents_of']
 
@@ -1290,6 +1298,10 @@ class GameData(object):
                     install_to = 'usr/share/doc/%s%s' % (package.name,
                             install_to[7:])
 
+                for prefix in package.install_to_docdir:
+                    if wanted.name.startswith(prefix + '/'):
+                        install_to = 'usr/share/doc/%s' % package.name
+
                 copy_to = os.path.join(destdir, install_to,
                         wanted.install_as)
                 copy_to_dir = os.path.dirname(copy_to)

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