[game-data-packager] 01/01: fix lintian desktop-command-not-in-package path

[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 f8282319a7a2e93a472b33c00f3c71624bc072c8
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Fri Jan 8 10:36:55 2016 +0100

    fix lintian desktop-command-not-in-package path
    
    generated "/home/tchet/git/game-data-packager/hhgg-data_44_all.deb"
    Now running Lintian...
    W: hhgg-data: unknown-section local/games
    W: hhgg-data: binary-without-manpage usr/games/hhgg
    W: hhgg-data: desktop-command-not-in-package usr/share/applications/hhgg-data.desktop frotz
    I: hhgg-data: unused-override desktop-command-not-in-package /tmp/gdptmp.p4emrdbp/hhgg-data.deb.d/usr/share/applications/hhgg-data.desktop frotz
---
 game_data_packager/games/doom_common.py       | 4 ++--
 game_data_packager/games/ecwolf_common.py     | 2 +-
 game_data_packager/games/residualvm_common.py | 3 ++-
 game_data_packager/games/scummvm_common.py    | 3 ++-
 game_data_packager/games/z_code.py            | 3 ++-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/game_data_packager/games/doom_common.py b/game_data_packager/games/doom_common.py
index 9fd6cfa..d9ff19a 100644
--- a/game_data_packager/games/doom_common.py
+++ b/game_data_packager/games/doom_common.py
@@ -177,8 +177,8 @@ class DoomTask(PackagingTask):
 
             self.packaging.override_lintian(destdir, package.name,
                     'desktop-command-not-in-package',
-                    '%s/%s.desktop %s' % (appdir,
-                        desktop_file, package.program))
+                    'usr/share/applications/%s.desktop %s' %
+                     (desktop_file, package.program))
 
             if FORMAT == 'deb':
                 debdir = os.path.join(destdir, 'DEBIAN')
diff --git a/game_data_packager/games/ecwolf_common.py b/game_data_packager/games/ecwolf_common.py
index 7749768..4889c7b 100644
--- a/game_data_packager/games/ecwolf_common.py
+++ b/game_data_packager/games/ecwolf_common.py
@@ -105,6 +105,6 @@ class EcwolfTask(PackagingTask):
 
         self.packaging.override_lintian(destdir, package.name,
                 'desktop-command-not-in-package',
-                '%s/%s.desktop %s' % (appdir, package.name, 'ecwolf'))
+                'usr/share/applications/%s.desktop ecwolf' % package.name)
 
 GAME_DATA_SUBCLASS = EcwolfGameData
diff --git a/game_data_packager/games/residualvm_common.py b/game_data_packager/games/residualvm_common.py
index f305b55..d2a7411 100644
--- a/game_data_packager/games/residualvm_common.py
+++ b/game_data_packager/games/residualvm_common.py
@@ -118,6 +118,7 @@ class ResidualvmTask(PackagingTask):
 
         self.packaging.override_lintian(destdir, package.name,
                 'desktop-command-not-in-package',
-                '%s/%s.desktop %s' % (appdir, package.name, 'residualvm'))
+                'usr/share/applications/%s.desktop %s' %
+                (package.name, 'residualvm'))
 
 GAME_DATA_SUBCLASS = ResidualvmGameData
diff --git a/game_data_packager/games/scummvm_common.py b/game_data_packager/games/scummvm_common.py
index 11d6abb..1a69ad1 100644
--- a/game_data_packager/games/scummvm_common.py
+++ b/game_data_packager/games/scummvm_common.py
@@ -134,7 +134,8 @@ class ScummvmTask(PackagingTask):
             entry['Exec'] = 'scummvm -p /%s %s' % (install_to, gameid)
             self.packaging.override_lintian(destdir, package.name,
                     'desktop-command-not-in-package',
-                    '%s/%s.desktop %s' % (appdir, package.name, 'scummvm'))
+                    'usr/share/applications/%s.desktop %s'
+                     % (package.name, 'scummvm'))
         else:
             pgm = package.name[0:len(package.name)-len('-data')]
             entry['Exec'] = pgm
diff --git a/game_data_packager/games/z_code.py b/game_data_packager/games/z_code.py
index df7728f..90fd8f1 100644
--- a/game_data_packager/games/z_code.py
+++ b/game_data_packager/games/z_code.py
@@ -85,7 +85,8 @@ class ZCodeTask(PackagingTask):
 
             self.packaging.override_lintian(destdir, package.name,
                     'desktop-command-not-in-package',
-                    '%s/%s.desktop %s' % (appdir, package.name, engine))
+                    'usr/share/applications/%s.desktop %s'
+                     % (package.name, engine))
 
             if engine == 'frotz':
                 bindir = os.path.join(destdir, self.packaging.BINDIR)

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