[Pkg-cli-apps-commits] r3780 - in /packages/f-spot/trunk/debian: changelog patches/00list patches/forward_port_to_flickrnet_2.1.5.dpatch patches/link_system_flickrnet.dpatch

diocles-guest at users.alioth.debian.org diocles-guest at users.alioth.debian.org
Sun Mar 9 02:29:23 UTC 2008 

Author: diocles-guest
Date: Sun Mar  9 02:29:23 2008
New Revision: 3780

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3780
Log:
Update FlickrExport patches to apply to the new extension.

Added:
    packages/f-spot/trunk/debian/patches/forward_port_to_flickrnet_2.1.5.dpatch   (with props)
    packages/f-spot/trunk/debian/patches/link_system_flickrnet.dpatch   (with props)
Modified:
    packages/f-spot/trunk/debian/changelog
    packages/f-spot/trunk/debian/patches/00list

Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3780&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Sun Mar  9 02:29:23 2008
@@ -4,14 +4,15 @@
     + debian/patches/20_refresh-menus-on-extensions.dpatch: Drop, because it
       is now included upstream.
     + Upstream moved Flickr export to an extension, so:
-      - drop debian/patches/forward_port_to_flickrnet_2.1.5.dpatch
-      - remove libflickrnet2.1.5-cil build dependency.
+      - Update debian/patches/forward_port_to_flickrnet_2.1.5.dpatch
+      - New patch debian/patches/link_system_flickrnet.dpatch for changes
+        to FlickrExport makefiles.
   * debian/patches/01_build-system.dpatch,
     debian/patches/10_cs-changes.dpatch: Delete unused patches.
   * debian/patches/98_autoreconf.dpatch: Move all automake changes from
     other patches into single patch, for easier maintenance.
 
- -- Tim Retout <tim at retout.co.uk>  Tue, 19 Feb 2008 00:58:21 +0000
+ -- Tim Retout <tim at retout.co.uk>  Sun, 09 Mar 2008 01:29:41 +0000
 
 f-spot (0.4.1-4) unstable; urgency=low
 

Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=3780&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Sun Mar  9 02:29:23 2008
@@ -3,6 +3,11 @@
 fix_libfspoteog_linkage
 fix_libfspotjpegtran_linkage
 link_system_libs
+
+# Update FlickrNet to 2.1.5
+link_system_flickrnet
+forward_port_to_flickrnet_2.1.5
+
 detect_and_upgrade_sqlite2_database
 no_dup_apps_icons
 unlink_nunit

Added: packages/f-spot/trunk/debian/patches/forward_port_to_flickrnet_2.1.5.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/forward_port_to_flickrnet_2.1.5.dpatch?rev=3780&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/forward_port_to_flickrnet_2.1.5.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/forward_port_to_flickrnet_2.1.5.dpatch Sun Mar  9 02:29:23 2008
@@ -1,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## forward_port_to_flickrnet_2.1.5.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad f-spot~/extensions/FlickrExport/FlickrExport.cs f-spot/extensions/FlickrExport/FlickrExport.cs
+--- f-spot~/extensions/FlickrExport/FlickrExport.cs	2008-03-09 01:06:51.000000000 +0000
++++ f-spot/extensions/FlickrExport/FlickrExport.cs	2008-03-09 01:09:30.000000000 +0000
+@@ -253,7 +253,7 @@
+ 				fr = new FlickrRemote (token, current_service);
+ 				fr.TryWebLogin();
+ 				CurrentState = State.Connected;
+-			} catch (FlickrException e) {
++			} catch (FlickrApiException e) {
+ 				if (e.Code == 98) {
+ 					Logout ();
+ 					Login ();
+diff -urNad f-spot~/extensions/FlickrExport/FlickrRemote.cs f-spot/extensions/FlickrExport/FlickrRemote.cs
+--- f-spot~/extensions/FlickrExport/FlickrRemote.cs	2008-03-09 01:06:51.000000000 +0000
++++ f-spot/extensions/FlickrExport/FlickrRemote.cs	2008-03-09 01:09:30.000000000 +0000
+@@ -59,7 +59,7 @@
+ 		if (licenses == null) {
+ 			try {
+ 				licenses = flickr.PhotosLicensesGetInfo(); 
+-			} catch (FlickrNet.FlickrException e ) {
++			} catch (FlickrNet.FlickrApiException e ) {
+ 				Console.WriteLine ( e.Code + ": " + e.Verbose );
+ 				return null;
+ 			}
+@@ -112,7 +112,7 @@
+ 				flickr.AuthToken = token;
+ 
+ 				return auth;
+-			} catch (FlickrNet.FlickrException ex) {
++			} catch (FlickrNet.FlickrApiException ex) {
+ 				Console.WriteLine ("ERROR: Problems login in Flickr - "+ex.Verbose);
+ 
+ 				return null;

Propchange: packages/f-spot/trunk/debian/patches/forward_port_to_flickrnet_2.1.5.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/f-spot/trunk/debian/patches/link_system_flickrnet.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/link_system_flickrnet.dpatch?rev=3780&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/link_system_flickrnet.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/link_system_flickrnet.dpatch Sun Mar  9 02:29:23 2008
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## link_system_flickrnet.dpatch by Tim Retout <tim at retout.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Link against system flickrnet-2.1.5 rather than bundled f-spot version.
+
+ at DPATCH@
+diff -urNad f-spot~/extensions/FlickrExport/Makefile.am f-spot/extensions/FlickrExport/Makefile.am
+--- f-spot~/extensions/FlickrExport/Makefile.am	2008-03-09 01:13:46.000000000 +0000
++++ f-spot/extensions/FlickrExport/Makefile.am	2008-03-09 01:25:30.000000000 +0000
+@@ -15,16 +15,13 @@
+ 	-r:../../src/FSpot.Core.dll	\
+ 	-r:../../src/FSpot.Utils.dll	\
+ 	-r:../../semweb/SemWeb.dll	\
+-	-r:FlickrNet/FlickrNet.dll	\
+ 	-r:Mono.Posix
+ 
+ PKGS =					\
++	-pkg:flickrnet-2.1.5		\
+ 	-pkg:gtk-sharp-2.0		\
+ 	-pkg:glade-sharp-2.0
+ 
+-SUBDIRS = 			\
+-	FlickrNet
+-
+ RESOURCES =				\
+ 	-resource:$(srcdir)/$(PLUGIN_MANIFEST)	\
+ 	-resource:$(srcdir)/$(PLUGIN_NAME).glade

Propchange: packages/f-spot/trunk/debian/patches/link_system_flickrnet.dpatch
------------------------------------------------------------------------------
    svn:executable = *

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