Merge branch 'icon' into storageareas

CMakeLists.txt

@@ -844,3 +844,6 @@ if(CCACHE_FOUND)
         set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
         set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
 endif(CCACHE_FOUND)
+
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/misc/zoneminder.desktop DESTINATION share/applications)
+install(DIRECTORY icons DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/")

distros/ubuntu1604/zoneminder.install

@@ -3,6 +3,7 @@ usr/bin
 usr/lib/zoneminder
 usr/share/polkit-1
 usr/share/zoneminder/db
+usr/share/zoneminder/icons
 usr/share/zoneminder/www
 
 # libzoneminder-perl files:

distros/ubuntu1604/zoneminder.menu

@@ -0,0 +1,2 @@
+?package(zoneminder):needs="x11" section="Applications/Video" title="ZoneMinder" command="/usr/bin/x-www-browser http://localhost/zm" icon="/usr/share/zoneminder/icons/16x16/icon.xpm"
+

icons/16x16/icon.xpm

@@ -0,0 +1,22 @@
+/* XPM */
+static char * favicon_xpm[] = {
+"16 16 3 1",
+" 	c None",
+".	c #000080",
+"+	c #C0C0C0",
+"................",
+"................",
+"++++++++++++++++",
+".......+..++++..",
+".......+...++...",
+"++++...+...++...",
+"+++....+........",
+"++....++........",
+"+....+++........",
+"....++++........",
+"...+++++..+..+..",
+".......+..+..+..",
+".......+..++++..",
+"++++++++++++++++",
+"................",
+"................"};

misc/zoneminder.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Type=Link
+Name=ZoneMinder
+Comment=
+Icon=/usr/share/zoneminder/www/graphics/favicon.ico
+URL=http://localhost/zm/\r
+Categories=GNOME;AudioVideo;Video;Recorder;