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

[stefanor at users.alioth.debian.org]

    Date: Sunday, February 20, 2011 @ 16:03:17
  Author: stefanor
Revision: 15810

* New upstream release.
  - Adds Python 3 support.
    + BD on python3-all >= 3.1.2-12.
    + New binary package, python3-html2text.
  - Reliably provides tarballs via pypi.
    + Update watch file.
    + Drop get-orig-source.

Modified:
  packages/python-html2text/trunk/debian/changelog
  packages/python-html2text/trunk/debian/control
  packages/python-html2text/trunk/debian/rules
  packages/python-html2text/trunk/debian/watch
Deleted:
  packages/python-html2text/trunk/debian/patches/

Modified: packages/python-html2text/trunk/debian/changelog
===================================================================
--- packages/python-html2text/trunk/debian/changelog	2011-02-20 14:56:49 UTC (rev 15809)
+++ packages/python-html2text/trunk/debian/changelog	2011-02-20 16:03:17 UTC (rev 15810)
@@ -1,6 +1,12 @@
-python-html2text (2.3.7-2) UNRELEASED; urgency=low
+python-html2text (3.0.1-1) unstable; urgency=low
 
-  * Don't leak uid and umask into source tarball and set -e.
+  * New upstream release.
+    - Adds Python 3 support.
+      + BD on python3-all >= 3.1.2-12.
+      + New binary package, python3-html2text.
+    - Reliably provides tarballs via pypi.
+      + Update watch file.
+      + Drop get-orig-source.
   * Switch to dh_python2.
     - Use X-Python-Version.
       + BD on python-all >= 2.6.5-13.

Modified: packages/python-html2text/trunk/debian/control
===================================================================
--- packages/python-html2text/trunk/debian/control	2011-02-20 14:56:49 UTC (rev 15809)
+++ packages/python-html2text/trunk/debian/control	2011-02-20 16:03:17 UTC (rev 15810)
@@ -3,12 +3,17 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Stefano Rivera <stefanor at debian.org>
-Build-Depends: debhelper (>= 7), python-all (>= 2.6.5-13~)
+Build-Depends:
+ debhelper (>= 7.0.50~),
+ python-all (>= 2.6.5-13~),
+ python-setuptools,
+ python3-all (>= 3.1.2-12~)
 Standards-Version: 3.9.1
 Homepage: http://www.aaronsw.com/2002/html2text/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-html2text/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-html2text/trunk/
 X-Python-Version: >= 2.3
+X-Python3-Version: >= 3.0
 
 Package: python-html2text
 Architecture: all
@@ -18,3 +23,15 @@
  html2text is a Python module that converts a page of HTML into clean,
  easy-to-read plain ASCII text. Better yet, that ASCII also happens to be
  valid Markdown (a text-to-HTML format).
+ .
+ This package contains the Python 2 version of the library.
+
+Package: python3-html2text
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Description: Python module for converting HTML to Markdown text (Python3 version)
+ html2text is a Python module that converts a page of HTML into clean,
+ easy-to-read plain ASCII text. Better yet, that ASCII also happens to be
+ valid Markdown (a text-to-HTML format).
+ .
+ This package contains the Python 3 version of the library.

Modified: packages/python-html2text/trunk/debian/rules
===================================================================
--- packages/python-html2text/trunk/debian/rules	2011-02-20 14:56:49 UTC (rev 15809)
+++ packages/python-html2text/trunk/debian/rules	2011-02-20 16:03:17 UTC (rev 15810)
@@ -1,19 +1,23 @@
 #!/usr/bin/make -f
 
+PYVERS :=  $(shell pyversions -r)
+PY3VERS := $(shell py3versions -r)
+
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3
 
-# Mangling version is necessary, as upstream pretends that 2.2 < 2.29 < 2.291 < 2.3
-# We put a dot between every digit of the minor number.
-VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
-UVER=$(shell echo '$(VER)' | sed -e 's/[.]/\#/' | tr -d '.' | tr '\#' '.')
+override_dh_auto_build:
+	set -e; \
+	for py in $(PYVERS) $(PY3VERS); do \
+		$$py setup.py build; \
+	done
 
-get-orig-source:
+override_dh_auto_install:
 	set -e; \
-	uscan --noconf --force-download --rename --download-version=$(VER) --destdir=.; \
-	mkdir html2text-$(VER); \
-	mv html2text-$(UVER).py html2text-$(VER)/html2text.py; \
-	cp /usr/share/common-licenses/GPL-3 html2text-$(VER)/COPYING; \
-	GZIP=--best tar -cz --owner root --group root --mode a+rX \
-	                -f python-html2text_$(VER).orig.tar.gz html2text-$(VER); \
-	rm -rf html2text-$(VER)
+	for py in $(PYVERS); do \
+		$$py setup.py install --skip-build --root debian/python-html2text --install-layout=deb; \
+	done
+	set -e; \
+	for py in $(PY3VERS); do \
+		$$py setup.py install --skip-build --root debian/python3-html2text --install-layout=deb; \
+	done

Modified: packages/python-html2text/trunk/debian/watch
===================================================================
--- packages/python-html2text/trunk/debian/watch	2011-02-20 14:56:49 UTC (rev 15809)
+++ packages/python-html2text/trunk/debian/watch	2011-02-20 16:03:17 UTC (rev 15810)
@@ -3,4 +3,4 @@
 # Mangling version is necessary, as upstream pretends that 2.2 < 2.29 < 2.291 < 2.3
 # We put a dot between every digit of the minor number.
 opts="uversionmangle=s/^(\d+)\.(\d)(\d+)/$1.$2.$3/;s/^(\d+)\.(\d).(\d)(\d+)/$1.$2.$3.$4/" \
-http://www.aaronsw.com/2002/html2text/html2text-(.*)\.py
+http://pypi.python.org/packages/source/h/html2text/html2text-(.*)\.tar.gz