r15585 - in /desktop/unstable/deskbar-applet/debian: changelog patches/100-iceweasel-compat.patch

[rfrancoise at users.alioth.debian.org]

Author: rfrancoise
Date: Tue Apr  8 17:41:56 2008
New Revision: 15585

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15585
Log:
* New upstream stable release.
* debian/patches/100-iceweasel-compat.patch: Resurrect patch with
  additional fixes not included upstream, thanks to Hongzheng Wang
  (closes: #474978).

Added:
    desktop/unstable/deskbar-applet/debian/patches/100-iceweasel-compat.patch
Modified:
    desktop/unstable/deskbar-applet/debian/changelog

Modified: desktop/unstable/deskbar-applet/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/deskbar-applet/debian/changelog?rev=15585&op=diff
==============================================================================
--- desktop/unstable/deskbar-applet/debian/changelog (original)
+++ desktop/unstable/deskbar-applet/debian/changelog Tue Apr  8 17:41:56 2008
@@ -1,3 +1,12 @@
+deskbar-applet (2.22.1-1) unstable; urgency=low
+
+  * New upstream stable release.
+  * debian/patches/100-iceweasel-compat.patch: Resurrect patch with
+    additional fixes not included upstream, thanks to Hongzheng Wang
+    (closes: #474978).
+
+ -- Romain Francoise <rfrancoise at debian.org>  Tue, 08 Apr 2008 18:36:46 +0200
+
 deskbar-applet (2.22.0.1-1) unstable; urgency=low
 
   * New upstream release:

Added: 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=15585&op=file
==============================================================================
--- desktop/unstable/deskbar-applet/debian/patches/100-iceweasel-compat.patch (added)
+++ desktop/unstable/deskbar-applet/debian/patches/100-iceweasel-compat.patch Tue Apr  8 17:41:56 2008
@@ -1,0 +1,24 @@
+diff --git a/deskbar/handlers/mozilla.py b/deskbar/handlers/mozilla.py
+index f772b55..519a24b 100644
+--- a/deskbar/handlers/mozilla.py
++++ b/deskbar/handlers/mozilla.py
+@@ -209,7 +209,8 @@ class MozillaBookmarksHandler(deskbar.interfaces.Module):
+     def has_requirements():
+         if is_preferred_browser("mozilla"):
+             return True
+-        elif is_preferred_browser("firefox"):
++        elif is_preferred_browser("firefox") \
++                or is_preferred_browser("iceweasel"):
+             if MozillaBookmarksHandler.has_firefox_version():
+                 return True
+             # TODO: mark as i18n
+@@ -822,7 +823,8 @@ class MozillaHistoryHandler(deskbar.interfaces.Module):
+     def has_requirements():
+         if is_preferred_browser("mozilla"):
+             return True
+-        elif is_preferred_browser("firefox"):
++        elif is_preferred_browser("firefox") \
++                or is_preferred_browser("iceweasel"):
+             if MozillaBookmarksHandler.has_firefox_version():
+                 return True
+             # TODO: mark as i18n