Bug#702053: Acknowledgement (unblock: nautilus-image-manipulator/1.1-2)
The promised debdiff.
+Emilien
diff -Nru nautilus-image-manipulator-1.1/debian/changelog nautilus-image-manipulator-1.1/debian/changelog
--- nautilus-image-manipulator-1.1/debian/changelog 2012-06-26 19:42:52.000000000 +0200
+++ nautilus-image-manipulator-1.1/debian/changelog 2013-03-02 09:30:18.000000000 +0100
@@ -1,3 +1,13 @@
+nautilus-image-manipulator (1.1-2) unstable; urgency=low
+
+ * Fix 2 upstream bugs, patches already applied upstream and released in v1.2:
+ - debian/patches/fix-702044: Corrupted config file if width/height are
+ defined from keyboard (Closes: #702044)
+ - debian/patches/fix-702045: Upload to 1fichier.com not working
+ (Closes: #702045)
+
+ -- Emilien Klein <emilien+debian@klein.st> Sat, 02 Mar 2013 09:29:45 +0100
+
nautilus-image-manipulator (1.1-1.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru nautilus-image-manipulator-1.1/debian/patches/fix-702044 nautilus-image-manipulator-1.1/debian/patches/fix-702044
--- nautilus-image-manipulator-1.1/debian/patches/fix-702044 1970-01-01 01:00:00.000000000 +0100
+++ nautilus-image-manipulator-1.1/debian/patches/fix-702044 2013-02-28 21:27:08.000000000 +0100
@@ -0,0 +1,16 @@
+Fixes LP bug #1030927: Corrupted config file if width/height are defined from keyboard
+Already applied upstream in r193, released in version 1.2.
+
+--- a/nautilus_image_manipulator/ProfileSettings.py
++++ b/nautilus_image_manipulator/ProfileSettings.py
+@@ -216,8 +216,8 @@
+ for section in sections[1:]:
+ name = self.readvalue(c, section, "name")
+ size = self.readvalue(c, section, "size")
+- width = self.readvalue(c, section, "width", "int")
+- height = self.readvalue(c, section, "height", "int")
++ width = self.readvalue(c, section, "width", "float")
++ height = self.readvalue(c, section, "height", "float")
+ percent = self.readvalue(c, section, "percent", "float")
+ quality = self.readvalue(c, section, "quality", "float", 95)
+ destination = self.readvalue(c, section, "destination")
diff -Nru nautilus-image-manipulator-1.1/debian/patches/fix-702045 nautilus-image-manipulator-1.1/debian/patches/fix-702045
--- nautilus-image-manipulator-1.1/debian/patches/fix-702045 1970-01-01 01:00:00.000000000 +0100
+++ nautilus-image-manipulator-1.1/debian/patches/fix-702045 2013-02-28 21:30:46.000000000 +0100
@@ -0,0 +1,13 @@
+Fixes LP bug #1100027: Upload to 1fichier.com not working
+Already applied upstream in r195, released in version 1.2.
+--- a/nautilus_image_manipulator/upload/z1fichiercom.py
++++ b/nautilus_image_manipulator/upload/z1fichiercom.py
+@@ -31,7 +31,7 @@
+ Note: it's not up to date..."""
+ # The session ID is read from the "files" form on http://www.1fichier.com
+ html = urllib2.urlopen('http://www.1fichier.com').read()
+- (sessionId) = re.search('<form enctype="multipart/form-data" id="files" action="http://upload\.1fichier\.com/upload.cgi\?id=(.*)" method="post">', html).groups()
++ (sessionId) = re.search('<form enctype="multipart/form-data" id="files" action="http://.+\.1fichier\.com/upload.cgi\?id=(.*)" method="post">', html).groups()
+ # Build the url to upload to and to retrieve the download and delete links:
+ self.uploadUrl = "http://upload.1fichier.com/upload.cgi?id=%s"; % sessionId
+ self.endUploadUrl = "http://upload.1fichier.com/end.pl?xid=%s"; % sessionId
diff -Nru nautilus-image-manipulator-1.1/debian/patches/series nautilus-image-manipulator-1.1/debian/patches/series
--- nautilus-image-manipulator-1.1/debian/patches/series 2012-06-24 11:44:21.000000000 +0200
+++ nautilus-image-manipulator-1.1/debian/patches/series 2013-03-02 09:09:57.000000000 +0100
@@ -1,2 +1,4 @@
use-packaged-python-poster.patch
nosetests.patch
+fix-702044
+fix-702045
Reply to: