[Pkg-cli-libs-commits] [flickrnet] 06/08: Remove unbreak-zooomr-support.diff patch (no longer relevant)

Christopher Stuart Hoskin mans0954 at moszumanska.debian.org
Mon Apr 17 17:46:09 UTC 2017


This is an automated email from the git hooks/post-receive script.

mans0954 pushed a commit to branch master
in repository flickrnet.

commit 9433e0cd841e1500fb086f97637bce458bb7397a
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Mon Apr 17 18:38:41 2017 +0100

    Remove unbreak-zooomr-support.diff patch (no longer relevant)
---
 debian/changelog                           |  1 +
 debian/patches/series                      |  1 -
 debian/patches/unbreak-zooomr-support.diff | 83 ------------------------------
 3 files changed, 1 insertion(+), 84 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be3962e..a805b8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ flickrnet (1:3.24+dfsg-1) UNRELEASED; urgency=medium
   * Update debian/watch, add Files-Excluded, rename source package flickrnet
   * Import new upstream release (3.24) 
   * Update AssemblyInfo.diff patch 
+  * Remove unbreak-zooomr-support.diff patch (no longer relevant) 
 
  -- Christopher Hoskin <mans0954 at debian.org>  Mon, 17 Apr 2017 18:12:06 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index ccd6c70..f2f7ddd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 AssemblyInfo.diff
-unbreak-zooomr-support.diff
diff --git a/debian/patches/unbreak-zooomr-support.diff b/debian/patches/unbreak-zooomr-support.diff
deleted file mode 100644
index 8ab8bd9..0000000
--- a/debian/patches/unbreak-zooomr-support.diff
+++ /dev/null
@@ -1,83 +0,0 @@
-Description: Fix f-spot crashes when exporting to Zooomr
-Debian-BTS: #514460
-Origin: vendor, Debian
-Forwarded: no
-Author: Chris Coulson <chrisccoulson at googlemail.com>
-Last-Update: Thu, 13 Aug 2009 20:52:59 -0400
-Index: libflickrnet2-48055~2.2.0/FlickrNet/Flickr.cs
-===================================================================
---- libflickrnet2-48055~2.2.0.orig/FlickrNet/Flickr.cs	2009-03-10 04:03:54.000000000 -0400
-+++ libflickrnet2-48055~2.2.0/FlickrNet/Flickr.cs	2009-08-13 20:51:51.000000000 -0400
-@@ -54,7 +54,7 @@
- 
- 		private string[] _baseUrl = new string[] { 
- 													 "http://api.flickr.com/services/rest/", 
--													 "http://beta.zooomr.com/bluenote/api/rest",
-+													 "http://www.zooomr.com/api/rest",
- 													 "http://www.23hq.com/services/rest/"};
- 
- 		private string UploadUrl
-@@ -63,7 +63,7 @@
- 		}
- 		private static string[] _uploadUrl = new string[] {
- 															  "http://api.flickr.com/services/upload/",
--															  "http://beta.zooomr.com/bluenote/api/upload",
-+															  "http://www.zooomr.com/api/upload",
- 															  "http://www.23hq.com/services/upload/"};
- 
- 		private string ReplaceUrl
-@@ -72,7 +72,7 @@
- 		}
- 		private static string[] _replaceUrl = new string[] {
- 															   "http://api.flickr.com/services/replace/",
--															   "http://beta.zooomr.com/bluenote/api/replace",
-+															   "http://www.zooomr.com/api/replace",
- 															   "http://www.23hq.com/services/replace/"};
- 
- 		private string AuthUrl
-@@ -81,7 +81,7 @@
- 		}
- 		private static string[] _authUrl = new string[] {
- 															"http://www.flickr.com/services/auth/",
--															"http://beta.zooomr.com/auth/",
-+															"http://www.zooomr.com/services/auth/",
- 															"http://www.23hq.com/services/auth/"};
- 
- 		private string _apiKey;
-@@ -443,7 +443,8 @@
- 			{
- 				// This is needed in the Compact Framework
- 				// See for more details: http://msdn2.microsoft.com/en-us/library/1afx2b0f.aspx
--				req.GetRequestStream().Close();
-+				if (req.Method=="POST")
-+				    req.GetRequestStream().Close();
- 			}
- 
- 			try
-@@ -754,7 +755,7 @@
- 			FlickrNet.Response response = GetResponseNoCache(parameters);
- 			if( response.Status == ResponseStatus.OK )
- 			{
--				return response.AllElements[0].InnerText;
-+				return response.AllElements[CurrentService==SupportedService.Zooomr?1:0].InnerText;
- 			}
- 			else
- 			{
-@@ -825,7 +826,7 @@
- 			FlickrNet.Response response = GetResponseNoCache(parameters);
- 			if( response.Status == ResponseStatus.OK )
- 			{
--				Auth auth = new Auth(response.AllElements[0]);
-+				Auth auth = new Auth(response.AllElements[CurrentService==SupportedService.Zooomr?1:0]);
- 				return auth;
- 			}
- 			else
-@@ -875,7 +876,7 @@
- 			FlickrNet.Response response = GetResponseNoCache(parameters);
- 			if( response.Status == ResponseStatus.OK )
- 			{
--				Auth auth = new Auth(response.AllElements[0]);
-+				Auth auth = new Auth(response.AllElements[CurrentService==SupportedService.Zooomr?1:0]);
- 				return auth;
- 			}
- 			else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/flickrnet.git



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