r12681 - in /desktop/unstable/deskbar-applet/debian: changelog patches/100-fix-pythonlib.patch patches/100-gpm-methods.patch patches/100-iceweasel-compat.patch

[rfrancoise at users.alioth.debian.org]

Author: rfrancoise
Date: Fri Sep 21 20:52:00 2007
New Revision: 12681

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12681
Log:
 * New upstream release.
 * debian/patches/100-iceweasel-compat.patch: Resync against new upstream.
 * debian/patches/100-gpm-methods.patch: Dropped.
 * debian/patches/100-fix-pythonlib.patch: Dropped.

Removed:
    desktop/unstable/deskbar-applet/debian/patches/100-fix-pythonlib.patch
    desktop/unstable/deskbar-applet/debian/patches/100-gpm-methods.patch
Modified:
    desktop/unstable/deskbar-applet/debian/changelog
    desktop/unstable/deskbar-applet/debian/patches/100-iceweasel-compat.patch

Modified: desktop/unstable/deskbar-applet/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/deskbar-applet/debian/changelog?rev=12681&op=diff
==============================================================================
--- desktop/unstable/deskbar-applet/debian/changelog (original)
+++ desktop/unstable/deskbar-applet/debian/changelog Fri Sep 21 20:52:00 2007
@@ -1,3 +1,13 @@
+deskbar-applet (2.20.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+  * debian/patches/100-iceweasel-compat.patch: Resync against new upstream.
+  * debian/patches/100-gpm-methods.patch: Dropped.
+  * debian/patches/100-fix-pythonlib.patch: Dropped.
+
+ -- Romain Francoise <rfrancoise at debian.org>  Thu, 20 Sep 2007 21:36:36 +0200
+
 deskbar-applet (2.18.1-2) unstable; urgency=low
 
   * debian/patches/100-gpm-methods.patch: New patch stolen from Ubuntu,

Modified: desktop/unstable/deskbar-applet/debian/patches/100-iceweasel-compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/deskbar-applet/debian/patches/100-iceweasel-compat.patch?rev=12681&op=diff
==============================================================================
--- desktop/unstable/deskbar-applet/debian/patches/100-iceweasel-compat.patch (original)
+++ desktop/unstable/deskbar-applet/debian/patches/100-iceweasel-compat.patch Fri Sep 21 20:52:00 2007
@@ -1,37 +1,30 @@
---- deskbar/handlers/mozilla.py	2007-01-11 13:13:53.000000000 +0100
-+++ deskbar/handlers/mozilla.py	2007-06-03 19:11:17.000000000 +0200
-@@ -20,7 +20,7 @@
+--- deskbar/handlers/mozilla.py.orig	2007-09-20 21:33:19.000000000 +0200
++++ deskbar/handlers/mozilla.py	2007-09-20 21:35:18.000000000 +0200
+@@ -22,7 +22,7 @@
  
  # Whether we will index firefox or mozilla bookmarks
  USING_FIREFOX = False
 -if is_preferred_browser("firefox"):
 +if is_preferred_browser("firefox") or is_preferred_browser("iceweasel"):
- 	USING_FIREFOX = True
- 		
+     USING_FIREFOX = True
+         
  # File returned here should be checked for existence
-@@ -112,13 +112,13 @@
- #	if deskbar.UNINSTALLED_DESKBAR:
- #		return (deskbar.Handler.HANDLER_IS_HAPPY, None, None)
- 	
--	if is_preferred_browser("firefox") or is_preferred_browser("mozilla"):
-+	if is_preferred_browser("firefox") or is_preferred_browser("mozilla") or is_preferred_browser("iceweasel"):
- 		return (deskbar.Handler.HANDLER_IS_HAPPY, None, None)
- 	else:
- 		return (deskbar.Handler.HANDLER_IS_NOT_APPLICABLE, "Mozilla/Firefox is not your preferred browser, not using it.", None)
- 		
- def _check_requirements_search():
--	if is_preferred_browser("firefox"):
-+	if is_preferred_browser("firefox") or is_preferred_browser("iceweasel"):
- 		return (deskbar.Handler.HANDLER_IS_CONFIGURABLE, _("You can customize which search engines are offered."), _on_handler_preferences)
- 	elif is_preferred_browser("mozilla"):
- 		# TODO - similar functionality for old-school mozilla (not firefox)
-@@ -211,7 +211,8 @@
- 				"/usr/lib/firefox/searchplugins",
- 				"/usr/local/lib/firefox/searchplugins",
- 				"/usr/lib/mozilla-firefox/searchplugins",
--				"/usr/local/lib/mozilla-firefox/searchplugins"]
-+				"/usr/local/lib/mozilla-firefox/searchplugins",
-+				"/usr/lib/iceweasel/searchplugins"]
- 		else:
- 			smart_dirs = [
- 				get_mozilla_home_file("search"),
+@@ -208,7 +208,8 @@
+                 expanduser("~/.mozilla/searchplugins"),
+                 "/usr/local/lib/firefox/searchplugins",
+                 "/usr/lib/mozilla-firefox/searchplugins",
+-                "/usr/local/lib/mozilla-firefox/searchplugins"] + \
++                "/usr/local/lib/mozilla-firefox/searchplugins",
++                "/usr/lib/iceweasel/searchplugins"] + \
+                 glob.glob("/usr/lib*/firefox*/searchplugins")
+         else:
+             smart_dirs = [
+@@ -249,7 +250,7 @@
+     
+     @staticmethod
+     def has_requirements():
+-        if is_preferred_browser("firefox"):
++        if is_preferred_browser("firefox") or is_preferred_browser("iceweasel"):
+             MozillaSearchHandler.INSTRUCTIONS = _("You can customize which search engines are offered.")
+             return True
+         elif is_preferred_browser("mozilla"):