[game-data-packager] 05/06: Remove support for "debian: depends:" etc.

[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 ed16265ddb0016e31e65a61cb10b765e0a805cb5
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jan 25 00:21:36 2016 +0000

    Remove support for "debian: depends:" etc.
    
    Superseded by "depends: [{deb: nodejs, generic: node}]" and so on.
---
 doc/tags.txt                   | 18 +++++++-----------
 game_data_packager/__init__.py | 18 ------------------
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/doc/tags.txt b/doc/tags.txt
index 765a127..0031354 100644
--- a/doc/tags.txt
+++ b/doc/tags.txt
@@ -37,17 +37,13 @@ packages:
     lang: string
     provides: string
     mutually_exclusive: bool
-    debian:
-      breaks:
-      conflicts:
-      depends:
-      provides:
-      recommends:
-      replaces:
-      engine: string
-      install_to: string
-      description: string
-    rpm|fedora|suse|arch: (fedora/suse takes priority over rpm)
+    breaks:
+    conflicts:
+    depends:
+    provides:
+    recommends:
+    replaces:
+    debian|rpm|fedora|suse|arch: (fedora/suse takes priority over rpm)
       engine: string
       install_to: string
       description: string
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index f34618c..7786a46 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -718,24 +718,6 @@ class GameData(object):
                     if port in d and (FORMAT == port or DISTRO == port or
                             (FORMAT == 'deb' and port == 'debian')):
                         setattr(package, k, d[port][k])
-                elif k in package.relations:
-                    related = d[port][k]
-
-                    if isinstance(related, str):
-                        related = [related]
-
-                    for r in related:
-                        if port == 'debian':
-                            # we treat "debian:" as meaning "any dpkg-based"
-                            pr = PackageRelation({'deb': r})
-                        else:
-                            pr = PackageRelation({port: r})
-                            assert not pr.alternatives, pr
-
-                        if pr.package == 'libjpeg.so.62':
-                            assert pr.version is None
-
-                        package.relations[k].append(pr)
                 else:
                     raise AssertionError('%s: unknown key %r in port %r' %
                             (package.name, k, port))

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