[SCM] gerbera/master: Cleanup .desktop file and application icons

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 45b87ef67c32596de17777635e5f8107e211325e
Author: James Cowgill <jcowgill at debian.org>
Date:   Tue Sep 12 18:34:50 2017 +0100

    Cleanup .desktop file and application icons

diff --git a/debian/control b/debian/control
index 261ac9a..8071ee2 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends:
  cmake (>= 3.2),
  debhelper (>= 10),
  default-libmysqlclient-dev,
+ dh-exec,
  duktape-dev,
  libavformat-dev (>= 6:10~),
  libavutil-dev (>= 6:10~),
diff --git a/debian/gerbera.desktop b/debian/gerbera.desktop
index 75a2963..ee4440e 100644
--- a/debian/gerbera.desktop
+++ b/debian/gerbera.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
-Name=MediaTomb
-Comment=MediaTomb UPnP MediaServer web user interface.
-Exec=/usr/bin/x-www-browser /var/lib/mediatomb/mediatomb.html
-Icon=mediatomb.png
+Name=Gerbera
+Comment=Gerbera UPnP MediaServer web user interface.
+Exec=/usr/bin/x-www-browser /var/lib/gerbera/mediatomb.html
+Icon=gerbera
 Terminal=false
 Type=Application
 Categories=AudioVideo;
+Keywords=mediatomb;upnp;
diff --git a/debian/gerbera.install b/debian/gerbera.install
old mode 100644
new mode 100755
index 5fafe00..64d7b70
--- a/debian/gerbera.install
+++ b/debian/gerbera.install
@@ -1,3 +1,5 @@
-artwork/gerbera.xpm usr/share/pixmaps/
-debian/gerbera.desktop usr/share/applications/
-debian/config.xml etc/gerbera/
+#!/usr/bin/dh-exec
+debian/config.xml          etc/gerbera/
+debian/gerbera.desktop     usr/share/applications/
+web/icons/mt-icon48.png => usr/share/icons/hicolor/48x48/apps/gerbera.png
+artwork/logo-orange.svg => usr/share/icons/hicolor/scalable/apps/gerbera.svg

-- 
gerbera packaging