Merge branch 'master' of https://github.com/iggy/qutebrowser into iggy-master

doc/INSTALL.asciidoc

@@ -138,3 +138,14 @@ After installing the requirements, you have these options:
 NOTE: If you're running qutebrowser from the git repository rather than a
 released version, you should run `scripts/asciidoc2html.py` to generate the
 documentation.
+
+
+Packagers
+---------
+
+There are example .desktop and icon files provided. They would go in the
+standard location for your distro (/usr/share/applications and
+/usr/share/pixmaps for example).
+
+The normal `setup.py install` doesn't install these files, so you'll have to do
+it as part of the packaging process.

qutebrowser.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=qutebrowser
+GenericName=Web Browser
+Icon=qutebrowser
+Type=Application
+Categories=Network;WebBrowser;
+Exec=qutebrowser %u
+Terminal=false
+StartupNotify=false
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;