diffstat for flickrfs_1.3.9.1-9.2 flickrfs_1.3.9.1-9.2ubuntu2 flickrfs-1.3.9.1/debian/changelog | 14 ++++++++++++++ flickrfs-1.3.9.1/debian/control | 3 ++- flickrfs-1.3.9.1/debian/rules | 4 ++-- flickrfs/flickrapi.py | 6 +++--- 4 files changed, 21 insertions(+), 6 deletions(-) diff -u flickrfs-1.3.9.1/debian/rules flickrfs-1.3.9.1/debian/rules --- flickrfs-1.3.9.1/debian/rules +++ flickrfs-1.3.9.1/debian/rules @@ -7,8 +7,8 @@ binary-predeb/flickrfs:: mkdir -p $(DEB_DESTDIR)/usr/bin - dh_link /usr/share/pyshared/flickrfs/flickrfs.py /usr/bin/flickrfs - chmod 755 $(DEB_DESTDIR)/usr/share/pyshared/flickrfs/flickrfs.py + dh_link /usr/lib/python2.7/dist-packages/flickrfs/flickrfs.py /usr/bin/flickrfs + chmod 755 $(DEB_DESTDIR)/usr/lib/python2.7/dist-packages/flickrfs/flickrfs.py get-orig-source: -uscan --upstream-version 0 diff -u flickrfs-1.3.9.1/debian/control flickrfs-1.3.9.1/debian/control --- flickrfs-1.3.9.1/debian/control +++ flickrfs-1.3.9.1/debian/control @@ -1,7 +1,8 @@ Source: flickrfs Section: utils Priority: optional -Maintainer: Varun Hiremath +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Varun Hiremath Uploaders: Alan Woodland , Torsten Werner X-Python-Version: >= 2.4 diff -u flickrfs-1.3.9.1/debian/changelog flickrfs-1.3.9.1/debian/changelog --- flickrfs-1.3.9.1/debian/changelog +++ flickrfs-1.3.9.1/debian/changelog @@ -1,3 +1,17 @@ +flickrfs (1.3.9.1-9.2ubuntu2) vivid; urgency=medium + + * Fix lack of HTTPS in flickrapi.py; flickr requires https now + + -- Randall Mason Mon, 01 Dec 2014 10:39:05 +0200 + +flickrfs (1.3.9.1-9.2ubuntu1) trusty; urgency=medium + + * Files do not get installed to /usr/share/pyshared anymore, so link the + binary in /usr/lib/python2.7/dist-packages instead to fix FTBFS: + /usr/share/pyshared/flickrfs/flickrfs.py': No such file or directory + + -- Andreas Moog Fri, 07 Feb 2014 18:13:37 +0100 + flickrfs (1.3.9.1-9.2) unstable; urgency=low * Non-maintainer upload. only in patch2: unchanged: --- flickrfs-1.3.9.1.orig/flickrfs/flickrapi.py +++ flickrfs-1.3.9.1/flickrfs/flickrapi.py @@ -245,7 +245,7 @@ if not self.__handlerCache.has_key(method): def handler(_self = self, _method = method, **arg): _method = "flickr." + _method.replace("_", ".") - url = "http://" + FlickrAPI.flickrHost + \ + url = "https://" + FlickrAPI.flickrHost + \ FlickrAPI.flickrRESTForm arg["method"] = _method # Modified here: use default api_key and auth_token if not supplied @@ -298,7 +298,7 @@ data = {"api_key": self.apiKey, "frob": frob, "perms": perms} data["api_sig"] = self.__sign(data) - return "http://%s%s?%s" % (FlickrAPI.flickrHost, \ + return "https://%s%s?%s" % (FlickrAPI.flickrHost, \ FlickrAPI.flickrAuthForm, urllib.urlencode(data)) #------------------------------------------------------------------- @@ -337,7 +337,7 @@ if not 'api_key' in arg: arg["api_key"] = self.apiKey if not 'auth_token' in arg: arg['auth_token'] = self.token arg["api_sig"] = self.__sign(arg) - url = "http://" + FlickrAPI.flickrHost + FlickrAPI.flickrUploadForm + url = "https://" + FlickrAPI.flickrHost + FlickrAPI.flickrUploadForm # construct POST data # boundary = "===beej=jorgensen==========7d45e178b0434"