diff -Nru django-sekizai-0.7/debian/changelog django-sekizai-0.7/debian/changelog --- django-sekizai-0.7/debian/changelog 2014-04-17 10:34:10.000000000 +0000 +++ django-sekizai-0.7/debian/changelog 2014-09-01 10:13:39.000000000 +0000 @@ -1,3 +1,14 @@ +django-sekizai (0.7-2) unstable; urgency=medium + + * Add dh-python to Build-Depends. + * Switch buildsystem to pybuild. + * Add patch to call django.setup() on Django 1.7 before running the + tests. + * Add Python3 support. + * Works with Django 1.7 (Closes: #755603). + + -- Michael Fladischer Mon, 01 Sep 2014 12:13:03 +0200 + django-sekizai (0.7-1) unstable; urgency=low * New upstream release. diff -Nru django-sekizai-0.7/debian/control django-sekizai-0.7/debian/control --- django-sekizai-0.7/debian/control 2014-04-17 09:32:27.000000000 +0000 +++ django-sekizai-0.7/debian/control 2014-09-01 09:58:22.000000000 +0000 @@ -5,13 +5,19 @@ Uploaders: Michael Fladischer , Ondřej Surý Build-Depends: debhelper (>= 9), + dh-python, python-all, python-django (>= 1.5), python-django-classy-tags, python-setuptools, - python-sphinx (>= 1.0.7+dfsg) + python-sphinx (>= 1.0.7+dfsg), + python3-all, + python3-django, + python3-django-classy-tags, + python3-setuptools Standards-Version: 3.9.5 X-Python-Version: >= 2.6 +X-Python3-Version: >= 3.0 Homepage: http://django-sekizai.readthedocs.org/ Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/django-sekizai/trunk/ Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/django-sekizai/trunk/ @@ -33,6 +39,25 @@ just like you should. Also sekizai will ignore any duplicate content in a single block. +Package: python3-django-sekizai +Architecture: all +Depends: python3-django, + python3-django-classy-tags, + ${misc:Depends}, + ${python3:Depends} +Suggests: python-django-sekizai-doc +Description: template blocks for Django projects (Python3 version) + Sekizai means “blocks” in Japanese, and that’s what this app provides. + A fresh look at blocks. With django-sekizai you can define placeholders + where your blocks get rendered and at different places in your templates + append to those blocks. This is especially useful for css and javascript. + Your subtemplates can now define css and javscript files to be included, + and the css will be nicely put at the top and the javascript to the bottom, + just like you should. Also sekizai will ignore any duplicate content in + a single block. + . + This package contains the Python 3 version of the library. + Package: python-django-sekizai-doc Section: doc Architecture: all diff -Nru django-sekizai-0.7/debian/patches/django-1.7.patch django-sekizai-0.7/debian/patches/django-1.7.patch --- django-sekizai-0.7/debian/patches/django-1.7.patch 1970-01-01 00:00:00.000000000 +0000 +++ django-sekizai-0.7/debian/patches/django-1.7.patch 2014-09-01 08:21:36.000000000 +0000 @@ -0,0 +1,36 @@ +Description: Initialize Django before tests are run. + Django 1.7 introduced changes to its start-up sequence. See: + https://docs.djangoproject.com/en/dev/releases/1.7/#standalone-scripts +Author: Michael Fladischer +Last-Update: 2014-09-01 +Forwarded: https://github.com/ojii/django-sekizai/pull/39 + +--- a/runtests.py ++++ b/runtests.py +@@ -1,6 +1,7 @@ + # -*- coding: utf-8 -*- + import os + import sys ++import django + + urlpatterns = [] + +@@ -25,7 +26,7 @@ + TEMPLATE_CONTEXT_PROCESSORS = [ + 'sekizai.context_processors.sekizai', + ] +- ++ + + ROOT_URLCONF = 'runtests' + +@@ -45,6 +46,9 @@ + from django.test.utils import get_runner + TestRunner = get_runner(settings) + ++ if django.VERSION >= (1, 7): ++ django.setup() ++ + test_runner = TestRunner(verbosity=1, interactive=False, failfast=False) + failures = test_runner.run_tests(INSTALLED_APPS) + return failures diff -Nru django-sekizai-0.7/debian/patches/series django-sekizai-0.7/debian/patches/series --- django-sekizai-0.7/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ django-sekizai-0.7/debian/patches/series 2014-09-01 08:21:36.000000000 +0000 @@ -0,0 +1 @@ +django-1.7.patch diff -Nru django-sekizai-0.7/debian/python3-django-sekizai.lintian-overrides django-sekizai-0.7/debian/python3-django-sekizai.lintian-overrides --- django-sekizai-0.7/debian/python3-django-sekizai.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ django-sekizai-0.7/debian/python3-django-sekizai.lintian-overrides 2014-09-01 08:56:20.000000000 +0000 @@ -0,0 +1,2 @@ +# Upstream does not provide a separate changelog. +python3-django-sekizai: no-upstream-changelog diff -Nru django-sekizai-0.7/debian/python-django-sekizai.install django-sekizai-0.7/debian/python-django-sekizai.install --- django-sekizai-0.7/debian/python-django-sekizai.install 2014-04-17 07:35:28.000000000 +0000 +++ django-sekizai-0.7/debian/python-django-sekizai.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/ diff -Nru django-sekizai-0.7/debian/rules django-sekizai-0.7/debian/rules --- django-sekizai-0.7/debian/rules 2014-04-17 06:43:20.000000000 +0000 +++ django-sekizai-0.7/debian/rules 2014-09-01 08:56:20.000000000 +0000 @@ -1,16 +1,21 @@ #!/usr/bin/make -f +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export PYBUILD_NAME=django-sekizai + %: - dh $@ --with python2,sphinxdoc + dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild override_dh_auto_build: - PYTHONPATH=. sphinx-build -b html -d docs/_build/.doctrees -N docs docs/_build/html dh_auto_build + PYTHONPATH=. sphinx-build -b html -d docs/_build/.doctrees -N docs docs/_build/html override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) set -e; \ - for python in $(shell pyversions -r); do \ + for python in $(shell pyversions -r) $(shell py3versions -r); do \ PYTHONPATH="." $$python runtests.py; \ done endif