[game-data-packager] 01/02: Finish replacing lintian_desktop with PackagingSystem.override_lintian

[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 7d3f4fa431bec77167b2961973c089fb5b6fd466
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Jan 5 10:15:19 2016 +0000

    Finish replacing lintian_desktop with PackagingSystem.override_lintian
---
 game_data_packager/games/scummvm_common.py | 2 +-
 game_data_packager/games/z_code.py         | 7 ++++---
 game_data_packager/packaging/deb.py        | 2 +-
 game_data_packager/util.py                 | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/game_data_packager/games/scummvm_common.py b/game_data_packager/games/scummvm_common.py
index b64af13..f3c3960 100644
--- a/game_data_packager/games/scummvm_common.py
+++ b/game_data_packager/games/scummvm_common.py
@@ -24,7 +24,7 @@ import subprocess
 from .. import GameData
 from ..build import (PackagingTask)
 from ..paths import DATADIR
-from ..util import (mkdir_p, lintian_desktop)
+from ..util import (mkdir_p)
 
 logger = logging.getLogger('game-data-packager.games.scummvm-common')
 
diff --git a/game_data_packager/games/z_code.py b/game_data_packager/games/z_code.py
index ff96989..fe05d95 100644
--- a/game_data_packager/games/z_code.py
+++ b/game_data_packager/games/z_code.py
@@ -23,8 +23,7 @@ import os
 from .. import GameData
 from ..build import (PackagingTask)
 from ..util import (TemporaryUmask,
-                    mkdir_p,
-                    lintian_desktop)
+                    mkdir_p)
 
 logger = logging.getLogger('game-data-packager.games.z_code')
 
@@ -81,7 +80,9 @@ class ZCodeTask(PackagingTask):
                       'w', encoding='utf-8') as output:
                  desktop.write(output, space_around_delimiters=False)
 
-            lintian_desktop(destdir, package.name, engine)
+            self.packaging.override_lintian(destdir, package.name,
+                    'desktop-command-not-in-package',
+                    '%s/%s.desktop %s' % (appdir, package.name, engine))
 
             if engine == 'frotz':
                 bindir = os.path.join(destdir, self.packaging.BINDIR)
diff --git a/game_data_packager/packaging/deb.py b/game_data_packager/packaging/deb.py
index 56d37f8..ed3d933 100644
--- a/game_data_packager/packaging/deb.py
+++ b/game_data_packager/packaging/deb.py
@@ -126,7 +126,7 @@ class DebPackaging(PackagingSystem):
         assert type(package) is str
         lintiandir = os.path.join(destdir, 'usr/share/lintian/overrides')
         mkdir_p(lintiandir)
-        with open(os.path.join(lintian, package), 'a', encoding='utf-8') as l:
+        with open(os.path.join(lintiandir, package), 'a', encoding='utf-8') as l:
             l.write('%s: %s %s\n' % (package, tag, args))
 
 def get_distro_packaging():
diff --git a/game_data_packager/util.py b/game_data_packager/util.py
index 6b040e2..d63a181 100644
--- a/game_data_packager/util.py
+++ b/game_data_packager/util.py
@@ -26,7 +26,7 @@ import subprocess
 import sys
 
 from .paths import DATADIR
-from .version import (GAME_PACKAGE_VERSION, FORMAT, DISTRO)
+from .version import (GAME_PACKAGE_VERSION)
 
 logger = logging.getLogger('game-data-packager.util')
 

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