[Pkg-cli-apps-commits] r4989 - in /packages/gnome-do-plugins/trunk/debian: ./ patches/

raof-guest at users.alioth.debian.org raof-guest at users.alioth.debian.org
Sun Jun 28 11:39:10 UTC 2009


Author: raof-guest
Date: Sun Jun 28 11:39:08 2009
New Revision: 4989

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4989
Log:
* New upstream release
* debian/rules:
  + Update get-orig-source target.  Upstream no longer ships gdata* binaries,
    so we no longer need to strip them
* debian/patches/00_use_system_gdata
  + Drop.  Upstream now builds against system libgdata.
* debian/patches/04_fix_pidgin_dbus_ints
* debian/patches/10_fix_rhythmbox_file
* debian/patches/15_twitter_api
* debian/patches/20_twitter_overflow:
  + Drop.  Included upstream.
* debian/patches/01_firefox_iceweasel_rename:
  + Refresh for new version

Removed:
    packages/gnome-do-plugins/trunk/debian/patches/00_use_system_gdata.dpatch
    packages/gnome-do-plugins/trunk/debian/patches/04_fix_pidgin_dbus_ints.dpatch
    packages/gnome-do-plugins/trunk/debian/patches/10_fix_rhythmbox_file.dpatch
    packages/gnome-do-plugins/trunk/debian/patches/15_twitter_api.dpatch
    packages/gnome-do-plugins/trunk/debian/patches/20_twitter_overflow.dpatch
Modified:
    packages/gnome-do-plugins/trunk/debian/changelog
    packages/gnome-do-plugins/trunk/debian/control
    packages/gnome-do-plugins/trunk/debian/patches/00list
    packages/gnome-do-plugins/trunk/debian/patches/01_firefox_iceweasel_rename.dpatch
    packages/gnome-do-plugins/trunk/debian/rules

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=4989&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/changelog (original)
+++ packages/gnome-do-plugins/trunk/debian/changelog Sun Jun 28 11:39:08 2009
@@ -1,11 +1,20 @@
-gnome-do-plugins (0.8.1.3+dfsg-3) UNRELEASED; urgency=low
+gnome-do-plugins (0.8.2+dfsg-1) UNRELEASED; urgency=low
 
-  * debian/patches/20_twitter_overflow.dpatch: Backport patch from upstream
-    bzr to fix broken Twitter message sending. The number of messages posted
-    to Twitter has overflowed the size of an int(!), so these variables have
-    been converted to longs.
+  * New upstream release
+  * debian/rules:
+    + Update get-orig-source target.  Upstream no longer ships gdata* binaries,
+      so we no longer need to strip them
+  * debian/patches/00_use_system_gdata
+    + Drop.  Upstream now builds against system libgdata.
+  * debian/patches/04_fix_pidgin_dbus_ints
+  * debian/patches/10_fix_rhythmbox_file
+  * debian/patches/15_twitter_api
+  * debian/patches/20_twitter_overflow:
+    + Drop.  Included upstream.
+  * debian/patches/01_firefox_iceweasel_rename:
+    + Refresh for new version
 
- -- Iain Lane <laney at ubuntu.com>  Tue, 16 Jun 2009 00:15:15 +0100
+ -- Christopher James Halse Rogers <raof at ubuntu.com>  Sat, 27 Jun 2009 16:11:49 +1000
 
 gnome-do-plugins (0.8.1.3+dfsg-2) unstable; urgency=low
 

Modified: packages/gnome-do-plugins/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/control?rev=4989&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/control (original)
+++ packages/gnome-do-plugins/trunk/debian/control Sun Jun 28 11:39:08 2009
@@ -10,7 +10,7 @@
   mono-devel (>= 2.0),
   autotools-dev,
   automake,
-  gnome-do (>= 0.8),
+  gnome-do (>= 0.8.2),
   banshee (>= 1.4.2),
   pkg-config,
   intltool,

Modified: packages/gnome-do-plugins/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/patches/00list?rev=4989&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/00list (original)
+++ packages/gnome-do-plugins/trunk/debian/patches/00list Sun Jun 28 11:39:08 2009
@@ -1,6 +1,1 @@
-00_use_system_gdata
 01_firefox_iceweasel_rename
-04_fix_pidgin_dbus_ints
-10_fix_rhythmbox_file
-15_twitter_api
-20_twitter_overflow

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=4989&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 Sun Jun 28 11:39:08 2009
@@ -9,26 +9,37 @@
 ## DP: Iceweasel bookmarks.
 
 @DPATCH@
-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 @@
+diff -urNad gnome-do-plugins-0.8.2+dfsg~/Firefox/src/PlacesItemSource.cs gnome-do-plugins-0.8.2+dfsg/Firefox/src/PlacesItemSource.cs
+--- gnome-do-plugins-0.8.2+dfsg~/Firefox/src/PlacesItemSource.cs	2009-06-23 11:00:43.000000000 +1000
++++ gnome-do-plugins-0.8.2+dfsg/Firefox/src/PlacesItemSource.cs	2009-06-28 20:52:39.596179763 +1000
+@@ -160,8 +160,13 @@
+ 			profile = null;
+ 			home = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
+ 			
+-			path = Path.Combine (home, ".mozilla/firefox/profiles.ini");
+-			using (StreamReader r = File.OpenText (path)) {
++			path = Path.Combine (home, ".mozilla");
++			if (Directory.Exists (Path.Combine (path, "firefox"))) {
++				path = Path.Combine (path, "firefox");
++			} else if (Directory.Exists (Path.Combine (path, "iceweasel"))) {
++				path = Path.Combine (path, "iceweasel");
++			}
++			using (StreamReader r = File.OpenText (Path.Combine (path, "profile.ini"))) {
+ 				while ((line = r.ReadLine ()) != null) {
+ 					if (line.StartsWith (BeginDefaultProfile)) {
+ 						break;
+@@ -172,7 +177,7 @@
+ 					}
+ 				}
+ 			}
+-			return new [] {home, ".mozilla", "firefox", profile}.Aggregate (Path.Combine); 
++			return Path.Combine (path, profile); 
+ 		}
  
- 				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/profiles.ini");
-+				} else if (Directory.Exists (Path.Combine (path, "iceweasel"))) {
-+				  path = Path.Combine (path, "iceweasel/profiles.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
+ 
+diff -urNad gnome-do-plugins-0.8.2+dfsg~/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs gnome-do-plugins-0.8.2+dfsg/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
+--- gnome-do-plugins-0.8.2+dfsg~/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs	2009-06-23 11:00:43.000000000 +1000
++++ gnome-do-plugins-0.8.2+dfsg/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs	2009-06-28 20:38:51.032212068 +1000
 @@ -37,6 +37,9 @@
  	/// </summary>
  	public class FirefoxOpenSearchDirectoryProvider

Modified: packages/gnome-do-plugins/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/rules?rev=4989&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/rules (original)
+++ packages/gnome-do-plugins/trunk/debian/rules Sun Jun 28 11:39:08 2009
@@ -57,7 +57,6 @@
 
 strip-shipped-binaries: download-tarball
 	rm $(SOURCE_DIR)/BundledLibraries/*.exe
-	rm -r $(SOURCE_DIR)/BundledLibraries/libgoogle*
 
 repack-source: strip-shipped-binaries
 	cd $(TEMP_DIR) && \




More information about the Pkg-cli-apps-commits mailing list