Merge lp:~jbicha/app-install-data-ubuntu/cleanup-firefox-extensions into lp:app-install-data-ubuntu

[Jeremy Bícha]

=== removed file 'menu-data-xul-extensions/all-in-one-sidebar.desktop'
--- menu-data-xul-extensions/all-in-one-sidebar.desktop	2008-10-23 20:19:18 +0000
+++ menu-data-xul-extensions/all-in-one-sidebar.desktop	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=All in one Sidebar extension for Firefox
-Comment=A sidebar extension for Firefox
-GenericName=Firefox extension
-Type=Application
-Icon=all-in-one-sidebar
-Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox
-StartupNotify=true
-
-X-AppInstall-Package=all-in-one-sidebar
-X-AppInstall-Popcon=0
-X-AppInstall-Section=universe

=== removed file 'menu-data-xul-extensions/firebug.desktop'
--- menu-data-xul-extensions/firebug.desktop	2010-08-01 12:49:23 +0000
+++ menu-data-xul-extensions/firebug.desktop	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Firebug extension for Firefox
-Comment=Powerful web development extension
-GenericName=Firefox extension
-Type=Application
-Icon=firebug
-Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox
-StartupNotify=true
-
-X-AppInstall-Package=xul-ext-firebug
-X-AppInstall-Popcon=0
-X-AppInstall-Section=universe

=== removed file 'menu-data-xul-extensions/firefox-greasemonkey.desktop'
--- menu-data-xul-extensions/firefox-greasemonkey.desktop	2010-08-01 12:49:23 +0000
+++ menu-data-xul-extensions/firefox-greasemonkey.desktop	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Greasemonkey extension for Firefox
-Comment=Firefox extension that enables customization of webpages with user scripts
-GenericName=Firefox user-script extension
-Type=Application
-Icon=firefox-greasemonkey
-Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox
-StartupNotify=true
-
-X-AppInstall-Package=xul-ext-greasemonkey
-X-AppInstall-Popcon=0
-X-AppInstall-Section=universe

=== removed file 'menu-data-xul-extensions/firefox-ubuntu-it-menu.desktop'
--- menu-data-xul-extensions/firefox-ubuntu-it-menu.desktop	2008-10-23 20:19:18 +0000
+++ menu-data-xul-extensions/firefox-ubuntu-it-menu.desktop	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Ubuntu-it menu extension for Firefox
-Comment=Firefox extension for a quick browse of Ubuntu-it community
-GenericName=Firefox extension
-Type=Application
-Icon=firefox-ubuntu-it-menu
-Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox
-StartupNotify=true
-
-X-AppInstall-Package=firefox-ubuntu-it-menu
-X-AppInstall-Popcon=0
-X-AppInstall-Section=universe

=== removed file 'menu-data-xul-extensions/flashblock.desktop'
--- menu-data-xul-extensions/flashblock.desktop	2010-08-01 12:49:23 +0000
+++ menu-data-xul-extensions/flashblock.desktop	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Flashblock extension for Firefox
-Comment=Firefox extension that replaces flash plugin by a button
-GenericName=Firefox extension
-Type=Application
-Icon=flashblock
-Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox
-StartupNotify=true
-
-X-AppInstall-Package=xul-ext-flashblock
-X-AppInstall-Popcon=0
-X-AppInstall-Section=universe

=== renamed file 'menu-data-xul-extensions/ubufox.desktop' => 'menu-data-xul-extensions/xul-ext-ubufox.desktop'
--- menu-data-xul-extensions/ubufox.desktop	2011-01-27 16:43:28 +0000
+++ menu-data-xul-extensions/xul-ext-ubufox.desktop	2011-04-29 12:25:33 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Ubufox extension for Firefox
-Comment=Extension package for Firefox, that ships various modifications for the Ubuntu default install of Firefox.
+Comment=Ubuntu-specific configuration defaults and apt support for Firefox
 GenericName=Firefox theme extension
 Type=Application
 Icon=ubufox
@@ -9,6 +9,6 @@
 MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
 StartupNotify=true
 
-X-AppInstall-Package=ubufox
+X-AppInstall-Package=xul-ext-ubufox
 X-AppInstall-Popcon=1
 X-AppInstall-Section=main