[Python-modules-commits] r24467 - in packages/jinja2/trunk/debian (7 files)
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Mon May 20 20:11:05 UTC 2013
Date: Monday, May 20, 2013 @ 20:11:03
Author: piotr
Revision: 24467
* New upstream release
- minimum required Python version bumped to 2.6 and 3.3
* debugsupport extension no longer available, Architecture changed to "all"
* Add patches/drop_next_import_from_docs-jinjaext.patch to fix building docs
* Use dh_sphinxdoc to handle JavaScript libraries used in -doc package
* Standards-Version bumped to 3.9.4
- add build-arch and build-indep targets
* debian/compat changed to 9
Added:
packages/jinja2/trunk/debian/patches/
packages/jinja2/trunk/debian/patches/drop_next_import_from_docs-jinjaext.patch
packages/jinja2/trunk/debian/patches/series
Modified:
packages/jinja2/trunk/debian/changelog
packages/jinja2/trunk/debian/compat
packages/jinja2/trunk/debian/control
packages/jinja2/trunk/debian/rules
Modified: packages/jinja2/trunk/debian/changelog
===================================================================
--- packages/jinja2/trunk/debian/changelog 2013-05-20 18:58:54 UTC (rev 24466)
+++ packages/jinja2/trunk/debian/changelog 2013-05-20 20:11:03 UTC (rev 24467)
@@ -1,9 +1,20 @@
-jinja2 (2.6-2) UNRELEASED; urgency=low
+jinja2 (2.7-1) unstable; urgency=low
+ [ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
- -- Jakub Wilk <jwilk at debian.org> Sun, 05 May 2013 16:01:05 +0200
+ [ Piotr Ożarowski ]
+ * New upstream release
+ - minimum required Python version bumped to 2.6 and 3.3
+ * debugsupport extension no longer available, Architecture changed to "all"
+ * Add patches/drop_next_import_from_docs-jinjaext.patch to fix building docs
+ * Use dh_sphinxdoc to handle JavaScript libraries used in -doc package
+ * Standards-Version bumped to 3.9.4
+ - add build-arch and build-indep targets
+ * debian/compat changed to 9
+ -- Piotr Ożarowski <piotr at debian.org> Mon, 20 May 2013 21:15:37 +0200
+
jinja2 (2.6-1) unstable; urgency=low
* New upstream release
Modified: packages/jinja2/trunk/debian/compat
===================================================================
--- packages/jinja2/trunk/debian/compat 2013-05-20 18:58:54 UTC (rev 24466)
+++ packages/jinja2/trunk/debian/compat 2013-05-20 20:11:03 UTC (rev 24467)
@@ -1 +1 @@
-5
+9
Modified: packages/jinja2/trunk/debian/control
===================================================================
--- packages/jinja2/trunk/debian/control 2013-05-20 18:58:54 UTC (rev 24466)
+++ packages/jinja2/trunk/debian/control 2013-05-20 20:11:03 UTC (rev 24467)
@@ -4,21 +4,20 @@
Maintainer: Piotr Ożarowski <piotr at debian.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5),
- python-all-dev (>= 2.6.6-3), python-all-dbg,
- python3-all-dev (>= 3.1.2-10), python3-all-dbg,
- python-setuptools (>= 0.6b3-1~), python3-setuptools
-Build-Depends-Indep: python-sphinx (>= 0.6), python-pygments
-Standards-Version: 3.9.2
+ python-all (>= 2.6.6-3), python3-all (>= 3.1.2-10),
+ python-setuptools (>= 0.6b3-1~), python3-setuptools,
+ python-sphinx (>= 1.0.7+dfsg) | python3-sphinx, python-pygments
+Standards-Version: 3.9.4
Homepage: http://jinja.pocoo.org/2/
-X-Python-Version: >= 2.4
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.3
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/jinja2/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/jinja2/trunk/
Package: python-jinja2
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-markupsafe
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}, python-markupsafe
Recommends: python-pkg-resources
-Provides: ${python:Provides}
Suggests: python-jinja2-doc
Enhances: python-pybabel
Description: small but fast and easy to use stand-alone template engine
@@ -44,7 +43,7 @@
Section: doc
Architecture: all
Priority: extra
-Depends: libjs-jquery, ${misc:Depends}
+Depends: ${sphinxdoc:Depends}, ${misc:Depends}
Recommends: python-jinja2
Description: documentation for the Jinja2 Python library
Jinja2 is a small but fast and easy to use stand-alone template engine
@@ -52,22 +51,9 @@
This package contains the documentation for Jinja2 in HTML and
reStructuredText formats.
-Package: python-jinja2-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: python-jinja2 (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
-Provides: ${python:Provides}
-Description: small but fast and easy to use stand-alone template engine
- Jinja2 is a template engine written in pure Python. It provides a Django
- inspired non-XML syntax but supports inline expressions and an optional
- sandboxed environment.
- .
- This package contains the extension built for the Python debug interpreter.
-
Package: python3-jinja2
-Architecture: any
-Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, python3-markupsafe
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}, python3-markupsafe
Recommends: python3-pkg-resources
Provides: ${python3:Provides}
Suggests: python-jinja2-doc
@@ -89,16 +75,3 @@
* Secure. It’s possible to evaluate untrusted template code if the optional
sandbox is enabled. This allows Jinja2 to be used as templating language
for applications where users may modify the template design.
-
-Package: python3-jinja2-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: python3-jinja2 (= ${binary:Version}), python3-dbg, ${shlibs:Depends}, ${misc:Depends}
-Provides: ${python:Provides}
-Description: small but fast and easy to use stand-alone template engine
- Jinja2 is a template engine written in pure Python. It provides a Django
- inspired non-XML syntax but supports inline expressions and an optional
- sandboxed environment.
- .
- This package contains the extension built for the Python debug interpreter.
Added: packages/jinja2/trunk/debian/patches/drop_next_import_from_docs-jinjaext.patch
===================================================================
--- packages/jinja2/trunk/debian/patches/drop_next_import_from_docs-jinjaext.patch (rev 0)
+++ packages/jinja2/trunk/debian/patches/drop_next_import_from_docs-jinjaext.patch 2013-05-20 20:11:03 UTC (rev 24467)
@@ -0,0 +1,15 @@
+Description: drop next import from docs/jinjaext.py
+ next is not available in jinja2/utils.py and all Python versions supported by
+ Jessie already support this function, no need for backwards compatible wrapper
+Author: Piotr Ożarowski <piotr at debian.org>
+--- jinja2-2.7.orig/docs/jinjaext.py
++++ jinja2-2.7/docs/jinjaext.py
+@@ -23,7 +23,7 @@ from pygments.style import Style
+ from pygments.token import Keyword, Name, Comment, String, Error, \
+ Number, Operator, Generic
+ from jinja2 import Environment, FileSystemLoader
+-from jinja2.utils import next
++#from jinja2.utils import next
+
+
+ def parse_rst(state, content_offset, doc):
Added: packages/jinja2/trunk/debian/patches/series
===================================================================
--- packages/jinja2/trunk/debian/patches/series (rev 0)
+++ packages/jinja2/trunk/debian/patches/series 2013-05-20 20:11:03 UTC (rev 24467)
@@ -0,0 +1 @@
+drop_next_import_from_docs-jinjaext.patch
Modified: packages/jinja2/trunk/debian/rules
===================================================================
--- packages/jinja2/trunk/debian/rules 2013-05-20 18:58:54 UTC (rev 24466)
+++ packages/jinja2/trunk/debian/rules 2013-05-20 20:11:03 UTC (rev 24467)
@@ -17,84 +17,53 @@
find . -name '\.DS_Store' -delete
make -C docs clean
dh_clean install-stamp build-stamp \
- $(PYVERS:%=install-python%) $(PYVERS:%=build-python%) \
- $(PYVERS:%=install-debug-python%) $(PYVERS:%=build-debug-python%)
+ $(PYVERS:%=install-python%) $(PYVERS:%=build-python%)
-build: build-stamp
+build: build-indep
-build-stamp: $(PYVERS:%=build-python%) $(PYVERS:%=build-debug-python%)
+build-arch:
+
+build-indep: $(PYVERS:%=build-python%) build-docs
touch $@
build-python%:
- python$* setup.py --with-debugsupport build
+ python$* setup.py build
touch $@
-build-debug-python%:
- python$*-dbg setup.py --with-debugsupport build
- touch $@
-
build-docs:
- PYTHONPATH=$(CURDIR) make -C docs html
+ PYTHONPATH=$(CURDIR):$(CURDIR)/docs make -C docs html
install: install-stamp
-install-stamp: $(PYVERS:%=install-python%) $(PYVERS:%=install-debug-python%)
+install-stamp: $(PYVERS:%=install-python%)
dh_install
touch $@
install-python%: build-python%
- python$* setup.py --with-debugsupport install $(py_setup_install_args) \
- --skip-build --single-version-externally-managed --root $(call pkgdir,$*)
- rm -rf $(call pkgdir,$*)$(call py_libdir,$*)/jinja2/_markupsafe
- rm -f $(call pkgdir,$*)$(call py_libdir,$*)/jinja2/_debugsupport.c
+ python$* setup.py install $(py_setup_install_args) \
+ --skip-build --root $(call pkgdir,$*)
touch $@
-install-debug-python%: build-debug-python%
- python$*-dbg setup.py --with-debugsupport install $(py_setup_install_args) \
- --skip-build --single-version-externally-managed --root $(call pkgdir,$*)-dbg/
- find $(call pkgdir,$*)-dbg/usr/ ! -type d ! -name '*\.so' -delete
- find $(call pkgdir,$*)-dbg/usr/ -depth -empty -delete
- touch $@
-
-binary-arch: build install
+binary-indep: build-indep install
dh_testdir
dh_testroot
- dh_installchangelogs -a CHANGES
- dh_installdocs -a
- find $(CURDIR)/debian/ -name '*.py[co]' -delete
- dh_python2 -a
- dh_python3 -a
- dh_makeshlibs -a
- dh_strip -ppython-jinja2 --dbg-package=python-jinja2-dbg
- dh_strip -ppython3-jinja2 --dbg-package=python3-jinja2-dbg
- rm -rf $(call pkgdir,2.X)-dbg/usr/share/doc/python-jinja2-dbg
- rm -rf $(call pkgdir,3.X)-dbg/usr/share/doc/python3-jinja2-dbg
- ln -s python-jinja2 $(call pkgdir,2.X)-dbg/usr/share/doc/python-jinja2-dbg
- ln -s python3-jinja2 $(call pkgdir,3.X)-dbg/usr/share/doc/python3-jinja2-dbg
- dh_compress -a -X.py -Xobjects.inv
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a -- -Z bzip2
-
-binary-indep: build-docs
- dh_testdir -i
- dh_testroot -i
dh_installchangelogs -i CHANGES
- dh_installdirs -i
dh_installdocs -i
+ dh_sphinxdoc -p python-jinja2-doc
dh_installexamples -i
+ find $(CURDIR)/debian/ -name '*.py[co]' -delete
+ dh_python2 -i -p python-jinja2
+ dh_python3 -i -p python3-jinja2
dh_link -i /usr/share/doc/python-jinja2-doc/html /usr/share/doc/python-jinja2/html
dh_link -i /usr/share/doc/python-jinja2-doc/html/_sources /usr/share/doc/python-jinja2/rst
- dh_link -i /usr/share/javascript/jquery/jquery.min.js /usr/share/doc/python-jinja2-doc/html/_static/jquery.js
- dh_compress -i -X.html -X.py
+ dh_compress -i -X.html -X.py -Xobjects.inv
dh_fixperms -i
dh_installdeb -i
dh_gencontrol -i
dh_md5sums -i
dh_builddeb -i -- -Z bzip2
+binary-arch:
+
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
More information about the Python-modules-commits
mailing list