[game-data-packager] 01/01: remove install_to_docdir, made extraneous by doc: with group support

[Alexandre Detiste]

This is an automated email from the git hooks/post-receive script.

detiste-guest pushed a commit to branch master
in repository game-data-packager.

commit e2213fe90ff9bb929a8d6e02d635da302856c5a3
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon Jan 4 08:04:15 2016 +0100

    remove install_to_docdir, made extraneous by doc: with group support
---
 data/dreamweb.yaml             |  4 ----
 data/freespace2.yaml           |  2 --
 data/quake2.yaml               |  4 ----
 data/quake3.yaml               | 10 ++--------
 doc/tags.txt                   |  1 -
 game_data_packager/__init__.py |  7 +------
 game_data_packager/build.py    |  4 ----
 7 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/data/dreamweb.yaml b/data/dreamweb.yaml
index ebeeafb..66cd1ca 100644
--- a/data/dreamweb.yaml
+++ b/data/dreamweb.yaml
@@ -13,8 +13,6 @@ packages:
     better_version: dreamweb-en-data
     provides: dreamweb-data
     version: '1.1'
-    install_to_docdir:
-    - diary
     install:
     - shared assets
     - us assets
@@ -43,8 +41,6 @@ packages:
   dreamweb-en-data:
     provides: dreamweb-data
     version: '1.1'
-    install_to_docdir:
-    - diary
     install:
     - shared assets
     - uk assets
diff --git a/data/freespace2.yaml b/data/freespace2.yaml
index 467f697..f9f9cad 100644
--- a/data/freespace2.yaml
+++ b/data/freespace2.yaml
@@ -31,8 +31,6 @@ packages:
       path: common/Freespace 2
     gog:
       url: freespace_2
-    install_to_docdir:
-      - freddocs
     install:
     - assets
     - stu_fs2.vp
diff --git a/data/quake2.yaml b/data/quake2.yaml
index 1f7852f..64d82e2 100644
--- a/data/quake2.yaml
+++ b/data/quake2.yaml
@@ -42,8 +42,6 @@ packages:
     gog:
       url: quake_ii_quad_damage
     install_to: usr/share/games/quake2
-    install_to_docdir:
-      - quake2_manual
     install_contents_of:
     - q2-3.20-x86-full-ctf.exe
     install:
@@ -72,8 +70,6 @@ packages:
 
   quake2-demo-data:
     demo_for: quake2-full-data
-    install_to_docdir:
-      - quake2_manual
     install_contents_of:
     - q2-314-demo-x86.exe
     license:
diff --git a/data/quake3.yaml b/data/quake3.yaml
index ed72d28..e2faf9d 100644
--- a/data/quake3.yaml
+++ b/data/quake3.yaml
@@ -93,14 +93,11 @@ packages:
     install:
       - baseq3/pak0.pk3
       - patch pk3s
-    install_to_docdir:
-      - Help
     license:
       - Help/Q3A_CELA.txt
       - Help/Q3A_EULA.txt?loki
     doc:
-      - common documentation
-    optional:
+    - common documentation
     - Help/Readme.html
     - Help/Quake3World.html
     - Help/Manual/index.html
@@ -173,14 +170,11 @@ packages:
       usr/lib/quake3/demo/demoq3/gfx: $install_to/gfx
       usr/lib/quake3/demo/demoq3/scripts: $install_to/scripts
       usr/lib/quake3/demo/demoq3/vm: $install_to/vm
-    install_to_docdir:
-      - Help
     license:
     - Help/Q3A_EULA.html
     - Help/Q3A_EULA.txt
     doc:
-      - common documentation
-    optional:
+    - common documentation
     - Help/Readme.html
     - Help/Quake3World.html
     - Help/Manual/index.html
diff --git a/doc/tags.txt b/doc/tags.txt
index a6001f2..16aa307 100644
--- a/doc/tags.txt
+++ b/doc/tags.txt
@@ -53,7 +53,6 @@ packages:
     main_wads: dict (doom)
     gameid: (scummvm)
     install_to: string
-    install_to_docdir: string (prefix)
     gog:
       url: string
       pp: string (hash)
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 47f16b6..0630f04 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -241,10 +241,6 @@ class GameDataPackage(object):
         # link documentation to this package, like dh_installdocs --link-doc
         self.link_doc = None
 
-        # Prefixes of files that get installed to /usr/share/doc/PACKAGE
-        # instead
-        self.install_to_docdir = []
-
         # If true, this package is allowed to be empty
         self.empty = False
 
@@ -384,7 +380,6 @@ class GameDataPackage(object):
                 'demo_for',
                 'dotemu',
                 'gog',
-                'install_to_docdir',
                 'origin',
                 'rip_cd',
                 'steam',
@@ -792,7 +787,7 @@ class GameData(object):
 
     def _populate_package(self, package, d):
         for k in ('expansion_for', 'expansion_for_ext', 'longname', 'symlinks', 'install_to',
-                'install_to_docdir', 'install_contents_of', 'debian', 'description',
+                'install_contents_of', 'debian', 'description',
                 'rip_cd', 'architecture', 'aliases', 'better_version', 'langs', 'mutually_exclusive',
                 'copyright', 'engine', 'lang', 'component', 'section', 'disks', 'provides',
                 'steam', 'gog', 'dotemu', 'origin', 'url_misc', 'wiki', 'copyright_notice',
diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 7ca5bcd..f7e4313 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -1558,10 +1558,6 @@ class PackagingTask(object):
                 if install_to.startswith('$docdir'):
                     install_to = docdir + install_to[7:]
 
-                for prefix in package.install_to_docdir:
-                    if wanted.name.startswith(prefix + '/'):
-                        install_to = docdir
-
                 copy_to = os.path.join(destdir, install_to, install_as)
                 copy_to_dir = os.path.dirname(copy_to)
                 logger.debug('Copying to %s', copy_to)

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