Move desktop file to the winff binary package to enable better AppStream integration

4 files changed, 7 insertions, 6 deletions

diff --git a/debian/winff-data.install b/debian/winff-data.install
index ef8f8d4..0390f59 100644
--- a/debian/winff-data.install
+++ b/debian/winff-data.install
@@ -1,5 +1,4 @@
 debian/presets* usr/share/winff/
-debian/winff.desktop usr/share/applications/
 debian/winff.svg            usr/share/icons/hicolor/scalable/apps/
 languages/* usr/share/winff/languages/
 presets-orig.xml usr/share/winff/
diff --git a/debian/winff-data.lintian-overrides b/debian/winff-data.lintian-overrides
deleted file mode 100644
index d4d07e4..0000000
--- a/debian/winff-data.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-# As the desktop file for winff-qt and winff-gtk are the same they are provided
-# in the winff-data package, which they both depend on.
-#
-# See also bts #683060 for discussion
-winff-data binary: desktop-command-not-in-package usr/share/applications/winff.desktop winff
diff --git a/debian/winff.install b/debian/winff.install
new file mode 100644
index 0000000..de72f2b
--- /dev/null
+++ b/debian/winff.install
@@ -0,0 +1 @@
+debian/winff.desktop usr/share/applications/
diff --git a/debian/winff.lintian-overrides b/debian/winff.lintian-overrides
new file mode 100644
index 0000000..10b8306
--- /dev/null
+++ b/debian/winff.lintian-overrides
@@ -0,0 +1,6 @@
+# As the desktop file for winff-qt and winff-gtk would be identical, it is
+# provided in the winff package. From a dependency point of view is should be
+# in winff-data, but AppStream doesn't pick the proper package then.
+#
+# See also bts #683060 for discussion
+winff binary: desktop-command-not-in-package usr/share/applications/winff.desktop winff