=== modified file 'debian/changelog'
--- debian/changelog	2008-10-16 11:04:04 +0000
+++ debian/changelog	2008-10-23 14:59:39 +0000
@@ -1,3 +1,17 @@
+app-install-data-ubuntu (0.6.10.1) intrepid; urgency=low
+
+  * update desktop files in menu-data-xul-extensions (LP: #287270)
+    - add torbutton-extension.desktop
+    - add pwdhash.desktop
+    - remove application/x-debian-xul-extension-firefox-2 MimeType
+      from .desktop files
+    - update MimeType in .desktop files that now support Firefox 3
+    - remove .desktop files that don't support Firefox 3:
+      + mozilla-bookmarksftp.desktop
+      + firefox-themes-ubuntu.desktop
+
+ -- Sasa Bodiroza <sasa@cakana>  Thu, 23 Oct 2008 16:59:10 +0200
+
 app-install-data-ubuntu (0.6.10) intrepid; urgency=low
 
   * updated for the release candidate

=== modified file 'menu-data-xul-extensions/adblock-plus.desktop'
--- menu-data-xul-extensions/adblock-plus.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/adblock-plus.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=adblock-plus
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=adblock-plus

=== modified file 'menu-data-xul-extensions/all-in-one-sidebar.desktop'
--- menu-data-xul-extensions/all-in-one-sidebar.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/all-in-one-sidebar.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=all-in-one-sidebar
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=all-in-one-sidebar

=== modified file 'menu-data-xul-extensions/firebug.desktop'
--- menu-data-xul-extensions/firebug.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/firebug.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=firebug
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=firebug

=== modified file 'menu-data-xul-extensions/firefox-greasemonkey.desktop'
--- menu-data-xul-extensions/firefox-greasemonkey.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/firefox-greasemonkey.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=firefox-greasemonkey
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=firefox-greasemonkey

=== modified file 'menu-data-xul-extensions/firefox-launchpad-plugin.desktop'
--- menu-data-xul-extensions/firefox-launchpad-plugin.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/firefox-launchpad-plugin.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=firefox-launchpad-plugin
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=firefox-launchpad-plugin

=== modified file 'menu-data-xul-extensions/firefox-sage.desktop'
--- menu-data-xul-extensions/firefox-sage.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/firefox-sage.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=firefox-sage
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=firefox-sage

=== modified file 'menu-data-xul-extensions/firefox-showcase.desktop'
--- menu-data-xul-extensions/firefox-showcase.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/firefox-showcase.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=firefox-showcase
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox
+MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
 StartupNotify=true
 
 X-AppInstall-Package=firefox-showcase

=== removed file 'menu-data-xul-extensions/firefox-themes-ubuntu.desktop'
--- menu-data-xul-extensions/firefox-themes-ubuntu.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/firefox-themes-ubuntu.desktop	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Ubuntu themes for Firefox
-Comment=Firefox themes matching the Ubuntu desktop look
-GenericName=Firefoxtheme
-Type=Application
-Icon=firefox-themes-ubuntu
-Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox-2
-StartupNotify=true
-
-X-AppInstall-Package=firefox-themes-ubuntu
-X-AppInstall-Popcon=358
-X-AppInstall-Section=universe

=== modified file 'menu-data-xul-extensions/firefox-ubuntu-it-menu.desktop'
--- menu-data-xul-extensions/firefox-ubuntu-it-menu.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/firefox-ubuntu-it-menu.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=firefox-ubuntu-it-menu
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=firefox-ubuntu-it-menu

=== modified file 'menu-data-xul-extensions/firefox-webdeveloper.desktop'
--- menu-data-xul-extensions/firefox-webdeveloper.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/firefox-webdeveloper.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=firefox-webdeveloper
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=firefox-webdeveloper

=== modified file 'menu-data-xul-extensions/flashblock.desktop'
--- menu-data-xul-extensions/flashblock.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/flashblock.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=flashblock
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=flashblock

=== modified file 'menu-data-xul-extensions/foxyproxy.desktop'
--- menu-data-xul-extensions/foxyproxy.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/foxyproxy.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=foxyproxy
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=foxyproxy

=== modified file 'menu-data-xul-extensions/mozgest.desktop'
--- menu-data-xul-extensions/mozgest.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/mozgest.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=mozgest
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2;application/x-debian-xul-extension-thunderbird
+MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-thunderbird
 StartupNotify=true
 
 X-AppInstall-Package=mozgest

=== modified file 'menu-data-xul-extensions/mozilla-beagle.desktop'
--- menu-data-xul-extensions/mozilla-beagle.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/mozilla-beagle.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=mozilla-beagle
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=mozilla-beagle

=== modified file 'menu-data-xul-extensions/mozilla-biofox.desktop'
--- menu-data-xul-extensions/mozilla-biofox.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/mozilla-biofox.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=mozilla-biofox
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=mozilla-biofox

=== removed file 'menu-data-xul-extensions/mozilla-bookmarksftp.desktop'
--- menu-data-xul-extensions/mozilla-bookmarksftp.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/mozilla-bookmarksftp.desktop	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=bookmarksftp extension for Firefox/Iceweasel
-Comment=Iceweasel/Firefox extension to synchronize bookmarks
-GenericName=Firefox/Iceweasel bookmarks extension
-Type=Application
-Icon=
-Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox
-StartupNotify=true
-
-X-AppInstall-Package=mozilla-bookmarksftp
-X-AppInstall-Popcon=0
-X-AppInstall-Section=universe

=== modified file 'menu-data-xul-extensions/mozilla-ctxextensions.desktop'
--- menu-data-xul-extensions/mozilla-ctxextensions.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/mozilla-ctxextensions.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=mozilla-ctxextensions

=== modified file 'menu-data-xul-extensions/mozilla-imagezoom.desktop'
--- menu-data-xul-extensions/mozilla-imagezoom.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/mozilla-imagezoom.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=mozilla-imagezoom
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2;application/x-debian-xul-extension-thunderbird
+MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-thunderbird
 StartupNotify=true
 
 X-AppInstall-Package=mozilla-imagezoom

=== modified file 'menu-data-xul-extensions/mozilla-livehttpheaders.desktop'
--- menu-data-xul-extensions/mozilla-livehttpheaders.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/mozilla-livehttpheaders.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=mozilla-livehttpheaders
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=mozilla-livehttpheaders

=== modified file 'menu-data-xul-extensions/mozilla-noscript.desktop'
--- menu-data-xul-extensions/mozilla-noscript.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/mozilla-noscript.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=mozilla-noscript
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=mozilla-noscript

=== modified file 'menu-data-xul-extensions/mozilla-stumbleupon.desktop'
--- menu-data-xul-extensions/mozilla-stumbleupon.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/mozilla-stumbleupon.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=mozilla-stumbleupon
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=mozilla-stumbleupon

=== modified file 'menu-data-xul-extensions/mozilla-venkman.desktop'
--- menu-data-xul-extensions/mozilla-venkman.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/mozilla-venkman.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=mozilla-venkman
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2;application/x-debian-xul-extension-thunderbird
+MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-thunderbird
 StartupNotify=true
 
 X-AppInstall-Package=mozilla-venkman

=== added file 'menu-data-xul-extensions/pwdhash.desktop'
--- menu-data-xul-extensions/pwdhash.desktop	1970-01-01 00:00:00 +0000
+++ menu-data-xul-extensions/pwdhash.desktop	2008-10-23 14:57:38 +0000
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=PwdHash extension for Firefox
+Comment=This extension automatically generates per-site passwords if you prefix your password with @@ or press F2 beforehand.
+GenericName=Firefox password hashing extension
+Type=Application
+Icon=
+Categories=Application;Network;
+MimeType=application/x-debian-xul-extension-firefox
+StartupNotify=true
+
+X-AppInstall-Package=pwdhash
+X-AppInstall-Popcon=0
+X-AppInstall-Section=universe

=== modified file 'menu-data-xul-extensions/scrapbook.desktop'
--- menu-data-xul-extensions/scrapbook.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/scrapbook.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=scrapbook
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=scrapbook

=== modified file 'menu-data-xul-extensions/speeddial.desktop'
--- menu-data-xul-extensions/speeddial.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/speeddial.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=speeddial
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=speeddial

=== added file 'menu-data-xul-extensions/torbutton-extension.desktop'
--- menu-data-xul-extensions/torbutton-extension.desktop	1970-01-01 00:00:00 +0000
+++ menu-data-xul-extensions/torbutton-extension.desktop	2008-10-23 14:57:38 +0000
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Torbutton extension for Firefox
+Comment=Firefox 1-click Tor extension
+GenericName=Firefox extension
+Type=Application
+Icon=torbutton-extension
+Categories=Application;Network;
+MimeType=application/x-debian-xul-extension-firefox
+StartupNotify=true
+
+X-AppInstall-Package=torbutton-extension
+X-AppInstall-Popcon=0
+X-AppInstall-Section=main

=== modified file 'menu-data-xul-extensions/ubufox.desktop'
--- menu-data-xul-extensions/ubufox.desktop	2008-03-14 10:49:50 +0000
+++ menu-data-xul-extensions/ubufox.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=ubufox
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox
+MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
 StartupNotify=true
 
 X-AppInstall-Package=ubufox

=== modified file 'menu-data-xul-extensions/useragentswitcher.desktop'
--- menu-data-xul-extensions/useragentswitcher.desktop	2008-08-21 11:47:11 +0000
+++ menu-data-xul-extensions/useragentswitcher.desktop	2008-10-23 14:54:28 +0000
@@ -6,7 +6,7 @@
 Type=Application
 Icon=useragentswitcher
 Categories=Application;Network;
-MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
+MimeType=application/x-debian-xul-extension-firefox
 StartupNotify=true
 
 X-AppInstall-Package=useragentswitcher