[game-data-packager] 08/12: Use "debian" metadata fields for all Debian derivatives 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 e7daf53f41bf219a703fe9b6eff0bd8283cac44b
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jan 6 12:05:59 2016 +0000

    Use "debian" metadata fields for all Debian derivatives again
    
    For historical reasons, "debian" in the YAML means any Debian derivative.
---
 game_data_packager/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index d78c365..4b4d496 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -818,7 +818,8 @@ class GameData(object):
                 setattr(package, k, d[k])
 
         for port in ('debian', 'rpm'):
-            if FORMAT == port and port in d:
+            if port in d and (FORMAT == port or
+                    (FORMAT == 'deb' and port == 'debian')):
                 for k in ('engine', 'install_to', 'description', 'depends', 'provides'):
                     if k in d[port]:
                         setattr(package, k, d[port][k])

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