[Python-modules-commits] r30275 - in packages/django-markupfield/trunk/debian (3 files)

[fladi-guest at users.alioth.debian.org]

    Date: Wednesday, August 27, 2014 @ 13:24:30
  Author: fladi-guest
Revision: 30275

New upstream release and Python 3 support.

Modified:
  packages/django-markupfield/trunk/debian/changelog
  packages/django-markupfield/trunk/debian/control
  packages/django-markupfield/trunk/debian/rules

Modified: packages/django-markupfield/trunk/debian/changelog
===================================================================
--- packages/django-markupfield/trunk/debian/changelog	2014-08-27 13:20:33 UTC (rev 30274)
+++ packages/django-markupfield/trunk/debian/changelog	2014-08-27 13:24:30 UTC (rev 30275)
@@ -1,3 +1,15 @@
+django-markupfield (1.2.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Add support for Python 3.
+  * Add lintian-override for missing PGP signature on upstream tarball.
+  * Add django-1.7.patch to fix tests with Django 1.7c3 (Closes: #755640).
+  * Drop versioned dependency on python-django as there are no prior versions
+    in the archive.
+  * Add python-setuptools to Build-Depends as they are now used in setup.py.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Wed, 27 Aug 2014 13:59:26 +0200
+
 django-markupfield (1.2.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/django-markupfield/trunk/debian/control
===================================================================
--- packages/django-markupfield/trunk/debian/control	2014-08-27 13:20:33 UTC (rev 30274)
+++ packages/django-markupfield/trunk/debian/control	2014-08-27 13:24:30 UTC (rev 30275)
@@ -6,11 +6,18 @@
 Build-Depends: debhelper (>= 8.1.0~),
                dh-python,
                python-all,
-               python-django (>= 1.4.2),
+               python-django,
                python-docutils,
-               python-markdown
+               python-markdown,
+               python-setuptools,
+               python3-all,
+               python3-django,
+               python3-docutils,
+               python3-markdown,
+               python3-setuptools
 Standards-Version: 3.9.5
 X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.0
 Homepage: http://pypi.python.org/pypi/django-markupfield/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/django-markupfield/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/django-markupfield/trunk/
@@ -31,3 +38,22 @@
   * markdown: default markdown renderer (requires python-markdown)
   * restructuredtext: default ReST renderer (requires python-docutils)
   * textile: default textile renderer (requires python-textile)
+
+Package: python3-django-markupfield
+Architecture: all
+Depends: python3-django, ${misc:Depends}, ${python3:Depends}
+Suggests: python3-docutils, python3-markdown
+Description: custom Django field for easy use of markup in text fields (Python3 version)
+ An implementation of a custom MarkupField for Django. A MarkupField is in
+ essence a TextField with an associated markup type. The field also caches
+ its rendered value.
+ .
+ It supports these markup types by default:
+  * html: allows HTML, potentially unsafe
+  * plain: plain text markup, calls urlize and replaces text with linebreaks
+ And these markups if the appropriate Python module is installed:
+  * markdown: default markdown renderer (requires python-markdown)
+  * restructuredtext: default ReST renderer (requires python-docutils)
+  * textile: default textile renderer (requires python-textile)
+ .
+ This package contains the Python 3 version of the library.

Modified: packages/django-markupfield/trunk/debian/rules
===================================================================
--- packages/django-markupfield/trunk/debian/rules	2014-08-27 13:20:33 UTC (rev 30274)
+++ packages/django-markupfield/trunk/debian/rules	2014-08-27 13:24:30 UTC (rev 30275)
@@ -1,12 +1,44 @@
 #!/usr/bin/make -f
+#
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+PYVERS :=  $(shell pyversions -r)
+PY3VERS := $(shell py3versions -r)
+
 %:
-	dh $@ --with=python2
+	dh $@ --with python2,python3
 
-.PHONY: override_dh_auto_test
+override_dh_auto_build:
+	set -e; \
+	for py in $(PYVERS) $(PY3VERS); do \
+		$$py -B setup.py build; \
+	done
+
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	set -e; \
+	for py in $(PYVERS) $(PY3VERS); do \
+		$$py -B setup.py clean; \
+		rm -rf build; \
+	done
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+	set -e; \
+	for py in $(PYVERS); do \
+		$$py -B setup.py install --skip-build --root debian/python-django-markupfield \
+		                      --install-layout deb; \
+	done
+	set -e; \
+	for py in $(PY3VERS); do \
+		$$py -B setup.py install --skip-build --root debian/python3-django-markupfield \
+		                      --install-layout deb; \
+	done
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	set -e; \
-	for python in $(shell pyversions -r); do \
+	for python in $(PYVERS) $(PY3VERS); do \
 		$$python $$(which django-admin) test --settings=markupfield.tests.settings --pythonpath=. ; \
 	done
 endif