[Python-modules-commits] r25421 - in packages/beautifulsoup4/trunk/debian (6 files)

[stefanor at users.alioth.debian.org]

    Date: Wednesday, August 7, 2013 @ 10:08:53
  Author: stefanor
Revision: 25421

* New upstream release.
  - Bugfixes, and a behaviour change in entity handling.
* Port to dh-python.
* Build new binary package for PyPy: pypy-bs4.

Added:
  packages/beautifulsoup4/trunk/debian/pypy-bs4.install
  packages/beautifulsoup4/trunk/debian/python-bs4.install
  packages/beautifulsoup4/trunk/debian/python3-bs4.install
Modified:
  packages/beautifulsoup4/trunk/debian/changelog
  packages/beautifulsoup4/trunk/debian/control
  packages/beautifulsoup4/trunk/debian/rules

Modified: packages/beautifulsoup4/trunk/debian/changelog
===================================================================
--- packages/beautifulsoup4/trunk/debian/changelog	2013-08-07 07:05:50 UTC (rev 25420)
+++ packages/beautifulsoup4/trunk/debian/changelog	2013-08-07 10:08:53 UTC (rev 25421)
@@ -1,3 +1,12 @@
+beautifulsoup4 (4.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+    - Bugfixes, and a behaviour change in entity handling.
+  * Port to dh-python.
+  * Build new binary package for PyPy: pypy-bs4.
+
+ -- Stefano Rivera <stefanor at debian.org>  Wed, 07 Aug 2013 12:06:08 +0200
+
 beautifulsoup4 (4.2.0-2) unstable; urgency=low
 
   * Depend on python{,3}-lxml in autopkgtests.

Modified: packages/beautifulsoup4/trunk/debian/control
===================================================================
--- packages/beautifulsoup4/trunk/debian/control	2013-08-07 07:05:50 UTC (rev 25420)
+++ packages/beautifulsoup4/trunk/debian/control	2013-08-07 10:08:53 UTC (rev 25421)
@@ -5,14 +5,14 @@
 Uploaders: Stefano Rivera <stefanor at debian.org>
 Build-Depends:
  debhelper (>= 8.1),
+ dh-python,
+ pypy (>= 1.7),
  python-all (>= 2.6.5-13~),
  python-lxml,
- python-nose,
  python-pkg-resources,
  python-sphinx (>= 1.0.7+dfsg),
  python3-all (>= 3.1.2),
  python3-lxml,
- python3-nose,
  python3-pkg-resources
 X-Python-Version: >= 2.6
 Standards-Version: 3.9.4
@@ -33,6 +33,18 @@
  .
  This package contains BeautifulSoup 4, for Python 2.x.
 
+Package: pypy-bs4
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}
+Recommends: pypy-chardet, pypy-lxml | pypy-html5lib
+Description: error-tolerant HTML parser for PyPy
+ Beautiful Soup is a Python library for pulling data out of HTML and XML files.
+ It works with your favorite parser to provide idiomatic ways of navigating,
+ searching, and modifying the parse tree. It commonly saves programmers hours
+ or days of work.
+ .
+ This package contains BeautifulSoup 4, for Python 2.x PyPy.
+
 Package: python3-bs4
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}

Added: packages/beautifulsoup4/trunk/debian/pypy-bs4.install
===================================================================
--- packages/beautifulsoup4/trunk/debian/pypy-bs4.install	                        (rev 0)
+++ packages/beautifulsoup4/trunk/debian/pypy-bs4.install	2013-08-07 10:08:53 UTC (rev 25421)
@@ -0,0 +1 @@
+/usr/lib/pypy/dist-packages/

Added: packages/beautifulsoup4/trunk/debian/python-bs4.install
===================================================================
--- packages/beautifulsoup4/trunk/debian/python-bs4.install	                        (rev 0)
+++ packages/beautifulsoup4/trunk/debian/python-bs4.install	2013-08-07 10:08:53 UTC (rev 25421)
@@ -0,0 +1 @@
+/usr/lib/python2.*/*-packages

Added: packages/beautifulsoup4/trunk/debian/python3-bs4.install
===================================================================
--- packages/beautifulsoup4/trunk/debian/python3-bs4.install	                        (rev 0)
+++ packages/beautifulsoup4/trunk/debian/python3-bs4.install	2013-08-07 10:08:53 UTC (rev 25421)
@@ -0,0 +1 @@
+/usr/lib/python3*/*-packages

Modified: packages/beautifulsoup4/trunk/debian/rules
===================================================================
--- packages/beautifulsoup4/trunk/debian/rules	2013-08-07 07:05:50 UTC (rev 25420)
+++ packages/beautifulsoup4/trunk/debian/rules	2013-08-07 10:08:53 UTC (rev 25421)
@@ -1,48 +1,15 @@
 #!/usr/bin/make -f
 
-PYVERS   := $(shell pyversions -rv)
-PY3VERS  := $(shell py3versions -rv)
-
-include /usr/share/python/python.mk
-
 %:
-	dh $@ --with python2,python3,sphinxdoc
+	dh $@ --with python2,python3,pypy,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_build:
-	set -xe; \
-	for py in $(PYVERS) $(PY3VERS); do \
-		python$$py setup.py build; \
-	done
+	dh_auto_build
 	sphinx-build -aEN -b html -d build/doctrees doc/source build/html
 
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	set -xe; \
-	for py in $(PYVERS); do \
-		nosetests-$$py -w $(call py_builddir_sh,$$py); \
-	done
-	# build_py_2to3 builds to build/lib, urgh
-	set -xe; \
-	for py in $(PY3VERS); do \
-		python$$py /usr/bin/nosetests3 build/lib; \
-	done
-endif
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build/html build/doctrees
 
-override_dh_auto_install:
-	set -xe; \
-	for py in $(PYVERS); do \
-		python$$py setup.py install --skip-build --root debian/python-bs4 \
-			--install-layout deb; \
-	done
-	set -xe; \
-	for py in $(PY3VERS); do \
-		python$$py setup.py install --skip-build --root debian/python3-bs4 \
-			--install-layout deb; \
-	done
-
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS.txt
-
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -rf build