[Python-modules-commits] r14387 - in packages/mako/trunk/debian (8 files)

Mon Sep 6 21:19:09 UTC 2010

Date: Monday, September 6, 2010 @ 21:19:07
  Author: piotr
Revision: 14387

* Add python3-mako binary package
* make_sure_2to3_is_used.patch added
* Source format changed to 3.0 (quilt)

Added:
  packages/mako/trunk/debian/patches/
  packages/mako/trunk/debian/patches/make_sure_2to3_is_used.patch
  packages/mako/trunk/debian/patches/series
  packages/mako/trunk/debian/python3-mako.pydist
Modified:
  packages/mako/trunk/debian/changelog
  packages/mako/trunk/debian/control
  packages/mako/trunk/debian/rules
  packages/mako/trunk/debian/source/format

Modified: packages/mako/trunk/debian/changelog
===================================================================

--- packages/mako/trunk/debian/changelog	2010-09-06 20:42:58 UTC (rev 14386)
+++ packages/mako/trunk/debian/changelog	2010-09-06 21:19:07 UTC (rev 14387)
@@ -1,3 +1,11 @@
+mako (0.3.4-3) experimental; urgency=low
+
+  * Add python3-mako binary package
+  * make_sure_2to3_is_used.patch added
+  * Source format changed to 3.0 (quilt)
+
+ -- Piotr OÅ¼arowski <piotr at debian.org>  Mon, 06 Sep 2010 23:04:39 +0200
+
 mako (0.3.4-2) unstable; urgency=low
 
   * Move python-markupsafe to Depends (closes: #587760)

Modified: packages/mako/trunk/debian/control
===================================================================
--- packages/mako/trunk/debian/control	2010-09-06 20:42:58 UTC (rev 14386)
+++ packages/mako/trunk/debian/control	2010-09-06 21:19:07 UTC (rev 14387)
@@ -4,10 +4,12 @@
 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.0.38)
-Build-Depends-Indep: python (>= 2.3.5-11), python-all, python-support (>= 0.6.4), python-setuptools (>= 0.6b3-1~)
+Build-Depends-Indep: python (>= 2.3.5-11), python-all, python-support (>= 0.6.4), python-setuptools (>= 0.6b3-1~),
+ python3-all (>= 3.1.2-2), python3-setuptools
 Standards-Version: 3.9.0
 Homepage: http://www.makotemplates.org/
 XS-Python-Version: >= 2.4
+X-Python3-Version: >= 3.0
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/mako/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/mako/trunk/
 
@@ -26,3 +28,17 @@
  componentized layout and inheritance to produce one of the most
  straightforward and flexible models available, while also maintaining close
  ties to Python calling and scoping semantics.
+
+Package: python3-mako
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}, python3-markupsafe
+Suggests: ${python3:Suggests}, python3-beaker
+Description: fast and lightweight templating for the Python 3 platform
+ Mako is a template library written in Python. It provides a familiar, non-XML
+ syntax which compiles into Python modules for maximum performance. Mako's
+ syntax and API borrows from the best ideas of many others, including Django
+ templates, Cheetah, Myghty, and Genshi. Conceptually, Mako is an embedded
+ Python (i.e. Python Server Page) language, which refines the familiar ideas of
+ componentized layout and inheritance to produce one of the most
+ straightforward and flexible models available, while also maintaining close
+ ties to Python calling and scoping semantics.

Added: packages/mako/trunk/debian/patches/make_sure_2to3_is_used.patch
===================================================================
--- packages/mako/trunk/debian/patches/make_sure_2to3_is_used.patch	                        (rev 0)
+++ packages/mako/trunk/debian/patches/make_sure_2to3_is_used.patch	2010-09-06 21:19:07 UTC (rev 14387)
@@ -0,0 +1,10 @@
+Index: mako-0.3.4/setup.py
+===================================================================
+--- mako-0.3.4.orig/setup.py
++++ mako-0.3.4/setup.py
+@@ -64,4 +64,5 @@ ties to Python calling and scoping seman
+       [babel.extractors]
+       mako = mako.ext.babelplugin:extract
+       """,
++      **extra
+ )

Added: packages/mako/trunk/debian/patches/series
===================================================================
--- packages/mako/trunk/debian/patches/series	                        (rev 0)
+++ packages/mako/trunk/debian/patches/series	2010-09-06 21:19:07 UTC (rev 14387)
@@ -0,0 +1 @@
+make_sure_2to3_is_used.patch

Added: packages/mako/trunk/debian/python3-mako.pydist
===================================================================
--- packages/mako/trunk/debian/python3-mako.pydist	                        (rev 0)
+++ packages/mako/trunk/debian/python3-mako.pydist	2010-09-06 21:19:07 UTC (rev 14387)
@@ -0,0 +1 @@
+Mako python3-mako; PEP386

Modified: packages/mako/trunk/debian/rules
===================================================================
--- packages/mako/trunk/debian/rules	2010-09-06 20:42:58 UTC (rev 14386)
+++ packages/mako/trunk/debian/rules	2010-09-06 21:19:07 UTC (rev 14387)
@@ -3,6 +3,9 @@
 #export DH_VERBOSE=1
 
 PYVERS=$(shell pyversions -vr)
+PY3VERS=$(shell py3versions -vs)
+pkgdir = $(CURDIR)/debian/python$(if $(patsubst 3.%,,$(1)),,3)-mako
+-include /usr/share/python/python.mk
 
 clean:
 	dh_testdir
@@ -14,18 +17,18 @@
 
 build:
 
-install: $(PYVERS:%=install-python%)
+install: $(PYVERS:%=install-python%) $(PY3VERS:%=install-python%)
 	dh_install
 	mv $(CURDIR)/debian/python-mako/usr/share/vim/addons/indent/mako_indent.vim \
 	   $(CURDIR)/debian/python-mako/usr/share/vim/addons/indent/mako.vim
 
 install-python%:
 	python$* setup.py build_scripts	--executable=/usr/bin/python
-	python$* setup.py install --prefix=/usr \
+	python$* setup.py install $(py_setup_install_args) \
 		--single-version-externally-managed \
-		--root $(CURDIR)/debian/python-mako
+		--root $(call pkgdir,$*)
 	# dpkg handles dependencies way better than Python
-	find $(CURDIR)/debian/python-mako -name requires.txt -type f -delete
+	find $(call pkgdir,$*) -name requires.txt -type f -delete
 
 binary-indep: build install
 	dh_testdir -i
@@ -36,6 +39,9 @@
 	dh_installman -i
 	rm -rf debian/python-mako/usr/share/doc/python-mako/doc/build
 	dh_pysupport -i
+	# TODO: new name for Py3k's mako-render
+	rm -f $(call pkgdir,3.X)/usr/bin/mako-render
+	dh_python3 -i
 	dh_compress -i -X.py -Xmakotemplates.txt
 	dh_fixperms -i
 	dh_installdeb -i

Modified: packages/mako/trunk/debian/source/format
===================================================================
--- packages/mako/trunk/debian/source/format	2010-09-06 20:42:58 UTC (rev 14386)
+++ packages/mako/trunk/debian/source/format	2010-09-06 21:19:07 UTC (rev 14387)
@@ -1 +1 @@
-1.0
+3.0 (quilt)


