[Python-modules-commits] r22916 - in packages/sorl-thumbnail/tags (8 files)
fladi-guest at users.alioth.debian.org
fladi-guest at users.alioth.debian.org
Thu Nov 8 06:17:16 UTC 2012
Date: Thursday, November 8, 2012 @ 06:17:14
Author: fladi-guest
Revision: 22916
[svn-buildpackage] Tagging sorl-thumbnail 11.12-4
Added:
packages/sorl-thumbnail/tags/11.12-4/
packages/sorl-thumbnail/tags/11.12-4/debian/changelog
(from rev 22913, packages/sorl-thumbnail/trunk/debian/changelog)
packages/sorl-thumbnail/tags/11.12-4/debian/control
(from rev 22797, packages/sorl-thumbnail/trunk/debian/control)
packages/sorl-thumbnail/tags/11.12-4/debian/patches/orientation.patch
(from rev 22797, packages/sorl-thumbnail/trunk/debian/patches/orientation.patch)
packages/sorl-thumbnail/tags/11.12-4/debian/patches/series
(from rev 22797, packages/sorl-thumbnail/trunk/debian/patches/series)
Deleted:
packages/sorl-thumbnail/tags/11.12-4/debian/changelog
packages/sorl-thumbnail/tags/11.12-4/debian/control
packages/sorl-thumbnail/tags/11.12-4/debian/patches/series
Deleted: packages/sorl-thumbnail/tags/11.12-4/debian/changelog
===================================================================
--- packages/sorl-thumbnail/trunk/debian/changelog 2012-10-19 05:47:49 UTC (rev 22796)
+++ packages/sorl-thumbnail/tags/11.12-4/debian/changelog 2012-11-08 06:17:14 UTC (rev 22916)
@@ -1,20 +0,0 @@
-sorl-thumbnail (11.12-3) unstable; urgency=low
-
- * Fix syntax warnings in documentation source (Closes: #655610).
-
- -- Michael Fladischer <FladischerMichael at fladi.at> Fri, 13 Jan 2012 08:08:01 +0100
-
-sorl-thumbnail (11.12-2) unstable; urgency=low
-
- * Skip tests that require HTTP connections (Closes: #655568).
- * Change D-B to python2.6-argparse to force installation during build
- (this would otherwise be satisfied by python2.7 which provides
- python-argparse).
-
- -- Michael Fladischer <FladischerMichael at fladi.at> Thu, 12 Jan 2012 16:00:34 +0100
-
-sorl-thumbnail (11.12-1) unstable; urgency=low
-
- * Initial release (Closes: #527166)
-
- -- Michael Fladischer <FladischerMichael at fladi.at> Thu, 29 Dec 2011 17:29:54 +0100
Copied: packages/sorl-thumbnail/tags/11.12-4/debian/changelog (from rev 22913, packages/sorl-thumbnail/trunk/debian/changelog)
===================================================================
--- packages/sorl-thumbnail/tags/11.12-4/debian/changelog (rev 0)
+++ packages/sorl-thumbnail/tags/11.12-4/debian/changelog 2012-11-08 06:17:14 UTC (rev 22916)
@@ -0,0 +1,28 @@
+sorl-thumbnail (11.12-4) unstable; urgency=low
+
+ * Add patch to fix orientation tests and to skip tests for EXIF
+ orientation if engine does not support it (Closes: #678777).
+ * Bump Standards version to 3.9.3. No changes necessary.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Wed, 07 Nov 2012 08:42:40 +0100
+
+sorl-thumbnail (11.12-3) unstable; urgency=low
+
+ * Fix syntax warnings in documentation source (Closes: #655610).
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Fri, 13 Jan 2012 08:08:01 +0100
+
+sorl-thumbnail (11.12-2) unstable; urgency=low
+
+ * Skip tests that require HTTP connections (Closes: #655568).
+ * Change D-B to python2.6-argparse to force installation during build
+ (this would otherwise be satisfied by python2.7 which provides
+ python-argparse).
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Thu, 12 Jan 2012 16:00:34 +0100
+
+sorl-thumbnail (11.12-1) unstable; urgency=low
+
+ * Initial release (Closes: #527166)
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Thu, 29 Dec 2011 17:29:54 +0100
Deleted: packages/sorl-thumbnail/tags/11.12-4/debian/control
===================================================================
--- packages/sorl-thumbnail/trunk/debian/control 2012-10-19 05:47:49 UTC (rev 22796)
+++ packages/sorl-thumbnail/tags/11.12-4/debian/control 2012-11-08 06:17:14 UTC (rev 22916)
@@ -1,46 +0,0 @@
-Source: sorl-thumbnail
-Section: python
-Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
-Build-Depends: debhelper (>= 7.0.50~),
- graphicsmagick,
- imagemagick,
- locales,
- python-all (>= 2.6.6-3~),
- python2.6-argparse,
- python-django (>= 1.2),
- python-imaging,
- python-pgmagick,
- python-setuptools,
- python-sphinx (>= 1.0.7+dfsg)
-Standards-Version: 3.9.2
-X-Python-Version: >= 2.5
-Homepage: https://github.com/sorl/sorl-thumbnail
-Vcs-Svn: svn://svn.debian.org/python-modules/packages/sorl-thumbnail/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/sorl-thumbnail/trunk/
-
-Package: python-sorl-thumbnail
-Architecture: all
-Depends: python-django,
- python-imaging | python-pgmagick | imagemagick | graphicsmagick,
- ${misc:Depends},
- ${python:Depends},
- ${sphinxdoc:Depends}
-Suggests: python-redis
-Description: thumbnail support for the Django framework
- sorl-thumbnail provides a convenient way to create and manage image thumbnails
- in a Django project. It offers integration into several parts of Django like
- the admin system by showing thumbnails for ImageFields or through a ImageField
- that also takes care of deleting thumbnail files when the referencing object
- is removed.
- .
- Other features include:
- * Django storage support
- * Pluggable Engine support (PIL, pgmagick, ImageMagick or GraphicsMagick)
- * Pluggable Key Value Store support (Django cache, redis)
- * Pluggable Backend support (i.e. different thumbnail filename schema)
- * Dummy generation (placeholders)
- * Flexible, simple syntax, generates no html
- * CSS style cropping options
- * Margin calculation for vertical positioning
Copied: packages/sorl-thumbnail/tags/11.12-4/debian/control (from rev 22797, packages/sorl-thumbnail/trunk/debian/control)
===================================================================
--- packages/sorl-thumbnail/tags/11.12-4/debian/control (rev 0)
+++ packages/sorl-thumbnail/tags/11.12-4/debian/control 2012-11-08 06:17:14 UTC (rev 22916)
@@ -0,0 +1,46 @@
+Source: sorl-thumbnail
+Section: python
+Priority: optional
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
+Build-Depends: debhelper (>= 7.0.50~),
+ graphicsmagick,
+ imagemagick,
+ locales,
+ python-all (>= 2.6.6-3~),
+ python2.6-argparse,
+ python-django (>= 1.2),
+ python-imaging,
+ python-pgmagick,
+ python-setuptools,
+ python-sphinx (>= 1.0.7+dfsg)
+Standards-Version: 3.9.3
+X-Python-Version: >= 2.5
+Homepage: https://github.com/sorl/sorl-thumbnail
+Vcs-Svn: svn://svn.debian.org/python-modules/packages/sorl-thumbnail/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/sorl-thumbnail/trunk/
+
+Package: python-sorl-thumbnail
+Architecture: all
+Depends: python-django,
+ python-imaging | python-pgmagick | imagemagick | graphicsmagick,
+ ${misc:Depends},
+ ${python:Depends},
+ ${sphinxdoc:Depends}
+Suggests: python-redis
+Description: thumbnail support for the Django framework
+ sorl-thumbnail provides a convenient way to create and manage image thumbnails
+ in a Django project. It offers integration into several parts of Django like
+ the admin system by showing thumbnails for ImageFields or through a ImageField
+ that also takes care of deleting thumbnail files when the referencing object
+ is removed.
+ .
+ Other features include:
+ * Django storage support
+ * Pluggable Engine support (PIL, pgmagick, ImageMagick or GraphicsMagick)
+ * Pluggable Key Value Store support (Django cache, redis)
+ * Pluggable Backend support (i.e. different thumbnail filename schema)
+ * Dummy generation (placeholders)
+ * Flexible, simple syntax, generates no html
+ * CSS style cropping options
+ * Margin calculation for vertical positioning
Copied: packages/sorl-thumbnail/tags/11.12-4/debian/patches/orientation.patch (from rev 22797, packages/sorl-thumbnail/trunk/debian/patches/orientation.patch)
===================================================================
--- packages/sorl-thumbnail/tags/11.12-4/debian/patches/orientation.patch (rev 0)
+++ packages/sorl-thumbnail/tags/11.12-4/debian/patches/orientation.patch 2012-11-08 06:17:14 UTC (rev 22916)
@@ -0,0 +1,70 @@
+Description: Split orientation test into pixel and EXIF comparison.
+ Skip these tests if graphicsmagick or pgmagick is used as the engine. Both
+ don't synchronize the EXIF orientation with the actual orientation of the
+ image.
+Author: Michael Fladischer <FladischerMichael at fladi.at>
+Last-Update: 2012-10-19
+Forwarded: no
+
+--- a/tests/thumbnail_tests/tests.py
++++ b/tests/thumbnail_tests/tests.py
+@@ -326,8 +326,8 @@
+ m = re.search('Interlace: None', p.stdout.read())
+ self.assertEqual(bool(m), True)
+
+- def test_orientation(self):
+- data_dir = pjoin(settings.MEDIA_ROOT, 'data')
++ def test_orientation_pixels(self):
++ data_dir = pjoin(settings.MEDIA_ROOT, 'data_pixels')
+ shutil.copytree(settings.DATA_ROOT, data_dir)
+ ref = Image.open(pjoin(data_dir, '1_topleft.jpg'))
+ top = ref.getpixel((14, 7))
+@@ -340,15 +340,29 @@
+ y = sum(y) / len(y)
+ return abs(x - y)
+ for name in sorted(os.listdir(data_dir)):
+- th = self.backend.get_thumbnail('data/%s' % name, '30x30')
++ th = self.backend.get_thumbnail('data_pixels/%s' % name, '30x30')
+ im = engine.get_image(th)
+ self.assertLess(epsilon(top, im.getpixel((14, 7))), 10)
+ self.assertLess(epsilon(left, im.getpixel((7, 14))), 10)
++
++ @unittest.skipIf(settings.THUMBNAIL_ENGINE in (
++ "sorl.thumbnail.engines.pgmagick_engine.Engine",
++ "sorl.thumbnail.engines.convert_engine.Engine",
++ ),
++ "graphicsmagick and pgmagick do not correct the orientation in the EXIF tag")
++ def test_orientation_exif(self):
++ data_dir = pjoin(settings.MEDIA_ROOT, 'data_exif')
++ shutil.copytree(settings.DATA_ROOT, data_dir)
++ engine = PILEngine()
++ for name in sorted(os.listdir(data_dir)):
++ th = self.backend.get_thumbnail('data_exif/%s' % name, '30x30')
++ im = engine.get_image(th)
+ exif = im._getexif()
+ if exif:
+ self.assertEqual(exif.get(0x0112), 1)
+
+
++
+ class TemplateTestCaseB(unittest.TestCase):
+ def tearDown(self):
+ try:
+@@ -534,7 +548,7 @@
+ im1 = Item.objects.get(image='100x100.jpg').image
+ im2 = Item.objects.get(image='500x500.jpg').image
+ default.kvstore.get_or_set(ImageFile(im1))
+- # exists in kvstore and in storage
++ # exists in kvstore and in storage
+ self.assertTrue(bool(default.kvstore.get(ImageFile(im1))))
+ self.assertTrue(ImageFile(im1).exists())
+ # delete
+@@ -543,7 +557,7 @@
+ self.assertFalse(ImageFile(im1).exists())
+
+ default.kvstore.get_or_set(ImageFile(im2))
+- # exists in kvstore and in storage
++ # exists in kvstore and in storage
+ self.assertTrue(bool(default.kvstore.get(ImageFile(im2))))
+ self.assertTrue(ImageFile(im2).exists())
+ # delete
Deleted: packages/sorl-thumbnail/tags/11.12-4/debian/patches/series
===================================================================
--- packages/sorl-thumbnail/trunk/debian/patches/series 2012-10-19 05:47:49 UTC (rev 22796)
+++ packages/sorl-thumbnail/tags/11.12-4/debian/patches/series 2012-11-08 06:17:14 UTC (rev 22916)
@@ -1,2 +0,0 @@
-disable_http_tests.patch
-fix_sphinx_warnings.patch
Copied: packages/sorl-thumbnail/tags/11.12-4/debian/patches/series (from rev 22797, packages/sorl-thumbnail/trunk/debian/patches/series)
===================================================================
--- packages/sorl-thumbnail/tags/11.12-4/debian/patches/series (rev 0)
+++ packages/sorl-thumbnail/tags/11.12-4/debian/patches/series 2012-11-08 06:17:14 UTC (rev 22916)
@@ -0,0 +1,3 @@
+disable_http_tests.patch
+fix_sphinx_warnings.patch
+orientation.patch
More information about the Python-modules-commits
mailing list