[Pkg-cli-apps-commits] r4519 - in /packages/gnome-do-plugins/trunk/debian: changelog patches/01_firefox_iceweasel_rename.dpatch
raof-guest at users.alioth.debian.org
raof-guest at users.alioth.debian.org
Sat Feb 14 05:50:05 UTC 2009
Author: raof-guest
Date: Sat Feb 14 05:50:04 2009
New Revision: 4519
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4519
Log:
Update firefox-to-iceweasel patch
Modified:
packages/gnome-do-plugins/trunk/debian/changelog
packages/gnome-do-plugins/trunk/debian/patches/01_firefox_iceweasel_rename.dpatch
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=4519&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/changelog (original)
+++ packages/gnome-do-plugins/trunk/debian/changelog Sat Feb 14 05:50:04 2009
@@ -2,7 +2,7 @@
* New upstream version
* debian/control:
- + gnome-sharp2 transition
+ + gnome-sharp2 transition (LP: #314516)
+ Add banshee build-dep
+ Drop monodevelop build-dep; upstream uses mautil rather than mdtool now
+ Bump required gnome-do version in Build-Dep & Depends.
@@ -13,6 +13,9 @@
+ Rework clean target to simply delete files generated by autoreconf,
rather than trying to preserve them.
+ Remove XDG_CONFIG_DIR hack needed for mdtool
+ * debian/patches/01_firefox_iceweasel_rename:
+ + Refresh for new upsteam changes.
+ + Extend to also make the Firefox bookmark plugin index iceweasel bookmarks
-- Christopher James Halse Rogers <raof at ubuntu.com> Thu, 05 Feb 2009 16:58:51 +1100
Modified: packages/gnome-do-plugins/trunk/debian/patches/01_firefox_iceweasel_rename.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/patches/01_firefox_iceweasel_rename.dpatch?rev=4519&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/01_firefox_iceweasel_rename.dpatch (original)
+++ packages/gnome-do-plugins/trunk/debian/patches/01_firefox_iceweasel_rename.dpatch Sat Feb 14 05:50:04 2009
@@ -5,14 +5,31 @@
## DP: but of course, on a Debian system this is to be found under
## DP: iceweasel, not firefox.
## DP:
-## DP: This patch simply broadens the regexp used in locate to allow
-## DP: either path.
+## DP: This patch also makes the Firefox bookmarks plugin index
+## DP: Iceweasel bookmarks.
@DPATCH@
-diff -urNad gnome-do-plugins-0.6.0.0+dfsg~/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs gnome-do-plugins-0.6.0.0+dfsg/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
---- gnome-do-plugins-0.6.0.0+dfsg~/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs 2008-08-01 08:29:50.000000000 +1000
-+++ gnome-do-plugins-0.6.0.0+dfsg/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs 2008-08-28 08:23:03.000000000 +1000
-@@ -35,6 +35,9 @@
+diff -urNad gnome-do-plugins-0.8.0.2+dfsg~/Firefox/src/BookmarkItemSource.cs gnome-do-plugins-0.8.0.2+dfsg/Firefox/src/BookmarkItemSource.cs
+--- gnome-do-plugins-0.8.0.2+dfsg~/Firefox/src/BookmarkItemSource.cs 2009-02-05 11:09:32.000000000 +1100
++++ gnome-do-plugins-0.8.0.2+dfsg/Firefox/src/BookmarkItemSource.cs 2009-02-14 16:07:30.311657330 +1100
+@@ -94,7 +94,12 @@
+
+ home = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
+ profile = null;
+- path = Path.Combine (home, ".mozilla/firefox/profiles.ini");
++ path = Path.Combine (home, ".mozilla");
++ if (Directory.Exists (Path.Combine (path, "firefox"))) {
++ path = Path.Combine (path, "firefox/profile.ini");
++ } else if (Directory.Exists (Path.Combine (path, "iceweasel"))) {
++ path = Path.Combine (path, "iceweasel/profile.ini");
++ }
+ using (StreamReader r = File.OpenText (path)) {
+ while (null != (line = r.ReadLine ())) {
+ if (line.StartsWith (BeginDefaultProfile)) break;
+diff -urNad gnome-do-plugins-0.8.0.2+dfsg~/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs gnome-do-plugins-0.8.0.2+dfsg/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
+--- gnome-do-plugins-0.8.0.2+dfsg~/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs 2009-02-05 11:09:31.000000000 +1100
++++ gnome-do-plugins-0.8.0.2+dfsg/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs 2009-02-14 16:18:21.656805145 +1100
+@@ -37,6 +37,9 @@
/// </summary>
public class FirefoxOpenSearchDirectoryProvider
{
@@ -22,7 +39,7 @@
private List<string> openSearchPluginDirectories;
/// <summary>
-@@ -78,11 +81,17 @@
+@@ -82,11 +85,17 @@
// for installing in different directories. We could certainly shell
// out and call which or something...
string beginLibDir = "LIBDIR=";
@@ -41,13 +58,13 @@
using (StreamReader r = File.OpenText (binFile)) {
while (null != (line = r.ReadLine ())) {
if (line.StartsWith (beginLibDir)) {
-@@ -105,6 +114,18 @@
+@@ -111,6 +120,18 @@
return null;
}
+ private string UserBrowserPath {
+ get {
-+ string mozillaPath = Path.Combine (Paths.UserHome, ".mozilla");
++ string mozillaPath = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), ".mozilla");
+ if (Directory.Exists (Path.Combine (mozillaPath, "firefox"))) {
+ mozillaPath = Path.Combine (mozillaPath, "firefox");
+ } else if (Directory.Exists (Path.Combine (mozillaPath, "iceweasel"))) {
@@ -60,22 +77,21 @@
/// <summary>
/// Retrieves the profile plugin directory, which is where the
/// user installed OpenSearch plugins are located.
-@@ -122,7 +143,7 @@
+@@ -128,7 +149,7 @@
profile = null;
-- profilePath = Path.Combine (Paths.UserHome, ".mozilla/firefox/profiles.ini");
+- profilePath = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), ".mozilla/firefox/profiles.ini");
+ profilePath = Path.Combine (UserBrowserPath, "profiles.ini");
using (StreamReader r = File.OpenText (profilePath)) {
while (null != (line = r.ReadLine ())) {
if (line.StartsWith (beginDefaultProfile)) break;
-@@ -135,8 +156,7 @@
+@@ -141,7 +162,7 @@
}
if(profile != null) {
-- string path = Path.Combine (Paths.UserHome, ".mozilla/firefox");
-- path = Path.Combine (path, profile);
-+ string path = Path.Combine (UserBrowserPath, profile);
+- string path = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), ".mozilla/firefox");
++ string path = UserBrowserPath
+ path = Path.Combine (path, profile);
path = Path.Combine (path, "searchplugins");
- return path;
More information about the Pkg-cli-apps-commits
mailing list