[Pkg-cli-apps-commits] r5281 - in /packages/gnome-do-plugins/trunk/debian: changelog patches/02_fix_firefox_icon.patch patches/series

[raof-guest at users.alioth.debian.org]

Author: raof-guest
Date: Sat Jan 30 11:20:05 2010
New Revision: 5281

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5281
Log:
* debian/patches/02_fix_firefox_icon.patch
  + Use the unversioned "firefox" icon name.  Both Iceweasel in Sid and 
    Firefox 3.6 in Lucid ship this icon. (Closes: #544075) (LP: #444171)

Added:
    packages/gnome-do-plugins/trunk/debian/patches/02_fix_firefox_icon.patch
Modified:
    packages/gnome-do-plugins/trunk/debian/changelog
    packages/gnome-do-plugins/trunk/debian/patches/series

Modified: packages/gnome-do-plugins/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/changelog?rev=5281&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/changelog (original)
+++ packages/gnome-do-plugins/trunk/debian/changelog Sat Jan 30 11:20:05 2010
@@ -10,6 +10,9 @@
       libmono-addins-cil-dev.  The build system doesn't actually *use* mautil,
       and hasn't for a couple of releases.  Upstream's buildsystem maintainer
       should perhaps pay more attention ;).
+  * debian/patches/02_fix_firefox_icon.patch
+    + Use the unversioned "firefox" icon name.  Both Iceweasel in Sid and 
+      Firefox 3.6 in Lucid ship this icon. (Closes: #544075) (LP: #444171)
 
  -- Christopher James Halse Rogers <raof at ubuntu.com>  Sat, 30 Jan 2010 17:18:47 +1100
 

Added: packages/gnome-do-plugins/trunk/debian/patches/02_fix_firefox_icon.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/patches/02_fix_firefox_icon.patch?rev=5281&op=file
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/02_fix_firefox_icon.patch (added)
+++ packages/gnome-do-plugins/trunk/debian/patches/02_fix_firefox_icon.patch Sat Jan 30 11:20:05 2010
@@ -1,0 +1,45 @@
+Description: Fix the Firefox icon name.
+ Upstream has been chasing the firefox icon name in Ubuntu.
+ Iceweasel ships a "firefox" icon, as does Firefox 3.6 in Ubuntu.
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=544075
+Author: Christopher Halse Rogers <raof at ubuntu.com>
+
+Index: gnome-do-plugins-0.8.2.1+dfsg/Firefox/src/BrowseBookmarkItem.cs
+===================================================================
+--- gnome-do-plugins-0.8.2.1+dfsg.orig/Firefox/src/BrowseBookmarkItem.cs	2010-01-30 22:02:27.039283652 +1100
++++ gnome-do-plugins-0.8.2.1+dfsg/Firefox/src/BrowseBookmarkItem.cs	2010-01-30 22:03:07.890535250 +1100
+@@ -35,7 +35,7 @@
+ 		}
+ 		
+ 		public override string Icon {
+-			get { return "firefox-3.0"; } 
++			get { return "firefox"; } 
+ 		}
+ 	}
+ }
+Index: gnome-do-plugins-0.8.2.1+dfsg/Firefox/src/BrowseHistoryItem.cs
+===================================================================
+--- gnome-do-plugins-0.8.2.1+dfsg.orig/Firefox/src/BrowseHistoryItem.cs	2010-01-30 22:02:20.979315484 +1100
++++ gnome-do-plugins-0.8.2.1+dfsg/Firefox/src/BrowseHistoryItem.cs	2010-01-30 22:02:58.859314731 +1100
+@@ -37,7 +37,7 @@
+ 		}
+ 		
+ 		public override string Icon {
+-			get { return "firefox-3.0"; }
++			get { return "firefox"; }
+ 		}
+ 	}
+ }
+Index: gnome-do-plugins-0.8.2.1+dfsg/Firefox/src/PlacesItemSource.cs
+===================================================================
+--- gnome-do-plugins-0.8.2.1+dfsg.orig/Firefox/src/PlacesItemSource.cs	2010-01-30 22:02:10.249311084 +1100
++++ gnome-do-plugins-0.8.2.1+dfsg/Firefox/src/PlacesItemSource.cs	2010-01-30 22:02:42.460536959 +1100
+@@ -74,7 +74,7 @@
+ 		}
+ 
+ 		public override string Icon {
+-			get { return "firefox-3.0"; }
++			get { return "firefox"; }
+ 		}
+ 
+ 		public override IEnumerable<Item> Items {

Modified: packages/gnome-do-plugins/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/patches/series?rev=5281&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/series (original)
+++ packages/gnome-do-plugins/trunk/debian/patches/series Sat Jan 30 11:20:05 2010
@@ -1,2 +1,3 @@
 00_debian_default_plugins.patch
 01_firefox_iceweasel_rename.patch
+02_fix_firefox_icon.patch