Merge remote-tracking branch 'origin/pr/4547'

MANIFEST.in

@@ -12,7 +12,7 @@ recursive-include scripts *.py *.sh *.js
 include qutebrowser/utils/testfile
 include qutebrowser/git-commit-id
 include LICENSE doc/* README.asciidoc
-include misc/qutebrowser.desktop
+include misc/org.qutebrowser.qutebrowser.desktop
 include misc/org.qutebrowser.qutebrowser.appdata.xml
 include misc/Makefile
 include requirements.txt

doc/changelog.asciidoc

@@ -77,6 +77,8 @@ Changed
   an error is now shown when trying to configure a PAC proxy.
 - The metainfo file `qutebrowser.appdata.xml` is now renamed to
   `org.qutebrowser.qutebrowser.appdata.xml`.
+- The desktop file `qutebrowser.desktop` is now renamed to
+  `org.qutebrowser.qutebrowser.desktop`.
 - The `qute-pass` userscript now understands domains in gpg filenames
   in addition to directory names.
 - The autocompletion for `content.headers.user_agent` got updated to only

misc/org.qutebrowser.qutebrowser.appdata.xml

@@ -20,7 +20,7 @@
 	<provides>
 		<binary>qutebrowser</binary>
 	</provides>
-	<launchable type="desktop-id">qutebrowser.desktop</launchable>
+	<launchable type="desktop-id">org.qutebrowser.qutebrowser.desktop</launchable>
 	<screenshots>
 		<screenshot type="default">
 			<image>https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/main.png</image>