Bug#923592: marble: diff for NMU version 4:17.08.3-3.2

[Niels Thykier]

Control: tags 923592 + patch
Control: tags 923592 + pending


Dear maintainer,

I've prepared an NMU for marble (versioned as 4:17.08.3-3.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru marble-17.08.3/debian/changelog marble-17.08.3/debian/changelog
--- marble-17.08.3/debian/changelog     2018-10-27 11:38:29.000000000 +0000
+++ marble-17.08.3/debian/changelog     2019-05-18 07:16:42.000000000 +0000
@@ -1,3 +1,13 @@
+marble (4:17.08.3-3.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Frédéric Bonnard ]
+  * Add Comment fields to the .desktop files as they are now
+    required by the Appstream generator.  (Closes: #923592)
+
+ -- Niels Thykier <ni...@thykier.net>  Sat, 18 May 2019 07:16:42 +0000
+
 marble (4:17.08.3-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru marble-17.08.3/debian/patches/fix-923592.patch 
marble-17.08.3/debian/patches/fix-923592.patch
--- marble-17.08.3/debian/patches/fix-923592.patch      1970-01-01 
00:00:00.000000000 +0000
+++ marble-17.08.3/debian/patches/fix-923592.patch      2019-05-18 
07:14:54.000000000 +0000
@@ -0,0 +1,34 @@
+Description: Fix FTBFS due to missing comment/description
+ After that commit https://phabricator.kde.org/D16867, a description is
+needed in .desktop files.
+The keyword actually looked for by desktoptojson converter utility is
+"Comment=" .
+
+Author: Frédéric Bonnard <fre...@debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: marble-17.08.3/src/plasma/wallpapers/worldmap/metadata.desktop
+===================================================================
+--- marble-17.08.3.orig/src/plasma/wallpapers/worldmap/metadata.desktop        
2017-10-20 03:52:49.000000000 +0000
++++ marble-17.08.3/src/plasma/wallpapers/worldmap/metadata.desktop     
2019-04-24 15:10:53.251732393 +0000
+@@ -23,6 +23,7 @@
+ Name[x-test]=xxWorld Mapxx
+ Name[zh_CN]=世界地图
+ Name[zh_TW]=世界地圖
++Comment=Shows a map of the world as wallpaper
+ Type=Service
+ Icon=marble
+ 
+Index: marble-17.08.3/src/plasma/applets/worldclock/package/metadata.desktop
+===================================================================
+--- marble-17.08.3.orig/src/plasma/applets/worldclock/package/metadata.desktop 
2017-10-20 03:52:49.000000000 +0000
++++ marble-17.08.3/src/plasma/applets/worldclock/package/metadata.desktop      
2019-04-24 15:09:41.781959847 +0000
+@@ -49,7 +49,7 @@
+ Name[x-test]=xxWorld Clockxx
+ Name[zh_CN]=世界时钟
+ Name[zh_TW]=世界時鐘
+-# not yet... Comment=Shows the time in different parts of the world
++Comment=Shows the time in different parts of the world
+ 
+ Icon=marble
+ Type=Service
diff -Nru marble-17.08.3/debian/patches/series 
marble-17.08.3/debian/patches/series
--- marble-17.08.3/debian/patches/series        2018-10-27 11:38:29.000000000 
+0000
+++ marble-17.08.3/debian/patches/series        2019-05-18 07:15:08.000000000 
+0000
@@ -1,3 +1,4 @@
 do_not_install_private_headers
 kubuntu_disable-MarbleRunnerManagerTest.diff
 qt5.11.patch
+fix-923592.patch