[Pkg-cli-apps-commits] [SCM] gnome-do-plugins branch, master, updated. a1493a1bf8773d84b181659931de93c79dcd269b

[Christopher James Halse Rogers]

The following commit has been merged in the master branch:
commit 538ce6c21ed2d44fe2cbbcd232ded230f310848e
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date:   Thu Feb 24 11:02:15 2011 +1100

    Fix dh_auto_test
    
    make check in po/ runs intltool-extract, which incorrectly picks up
    quilt files in .pc, and fails.

diff --git a/debian/patches/01_firefox_iceweasel_rename.patch b/debian/patches/01_firefox_iceweasel_rename.patch
old mode 100755
new mode 100644
index 5155b01..c277af3
--- a/debian/patches/01_firefox_iceweasel_rename.patch
+++ b/debian/patches/01_firefox_iceweasel_rename.patch
@@ -9,8 +9,10 @@
 ## DP: Iceweasel bookmarks.
 
 @DPATCH@
---- gnome-do-plugins-0.8.2.1.orig/Firefox/src/PlacesItemSource.cs
-+++ gnome-do-plugins-0.8.2.1/Firefox/src/PlacesItemSource.cs
+Index: gnome-do-plugins/Firefox/src/PlacesItemSource.cs
+===================================================================
+--- gnome-do-plugins.orig/Firefox/src/PlacesItemSource.cs	2011-02-23 22:28:24.781232052 +1100
++++ gnome-do-plugins/Firefox/src/PlacesItemSource.cs	2011-02-24 10:47:31.564914977 +1100
 @@ -161,8 +161,13 @@
  			profile = null;
  			home = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
@@ -36,8 +38,10 @@
  		}
  
  
---- gnome-do-plugins-0.8.2.1.orig/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
-+++ gnome-do-plugins-0.8.2.1/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
+Index: gnome-do-plugins/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
+===================================================================
+--- gnome-do-plugins.orig/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs	2011-02-23 22:28:24.801232770 +1100
++++ gnome-do-plugins/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs	2011-02-24 10:47:31.594916063 +1100
 @@ -37,6 +37,9 @@
  	/// </summary>
  	public class FirefoxOpenSearchDirectoryProvider
@@ -48,7 +52,7 @@
  		private List<string> openSearchPluginDirectories;
  		
  		/// <summary>
-@@ -82,11 +85,17 @@
+@@ -88,11 +91,17 @@
  				// for installing in different directories. We could certainly shell
  				// out and call which or something...
  				string beginLibDir = "LIBDIR=";
@@ -67,7 +71,7 @@
  				using (StreamReader r = File.OpenText (binFile)) {
  					while (null != (line = r.ReadLine ())) {
  						if (line.StartsWith (beginLibDir)) {
-@@ -111,6 +120,18 @@
+@@ -117,6 +126,18 @@
  			return null;
  		}
  		
@@ -86,7 +90,7 @@
  		/// <summary>
  		/// Retrieves the profile plugin directory, which is where the 
  		/// user installed OpenSearch plugins are located.
-@@ -128,7 +149,7 @@
+@@ -134,7 +155,7 @@
  				
  				profile = null;				
  				
@@ -95,7 +99,7 @@
  				using (StreamReader r = File.OpenText (profilePath)) {
  					while (null != (line = r.ReadLine ())) {
  						if (line.StartsWith (beginDefaultProfile)) break;
-@@ -141,7 +162,7 @@
+@@ -147,7 +168,7 @@
  				}
  							
  				if(profile != null) {
@@ -104,3 +108,11 @@
  					path = Path.Combine (path, profile);
  					path = Path.Combine (path, "searchplugins");
  				
+Index: gnome-do-plugins/po/POTFILES.skip
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gnome-do-plugins/po/POTFILES.skip	2011-02-24 10:48:49.917749384 +1100
+@@ -0,0 +1,3 @@
++# dh_auto_test runs intltool-extract, which bombs because this isn't
++# in POTFILES.in.  Bah!
++.pc/01_firefox_iceweasel_rename.patch/Firefox/src/PlacesItemSource.cs

-- 
gnome-do-plugins