Merge lp:~widelands-dev/widelands/bug-1789023-fix-icon-for-software-center into lp:widelands

[GunChleoc]

Fixes for Debian-based software centers

- Add stock icon to appdata.xml (c.f. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=857644)
- Change icon definition in .desktop to be a generic one
- Content ratings are now accepted by the validator, so we've activated them

[GunChleoc (gunchleoc)]

@bunnybot merge

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3837. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/420887783.
Appveyor build 3635. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1789023_fix_icon_for_software_center-3635.

=== modified file 'debian/org.widelands.widelands.desktop'
--- debian/org.widelands.widelands.desktop	2018-07-28 11:03:59 +0000
+++ debian/org.widelands.widelands.desktop	2018-08-26 10:54:52 +0000
@@ -43,14 +43,14 @@
 Comment=A real-time build-up strategy game
 Comment[ar]=لعبة بناء إستراتيجية في الوقت الحقيقي
 Comment[bg]=Стратегическа игра за изграждане на цивилизация в реално време
-Comment[ca]=Un joc d'estratègia i construcció a temps real 
+Comment[ca]=Un joc d'estratègia i construcció a temps real
 Comment[cs]=Real-time budovatelská strategická hra
 Comment[da]=Et realtids opbygningsstrategispil
 Comment[de]=Echtzeitbasiertes Aufbau-Strategiespiel
 Comment[es]=Un juego de estrategia y construcción en tiempo real
 Comment[eu]=Denbora errealeko eraikuntza eta estrategia jokoa
 Comment[fi]=Reaaliaikainen strategiapeli
-Comment[fr]=Un jeu de stratégie et de construction en temps réel 
+Comment[fr]=Un jeu de stratégie et de construction en temps réel
 Comment[fy]=In strategysk bouwspultsje mei rinnende tiid
 Comment[gd]=Geama ro-innleachd togail fìor-ama
 Comment[hu]=Egy valós idejű, építkezős stratégiai játék
@@ -71,7 +71,7 @@
 Comment[sv]=Ett uppbyggnadsstrategispel i realtid
 Comment[uk]=Стратегічна гра у режимі реального часу
 Comment[zh_TW]=一款即時演變的策略遊戲
-Icon=/usr/share/games/widelands/data/images/logos/wl-ico-64.png
+Icon=widelands
 TryExec=widelands
 Exec=widelands
 Categories=Game;StrategyGame;

=== modified file 'debian/org.widelands.widelands.desktop.stub'
--- debian/org.widelands.widelands.desktop.stub	2018-07-28 11:03:59 +0000
+++ debian/org.widelands.widelands.desktop.stub	2018-08-26 10:54:52 +0000
@@ -3,7 +3,7 @@
 Type=Application
 Name=Widelands
 GENERIC_NAME_COMMENT_HOOK
-Icon=/usr/share/games/widelands/data/images/logos/wl-ico-64.png
+Icon=widelands
 TryExec=widelands
 Exec=widelands
 Categories=Game;StrategyGame;

=== modified file 'debian/widelands.appdata.xml'
--- debian/widelands.appdata.xml	2018-07-06 14:23:53 +0000
+++ debian/widelands.appdata.xml	2018-08-26 10:54:52 +0000
@@ -5,6 +5,7 @@
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0</project_license>
   <name>Widelands</name>
+  <icon type="stock">widelands</icon>
   <summary>A real-time build-up strategy game</summary>
   <summary xml:lang="ar">لعبة بناء إستراتيجية في الوقت الحقيقي</summary>
   <summary xml:lang="bg">Стратегическа игра за изграждане на цивилизация в реално време</summary>
@@ -286,7 +287,7 @@
   <url type="donation">https://wl.widelands.org/wiki/The%20Widelands%20Project/</url>
   <url type="help">https://wl.widelands.org/wiki/Game%20Manual/</url>
   <developer_name>The Widelands Development Team</developer_name>
-  <x-content_rating type="oars-1.0">
+  <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">moderate</content_attribute>
     <content_attribute id="violence-fantasy">none</content_attribute>
     <content_attribute id="violence-realistic">none</content_attribute>
@@ -307,5 +308,5 @@
     <content_attribute id="social-contacts">none</content_attribute>
     <content_attribute id="money-purchasing">none</content_attribute>
     <content_attribute id="money-gambling">none</content_attribute>
-  </x-content_rating>
+  </content_rating>
 </component>

=== modified file 'debian/widelands.appdata.xml.stub'
--- debian/widelands.appdata.xml.stub	2017-08-26 09:24:28 +0000
+++ debian/widelands.appdata.xml.stub	2018-08-26 10:54:52 +0000
@@ -5,6 +5,7 @@
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0</project_license>
   <name>Widelands</name>
+  <icon type="stock">widelands</icon>
   SUMMARY_DESCRIPTION_HOOK
   <screenshots>
     <screenshot type="default">
@@ -56,7 +57,7 @@
   <url type="donation">https://wl.widelands.org/wiki/The%20Widelands%20Project/</url>
   <url type="help">https://wl.widelands.org/wiki/Game%20Manual/</url>
   <developer_name>The Widelands Development Team</developer_name>
-  <x-content_rating type="oars-1.0">
+  <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">moderate</content_attribute>
     <content_attribute id="violence-fantasy">none</content_attribute>
     <content_attribute id="violence-realistic">none</content_attribute>
@@ -77,5 +78,5 @@
     <content_attribute id="social-contacts">none</content_attribute>
     <content_attribute id="money-purchasing">none</content_attribute>
     <content_attribute id="money-gambling">none</content_attribute>
-  </x-content_rating>
+  </content_rating>
 </component>