Merge lp:~noskcaj/ubuntu/vivid/gthumb/flickr-https into lp:ubuntu/vivid/gthumb

[Jackson Doak]

Upstream git commit allowing us to use flickr again. Will need SRUing eventually

[Sebastien Bacher (seb128)]

Thanks, can you prepare trusty/utopic SRUs for that as well?

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-04 15:03:18 +0000
+++ debian/changelog	2015-02-14 21:08:44 +0000
@@ -1,3 +1,10 @@
+gthumb (3:3.3.1.is.3.2.8-0ubuntu2) vivid; urgency=medium
+
+  * Add 15-flickr-https.patch to work with flickr's https requirements.
+    LP: #1341153
+
+ -- Jackson Doak <[e-mail]>  Sun, 15 Feb 2015 07:50:05 +1100
+
 gthumb (3:3.3.1.is.3.2.8-0ubuntu1build1) utopic; urgency=medium
 
   * No change rebuild against new libexiv2-13

=== added file 'debian/patches/15-flickr-https.patch'
--- debian/patches/15-flickr-https.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/15-flickr-https.patch	2015-02-14 21:08:44 +0000
@@ -0,0 +1,38 @@
+From 4cba2631576653dc86be38bf532c879457cc25bf Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <[e-mail]>
+Date: Mon, 21 Jul 2014 19:07:47 +0200
+Subject: Forbidden when trying to upload to Flickr
+
+[bug #732557]
+
+diff --git a/extensions/flicker/actions.c b/extensions/flicker/actions.c
+index 0ad858a..2094acf 100644
+--- a/extensions/flicker/actions.c
++++ b/extensions/flicker/actions.c
+@@ -31,17 +31,17 @@
+ static FlickrServer www_flickr_com = {
+ 	"Flickr",
+ 	"flickr",
+-	"http://www.flickr.com",
+-	"http",
++	"https://www.flickr.com",
++	"https",
+ 
+-	"http://www.flickr.com/services/oauth/request_token",
+-	"http://www.flickr.com/services/oauth/authorize",
+-	"http://www.flickr.com/services/oauth/access_token",
++	"https://www.flickr.com/services/oauth/request_token",
++	"https://www.flickr.com/services/oauth/authorize",
++	"https://www.flickr.com/services/oauth/access_token",
+ 	"8960706ee7f4151e893b11837e9c24ce",
+ 	"1ff8d1e45c873423",
+ 
+-	"http://api.flickr.com/services/rest",
+-	"http://api.flickr.com/services/upload",
++	"https://api.flickr.com/services/rest",
++	"https://up.flickr.com/services/upload",
+ 	"static.flickr.com",
+ 	FALSE,
+ 	TRUE
+-- 
+cgit v0.10.1

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-01-25 11:24:27 +0000
+++ debian/patches/series	2015-02-14 21:08:44 +0000
@@ -5,3 +5,4 @@
 07-fix_documentation_xml.patch
 10-fix_POTFILES.skip.patch
 14-unity_control_center.patch
+15-flickr-https.patch