[Python-modules-commits] r33567 - in packages/jinja2/trunk/debian (9 files)

Sat Aug 1 12:41:48 UTC 2015

Date: Saturday, August 1, 2015 @ 12:41:45
  Author: piotr
Revision: 33567

* New upstream release
  - drop jinja2-typos and drop_next_import_from_docs-jinjaext patches - both
    applied upstream
* rewrite debian/rules to dh sequencer and pybuild buildsystem
* Standards-version bumped to 3.9.6 (no other changes needed)

Added:
  packages/jinja2/trunk/debian/python-jinja2-doc.links
Modified:
  packages/jinja2/trunk/debian/changelog
  packages/jinja2/trunk/debian/control
  packages/jinja2/trunk/debian/rules
  packages/jinja2/trunk/debian/watch
Deleted:
  packages/jinja2/trunk/debian/README.source
  packages/jinja2/trunk/debian/patches/
  packages/jinja2/trunk/debian/python-jinja2-doc.dirs
  packages/jinja2/trunk/debian/u2to3.py

Deleted: packages/jinja2/trunk/debian/README.source
===================================================================

--- packages/jinja2/trunk/debian/README.source	2015-08-01 00:30:46 UTC (rev 33566)
+++ packages/jinja2/trunk/debian/README.source	2015-08-01 12:41:45 UTC (rev 33567)
@@ -1,2 +0,0 @@
-This package uses the patch management system quilt as documented in
-/usr/share/doc/quilt/README.source.

Modified: packages/jinja2/trunk/debian/changelog
===================================================================
--- packages/jinja2/trunk/debian/changelog	2015-08-01 00:30:46 UTC (rev 33566)
+++ packages/jinja2/trunk/debian/changelog	2015-08-01 12:41:45 UTC (rev 33567)
@@ -1,3 +1,13 @@
+jinja2 (2.8-1) unstable; urgency=medium
+
+  * New upstream release
+    - drop jinja2-typos and drop_next_import_from_docs-jinjaext patches - both
+      applied upstream
+  * rewrite debian/rules to dh sequencer and pybuild buildsystem
+  * Standards-version bumped to 3.9.6 (no other changes needed)
+
+ -- Piotr OÅ¼arowski <piotr at debian.org>  Sat, 01 Aug 2015 14:15:36 +0200
+
 jinja2 (2.7.3-1) unstable; urgency=medium
 
   * New upstream release

Modified: packages/jinja2/trunk/debian/control
===================================================================
--- packages/jinja2/trunk/debian/control	2015-08-01 00:30:46 UTC (rev 33566)
+++ packages/jinja2/trunk/debian/control	2015-08-01 12:41:45 UTC (rev 33567)
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Piotr OÅ¼arowski <piotr at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9), dh-python,
  python-all (>= 2.6.6-3), python3-all,
  python-setuptools (>= 0.6b3-1~), python3-setuptools,
  python-sphinx (>= 1.0.7+dfsg) | python3-sphinx, python-pygments
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 Homepage: http://jinja.pocoo.org/
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2

Deleted: packages/jinja2/trunk/debian/python-jinja2-doc.dirs
===================================================================
--- packages/jinja2/trunk/debian/python-jinja2-doc.dirs	2015-08-01 00:30:46 UTC (rev 33566)
+++ packages/jinja2/trunk/debian/python-jinja2-doc.dirs	2015-08-01 12:41:45 UTC (rev 33567)
@@ -1 +0,0 @@
-/usr/share/doc/python-jinja2/

Added: packages/jinja2/trunk/debian/python-jinja2-doc.links
===================================================================
--- packages/jinja2/trunk/debian/python-jinja2-doc.links	                        (rev 0)
+++ packages/jinja2/trunk/debian/python-jinja2-doc.links	2015-08-01 12:41:45 UTC (rev 33567)
@@ -0,0 +1,4 @@
+/usr/share/doc/python-jinja2-doc/html /usr/share/doc/python-jinja2/html
+/usr/share/doc/python-jinja2-doc/html/_sources /usr/share/doc/python-jinja2/rst
+/usr/share/doc/python-jinja2-doc/html /usr/share/doc/python3-jinja2/html
+/usr/share/doc/python-jinja2-doc/html/_sources /usr/share/doc/python3-jinja2/rst

Modified: packages/jinja2/trunk/debian/rules
===================================================================
--- packages/jinja2/trunk/debian/rules	2015-08-01 00:30:46 UTC (rev 33566)
+++ packages/jinja2/trunk/debian/rules	2015-08-01 12:41:45 UTC (rev 33567)
@@ -2,73 +2,14 @@
 
 #export DH_VERBOSE=1
 
-include /usr/share/python3/python.mk
+export PYBUILD_NAME=jinja2
 
-PYVERS=$(shell pyversions -vr) $(shell py3versions -vr)
-VERSION=$(shell sed -rn 's,^Version: (.*),\1,p' $(CURDIR)/PKG-INFO)
-pkgdir = $(CURDIR)/debian/python$(if $(patsubst 3.%,,$(1)),,3)-jinja2
+%:
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -rf dist build Jinja2.egg-info
-	find . -name '*\.pyc' -delete
-	find . -name '\._*' -delete
-	find . -name '\.DS_Store' -delete
+override_dh_auto_clean:
 	make -C docs clean
-	dh_clean install-stamp build-stamp \
-		$(PYVERS:%=install-python%) $(PYVERS:%=build-python%)
+	dh_auto_clean
 
-build: build-indep
-
-build-arch:
-
-build-indep: $(PYVERS:%=build-python%) build-docs
-	touch $@
-
-build-python3%:
-	python3$* setup.py build
-	python debian/u2to3.py --no-diffs --write --nobackups build/lib/
-	touch $@
-
-build-python%:
-	python$* setup.py build
-	touch $@
-
-build-docs:
+override_dh_auto_build-indep:
 	PYTHONPATH=$(CURDIR):$(CURDIR)/docs make -C docs html
-
-install: install-stamp
-install-stamp: $(PYVERS:%=install-python%)
-	dh_install
-	touch $@
-
-install-python%: build-python%
-	python$* setup.py install $(py_setup_install_args) \
-		--skip-build --root $(call pkgdir,$*)
-	touch $@
-
-binary-indep: build-indep install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -i CHANGES
-	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_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

Deleted: packages/jinja2/trunk/debian/u2to3.py
===================================================================
--- packages/jinja2/trunk/debian/u2to3.py	2015-08-01 00:30:46 UTC (rev 33566)
+++ packages/jinja2/trunk/debian/u2to3.py	2015-08-01 12:41:45 UTC (rev 33567)
@@ -1,12 +0,0 @@
-#!/usr/bin/python
-
-'''
-minimal 2to3 coverter that touches only u'' literals
-'''
-
-import sys
-from lib2to3.fixes.fix_unicode import FixUnicode
-
-FixUnicode.PATTERN = 'STRING'
-sys.argv[1:1] = ['-f', 'unicode']
-execfile('/usr/bin/2to3')

Modified: packages/jinja2/trunk/debian/watch
===================================================================
--- packages/jinja2/trunk/debian/watch	2015-08-01 00:30:46 UTC (rev 33566)
+++ packages/jinja2/trunk/debian/watch	2015-08-01 12:41:45 UTC (rev 33567)
@@ -1,3 +1,3 @@
 version=3
-opts=uversionmangle=s/rc/~rc/ \
-http://pypi.python.org/packages/source/J/Jinja2/Jinja2-(.+)\.tar\.gz debian uupdate
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://pypi.debian.net/Jinja2/Jinja2-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
\ No newline at end of file


