[Python-modules-commits] r31698 - in packages/sorl-thumbnail/trunk/debian (8 files)

fladi-guest at users.alioth.debian.org fladi-guest at users.alioth.debian.org
Tue Jan 27 10:40:38 UTC 2015


    Date: Tuesday, January 27, 2015 @ 10:40:37
  Author: fladi-guest
Revision: 31698

Switch to pybuild, support Python3, move documentation to separate package.

Added:
  packages/sorl-thumbnail/trunk/debian/python-sorl-thumbnail-doc.doc-base
  packages/sorl-thumbnail/trunk/debian/python-sorl-thumbnail-doc.docs
  packages/sorl-thumbnail/trunk/debian/python-sorl-thumbnail.docs
    (from rev 31694, packages/sorl-thumbnail/trunk/debian/docs)
  packages/sorl-thumbnail/trunk/debian/python3-sorl-thumbnail.docs
Modified:
  packages/sorl-thumbnail/trunk/debian/control
  packages/sorl-thumbnail/trunk/debian/rules
Deleted:
  packages/sorl-thumbnail/trunk/debian/docs
  packages/sorl-thumbnail/trunk/debian/python-sorl-thumbnail.doc-base

Modified: packages/sorl-thumbnail/trunk/debian/control
===================================================================
--- packages/sorl-thumbnail/trunk/debian/control	2015-01-27 10:21:34 UTC (rev 31697)
+++ packages/sorl-thumbnail/trunk/debian/control	2015-01-27 10:40:37 UTC (rev 31698)
@@ -3,29 +3,35 @@
 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~),
+Build-Depends: debhelper (>= 9),
+               dh-python,
                graphicsmagick,
                imagemagick,
                locales,
+               lsof,
                python-all,
                python-django,
-               python-imaging,
+               python-pil,
                python-pgmagick,
                python-setuptools,
+               python3-all,
+               python3-django,
+               python3-pil,
+               python3-setuptools,
                python-sphinx (>= 1.0.7+dfsg)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 X-Python-Version: >= 2.7
-Homepage: https://github.com/sorl/sorl-thumbnail
+X-Python3-Version: >= 3.3
+Homepage: https://github.com/mariocesar/sorl-thumbnail
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/sorl-thumbnail/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/sorl-thumbnail/trunk/
 
 Package: python-sorl-thumbnail
 Architecture: all
 Depends: python-django,
-         python-imaging | python-pgmagick | imagemagick | graphicsmagick,
+         python-pil | python-pgmagick | imagemagick | graphicsmagick,
          ${misc:Depends},
-         ${python:Depends},
-         ${sphinxdoc:Depends}
+         ${python:Depends}
 Suggests: python-redis
 Description: thumbnail support for the Django framework
  sorl-thumbnail provides a convenient way to create and manage image thumbnails
@@ -43,3 +49,53 @@
   * Flexible, simple syntax, generates no html
   * CSS style cropping options
   * Margin calculation for vertical positioning
+
+Package: python3-sorl-thumbnail
+Architecture: all
+Depends: python3-django,
+         python3-pil | imagemagick | graphicsmagick,
+         ${misc:Depends},
+         ${python3:Depends}
+Suggests: python3-redis
+Description: thumbnail support for the Django framework (Python3 version)
+ 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
+ .
+ This package contains the Python 3 version of the library.
+
+Package: python-sorl-thumbnail-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends},
+         ${sphinxdoc:Depends}
+Description: thumbnail support for the Django framework (Documentation)
+ 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
+ .
+ This package contains the documentation.

Deleted: packages/sorl-thumbnail/trunk/debian/docs
===================================================================
--- packages/sorl-thumbnail/trunk/debian/docs	2015-01-27 10:21:34 UTC (rev 31697)
+++ packages/sorl-thumbnail/trunk/debian/docs	2015-01-27 10:40:37 UTC (rev 31698)
@@ -1,2 +0,0 @@
-README.rst
-.build/html

Added: packages/sorl-thumbnail/trunk/debian/python-sorl-thumbnail-doc.doc-base
===================================================================
--- packages/sorl-thumbnail/trunk/debian/python-sorl-thumbnail-doc.doc-base	                        (rev 0)
+++ packages/sorl-thumbnail/trunk/debian/python-sorl-thumbnail-doc.doc-base	2015-01-27 10:40:37 UTC (rev 31698)
@@ -0,0 +1,9 @@
+Document: python-sorl-thumbnail-doc
+Title: sorl-thumbnail Documentation
+Author: Mikko Hellsing
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-sorl-thumbnail-doc/html/index.html
+Files: /usr/share/doc/python-sorl-thumbnail-doc/html/*.html
+       /usr/share/doc/python-sorl-thumbnail-doc/html/reference/*.html

Added: packages/sorl-thumbnail/trunk/debian/python-sorl-thumbnail-doc.docs
===================================================================
--- packages/sorl-thumbnail/trunk/debian/python-sorl-thumbnail-doc.docs	                        (rev 0)
+++ packages/sorl-thumbnail/trunk/debian/python-sorl-thumbnail-doc.docs	2015-01-27 10:40:37 UTC (rev 31698)
@@ -0,0 +1 @@
+.build/html

Deleted: packages/sorl-thumbnail/trunk/debian/python-sorl-thumbnail.doc-base
===================================================================
--- packages/sorl-thumbnail/trunk/debian/python-sorl-thumbnail.doc-base	2015-01-27 10:21:34 UTC (rev 31697)
+++ packages/sorl-thumbnail/trunk/debian/python-sorl-thumbnail.doc-base	2015-01-27 10:40:37 UTC (rev 31698)
@@ -1,8 +0,0 @@
-Document: python-sorl-thumbnail
-Title: sorl-thumbnail Documentation
-Author: Mikko Hellsing
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-sorl-thumbnail/html/index.html
-Files: /usr/share/doc/python-sorl-thumbnail/html/*.html

Copied: packages/sorl-thumbnail/trunk/debian/python-sorl-thumbnail.docs (from rev 31694, packages/sorl-thumbnail/trunk/debian/docs)
===================================================================
--- packages/sorl-thumbnail/trunk/debian/python-sorl-thumbnail.docs	                        (rev 0)
+++ packages/sorl-thumbnail/trunk/debian/python-sorl-thumbnail.docs	2015-01-27 10:40:37 UTC (rev 31698)
@@ -0,0 +1 @@
+README.rst

Added: packages/sorl-thumbnail/trunk/debian/python3-sorl-thumbnail.docs
===================================================================
--- packages/sorl-thumbnail/trunk/debian/python3-sorl-thumbnail.docs	                        (rev 0)
+++ packages/sorl-thumbnail/trunk/debian/python3-sorl-thumbnail.docs	2015-01-27 10:40:37 UTC (rev 31698)
@@ -0,0 +1 @@
+README.rst

Modified: packages/sorl-thumbnail/trunk/debian/rules
===================================================================
--- packages/sorl-thumbnail/trunk/debian/rules	2015-01-27 10:21:34 UTC (rev 31697)
+++ packages/sorl-thumbnail/trunk/debian/rules	2015-01-27 10:40:37 UTC (rev 31698)
@@ -4,26 +4,19 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export PYBUILD_NAME=sorl-thumbnail
+
 %:
-	dh --with python2,sphinxdoc $@
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-.PHONY: override_dh_auto_build
 override_dh_auto_build:
+	dh_auto_build
 	PYTHONPATH=.:$$PYTHONPATH sphinx-build -b html -d .build/.doctrees -N docs .build/html
-	dh_auto_build
-	chmod 644 sorl_thumbnail.egg-info/*
 
-.PHONY: override_dh_clean
 override_dh_clean:
 	rm -rf .build
 	dh_clean
 
-.PHONY: override_dh_auto_install
-override_dh_auto_install:
-	dh_auto_install
-	sed -i 's/Metadata-Version: 1\.0/Metadata-Version: 1\.1/' debian/python-sorl-thumbnail/usr/lib/python2.*/*-packages/sorl_thumbnail-*.egg-info/PKG-INFO
-
-.PHONY: override_dh_auto_test
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	mkdir -p tmp-locales
@@ -34,5 +27,13 @@
 		LOCPATH=$(CURDIR)/tmp-locales LC_ALL=en_US.UTF-8 PYTHONPATH=tests LOCAL_BUILD=1 $$python tests/runtests.py --settings=settings.$$name ; \
 	  done; \
 	done
+	for python in $(shell py3versions -r); do \
+	  for name in pil imagemagick graphicsmagick; do \
+		LOCPATH=$(CURDIR)/tmp-locales LC_ALL=en_US.UTF-8 PYTHONPATH=tests LOCAL_BUILD=1 $$python tests/runtests.py --settings=settings.$$name ; \
+	  done; \
+	done
 	rm -rf tmp-locales
 endif
+
+override_dh_installchangelogs:
+	dh_installchangelogs -- CHANGES.rst




More information about the Python-modules-commits mailing list