[Python-modules-commits] r32762 - in packages/python-meld3/trunk/debian (5 files)

[asb at users.alioth.debian.org]

    Date: Saturday, May 23, 2015 @ 23:21:23
  Author: asb
Revision: 32762

* Team upload.
* Build Python 3 package (Closes: #782946).
* Build using pybuild.

Added:
  packages/python-meld3/trunk/debian/python3-meld3.docs
Modified:
  packages/python-meld3/trunk/debian/changelog
  packages/python-meld3/trunk/debian/control
  packages/python-meld3/trunk/debian/rules
Deleted:
  packages/python-meld3/trunk/debian/python-meld3.install

Modified: packages/python-meld3/trunk/debian/changelog
===================================================================
--- packages/python-meld3/trunk/debian/changelog	2015-05-22 02:48:34 UTC (rev 32761)
+++ packages/python-meld3/trunk/debian/changelog	2015-05-23 23:21:23 UTC (rev 32762)
@@ -1,3 +1,11 @@
+python-meld3 (1.0.0-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Build Python 3 package (Closes: #782946).
+  * Build using pybuild.
+
+ -- Andrew Starr-Bochicchio <asb at debian.org>  Sat, 23 May 2015 18:55:34 -0400
+
 python-meld3 (1.0.0-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/python-meld3/trunk/debian/control
===================================================================
--- packages/python-meld3/trunk/debian/control	2015-05-22 02:48:34 UTC (rev 32761)
+++ packages/python-meld3/trunk/debian/control	2015-05-23 23:21:23 UTC (rev 32762)
@@ -3,8 +3,14 @@
 Priority: extra
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Jackson Doak <noskcaj at ubuntu.com>
-Build-Depends: debhelper (>= 9), python-setuptools (>= 0.6c7), python-all-dev (>= 2.6.6-3~)
+Build-Depends: debhelper (>= 9),
+               dh-python,
+               python-all-dev (>= 2.6.6-3~),
+               python3-all-dev,
+               python-setuptools (>= 0.6c7),
+               python3-setuptools
 X-Python-Version: >= 2.5
+X-Python3-Version: >= 3.2
 Standards-Version: 3.9.5
 Homepage: https://pypi.python.org/pypi/meld3
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-meld3/trunk/
@@ -20,3 +26,14 @@
  another. meld3 can deal with HTML or XML/XHTML input and can output
  well-formed HTML or XML/XHTML.
 
+Package: python3-meld3
+Architecture: any
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${python:Provides}
+Description: HTML/XML templating system for Python (Python 3)
+ meld3 is an HTML/XML templating system for Python 2.3+ which keeps
+ template markup and dynamic rendering logic separate from one
+ another. meld3 can deal with HTML or XML/XHTML input and can output
+ well-formed HTML or XML/XHTML.
+ .
+ This package installs the library for Python 3.

Deleted: packages/python-meld3/trunk/debian/python-meld3.install
===================================================================
--- packages/python-meld3/trunk/debian/python-meld3.install	2015-05-22 02:48:34 UTC (rev 32761)
+++ packages/python-meld3/trunk/debian/python-meld3.install	2015-05-23 23:21:23 UTC (rev 32762)
@@ -1,4 +0,0 @@
-usr/lib/python*/*-packages/meld3*egg-info
-usr/lib/python*/*-packages/meld3/__init__.py
-usr/lib/python*/*-packages/meld3/meld3.py
-

Added: packages/python-meld3/trunk/debian/python3-meld3.docs
===================================================================
--- packages/python-meld3/trunk/debian/python3-meld3.docs	                        (rev 0)
+++ packages/python-meld3/trunk/debian/python3-meld3.docs	2015-05-23 23:21:23 UTC (rev 32762)
@@ -0,0 +1,2 @@
+README.txt
+TODO.txt

Modified: packages/python-meld3/trunk/debian/rules
===================================================================
--- packages/python-meld3/trunk/debian/rules	2015-05-22 02:48:34 UTC (rev 32761)
+++ packages/python-meld3/trunk/debian/rules	2015-05-23 23:21:23 UTC (rev 32762)
@@ -2,46 +2,11 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-PYDEF=$(shell pyversions -d)
-PYVERS=$(shell pyversions -r)
+#export DH_VERBOSE=1
+export PYBUILD_NAME=meld3
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
-override_dh_auto_build:
-	# Add here commands to compile the package.
-	for python in $(PYVERS); do \
-		python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \
-		USE_MELD3_EXTENSION_MODULES=true \
-		$$python setup.py build; \
-	done
-	touch $@
-	dh_auto_build
-
-override_dh_clean:
-	for python in $(PYVERS); do \
-		python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \
-		USE_MELD3_EXTENSION_MODULES=true \
-		$$python setup.py clean; \
-	done
-	rm -rf build/
-	dh_clean 
-
-override_dh_installdirs:
-	dh_installdirs
-	# Add here commands to install the package into debian/tmp
-	set -e; \
-	for python in $(PYVERS); do \
-		pydir=$$python \
-		python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \
-		USE_MELD3_EXTENSION_MODULES=true \
-		$$python setup.py install --no-compile --root=debian/tmp --install-layout=deb; \
-	done
-
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGES.txt
-
-override_dh_install:
-	dh_install --sourcedir=debian/tmp
-