[Python-modules-commits] r16366 - in packages/jinja2/trunk/debian (4 files)

[piotr at users.alioth.debian.org]

    Date: Tuesday, April 5, 2011 @ 21:42:44
  Author: piotr
Revision: 16366

* Upload to unstable (closes: 621001)
* Lower versions of build dependencies (to the ones from 2.5.5-1)
* Convert from dh_pysupport to dh_python2
* Change source format to 3.0 (quilt), drop quilt build dependency

Modified:
  packages/jinja2/trunk/debian/changelog
  packages/jinja2/trunk/debian/control
  packages/jinja2/trunk/debian/rules
  packages/jinja2/trunk/debian/source/format

Modified: packages/jinja2/trunk/debian/changelog
===================================================================
--- packages/jinja2/trunk/debian/changelog	2011-04-05 20:55:51 UTC (rev 16365)
+++ packages/jinja2/trunk/debian/changelog	2011-04-05 21:42:44 UTC (rev 16366)
@@ -1,3 +1,12 @@
+jinja2 (2.5.5-4) unstable; urgency=low
+
+  * Upload to unstable (closes: 621001)
+  * Lower versions of build dependencies (to the ones from 2.5.5-1)
+  * Convert from dh_pysupport to dh_python2
+  * Change source format to 3.0 (quilt), drop quilt build dependency
+
+ -- Piotr Ożarowski <piotr at debian.org>  Tue, 05 Apr 2011 23:21:21 +0200
+
 jinja2 (2.5.5-3) experimental; urgency=low
 
   * Bump minimum required python-support version to the one in experimental

Modified: packages/jinja2/trunk/debian/control
===================================================================
--- packages/jinja2/trunk/debian/control	2011-04-05 20:55:51 UTC (rev 16365)
+++ packages/jinja2/trunk/debian/control	2011-04-05 21:42:44 UTC (rev 16366)
@@ -3,14 +3,14 @@
 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 (>= 5), quilt, python-support (>= 1.0.12),
- python-all-dev (>= 2.6.6-4), python-all-dbg (>= 2.6.6-4),
- python3-all-dev (>= 3.1.3-15), python3-all-dbg (>= 3.1.3-15),
- python-setuptools (>= 0.6.14-5), python3-setuptools
+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.1
 Homepage: http://jinja.pocoo.org/2/
-XS-Python-Version: >= 2.4
+X-Python-Version: >= 2.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/jinja2/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/jinja2/trunk/
 
@@ -21,7 +21,6 @@
 Provides: ${python:Provides}
 Suggests: python-jinja2-doc
 Enhances: python-pybabel
-XB-Python-Version: ${python:Versions}
 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
@@ -59,7 +58,6 @@
 Priority: extra
 Depends: python-jinja2 (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 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
@@ -98,7 +96,6 @@
 Priority: extra
 Depends: python3-jinja2 (= ${binary:Version}), python3-dbg, ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 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

Modified: packages/jinja2/trunk/debian/rules
===================================================================
--- packages/jinja2/trunk/debian/rules	2011-04-05 20:55:51 UTC (rev 16365)
+++ packages/jinja2/trunk/debian/rules	2011-04-05 21:42:44 UTC (rev 16366)
@@ -2,14 +2,13 @@
 
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
 include /usr/share/python3/python.mk
 
 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
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -rf dist build Jinja2.egg-info
@@ -21,7 +20,7 @@
 		$(PYVERS:%=install-python%) $(PYVERS:%=build-python%) \
 		$(PYVERS:%=install-debug-python%) $(PYVERS:%=build-debug-python%)
 
-build: patch build-stamp
+build: build-stamp
 
 build-stamp: $(PYVERS:%=build-python%) $(PYVERS:%=build-debug-python%)
 	touch $@
@@ -37,7 +36,7 @@
 build-docs:
 	PYTHONPATH=$(CURDIR) make -C docs html
 
-install: patch install-stamp
+install: install-stamp
 install-stamp: $(PYVERS:%=install-python%) $(PYVERS:%=install-debug-python%)
 	dh_install
 	touch $@
@@ -63,7 +62,7 @@
 	dh_installchangelogs -a CHANGES
 	dh_installdocs -a
 	find $(CURDIR)/debian/ -name '*.py[co]' -delete
-	dh_pysupport -a
+	dh_python2 -a
 	dh_python3 -a 
 	dh_makeshlibs -a
 	dh_strip -ppython-jinja2 --dbg-package=python-jinja2-dbg

Modified: packages/jinja2/trunk/debian/source/format
===================================================================
--- packages/jinja2/trunk/debian/source/format	2011-04-05 20:55:51 UTC (rev 16365)
+++ packages/jinja2/trunk/debian/source/format	2011-04-05 21:42:44 UTC (rev 16366)
@@ -1 +1 @@
-1.0
+3.0 (quilt)