Update packaging to conform to new upstream release

* Add python*-six, python*-nose, and python3-html5lib to Build-Depends.

* Ship both python2 and python3 packages.

* Run tests during build.

3 files changed, 56 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 976033f..c6d61a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+python-bleach (1.4-1) unstable; urgency=low
+
+  * New upstream release
+    - Add python*-six to Build-Dependends
+  * Shipping both python2 and python3 packages
+    - Add python3-html5lib to Build-Dependends
+  * Running tests during build
+    - Add python*-nose Build-Dependends
+
+ -- Per Andersson <avtobiff@gmail.com>  Fri, 14 Feb 2014 00:59:20 +0100
+
 python-bleach (1.2.2-1) unstable; urgency=low
 
   * Initial release (Closes: #686902)
diff --git a/debian/control b/debian/control
index 9cbd429..d845fde 100644
--- a/debian/control
+++ b/debian/control
@@ -4,17 +4,29 @@ Priority: optional
 Maintainer: Per Andersson <avtobiff@gmail.com>
 Standards-Version: 3.9.4
 Build-Depends:
- debhelper (>= 7.0.50~),
- python-all,
- python-setuptools
+ debhelper (>= 8),
+ dh-python,
+ python-docutils,
+ python3-all,
+ python3-nose,
+ python3-setuptools,
+ python-all (>= 2.6.6-3~),
+ python-nose,
+ python-setuptools,
+ python3-html5lib,
+ python3-six,
+ python-html5lib,
+ python-six
 Homepage: http://github.com/jsocol/bleach/
 Vcs-Git: git://anonscm.debian.org/collab-maint/python-bleach.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/python-bleach.git;a=summary
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
 
 Package: python-bleach
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
-Description: whitelist-based HTML-sanitizing library
+Description: whitelist-based HTML-sanitizing library (Python 2)
  Bleach is an HTML sanitizing library that escapes or strips markup and
  attributes based on a white list. Bleach can also linkify text safely,
  applying filters that Django's urlize filter cannot, and optionally setting
@@ -28,3 +40,25 @@ Description: whitelist-based HTML-sanitizing library
  Because it relies on html5lib, Bleach is as good as modern browsers at dealing
  with weird, quirky HTML fragments. And any of Bleach's methods will fix
  unbalanced or mis-nested tags.
+ .
+ This is the Python 2 version of the package.
+
+Package: python3-bleach
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Description: whitelist-based HTML-sanitizing library (Python 3)
+ Bleach is an HTML sanitizing library that escapes or strips markup and
+ attributes based on a white list. Bleach can also linkify text safely,
+ applying filters that Django's urlize filter cannot, and optionally setting
+ rel attributes, even on links already in the text.
+ .
+ Bleach is intended for sanitizing text from untrusted sources. If you find
+ yourself jumping through hoops to allow your site administrators to do lots of
+ things, you're probably outside the use cases. Either trust those users, or
+ don't.
+ .
+ Because it relies on html5lib, Bleach is as good as modern browsers at dealing
+ with weird, quirky HTML fragments. And any of Bleach's methods will fix
+ unbalanced or mis-nested tags.
+ .
+ This is the Python 3 version of the package.
diff --git a/debian/rules b/debian/rules
index 4647c9c..e6f8559 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,10 @@
 #!/usr/bin/make -f
+#export DH_VERBOSE=1
+export PYBUILD_NAME=bleach
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3 --buildsystem=pybuild
+
+override_dh_auto_test:
+	nosetests
+	nosetests3