[Python-modules-commits] r20383 - in packages/beautifulsoup4/trunk/debian (13 files)
stefanor at users.alioth.debian.org
stefanor at users.alioth.debian.org
Thu Feb 9 16:33:53 UTC 2012
Date: Thursday, February 9, 2012 @ 16:33:51
Author: stefanor
Revision: 20383
* New upstream beta.
* Drop failing-tests patch, incorporated upstream.
* Patch no-install-data: Don't install documentation from setup.py.
* Update watch file to new download location.
* Build sphinx documentation.
- New package: python-bs4-doc
- B-D on python-sphinx.
Added:
packages/beautifulsoup4/trunk/debian/patches/no-install-data
packages/beautifulsoup4/trunk/debian/python-bs4-doc.doc-base
packages/beautifulsoup4/trunk/debian/python-bs4-doc.docs
packages/beautifulsoup4/trunk/debian/python-bs4-doc.links
Modified:
packages/beautifulsoup4/trunk/debian/changelog
packages/beautifulsoup4/trunk/debian/control
packages/beautifulsoup4/trunk/debian/copyright
packages/beautifulsoup4/trunk/debian/patches/series
packages/beautifulsoup4/trunk/debian/rules
packages/beautifulsoup4/trunk/debian/watch
Deleted:
packages/beautifulsoup4/trunk/debian/patches/failing-tests
packages/beautifulsoup4/trunk/debian/python-bs4.docs
packages/beautifulsoup4/trunk/debian/python3-bs4.docs
Modified: packages/beautifulsoup4/trunk/debian/changelog
===================================================================
--- packages/beautifulsoup4/trunk/debian/changelog 2012-02-09 10:45:49 UTC (rev 20382)
+++ packages/beautifulsoup4/trunk/debian/changelog 2012-02-09 16:33:51 UTC (rev 20383)
@@ -1,3 +1,15 @@
+beautifulsoup4 (4.0.0~b4-1) UNRELEASED; urgency=low
+
+ * New upstream beta.
+ * Drop failing-tests patch, incorporated upstream.
+ * Patch no-install-data: Don't install documentation from setup.py.
+ * Update watch file to new download location.
+ * Build sphinx documentation.
+ - New package: python-bs4-doc
+ - B-D on python-sphinx.
+
+ -- Stefano Rivera <stefanor at debian.org> Thu, 09 Feb 2012 17:50:59 +0200
+
beautifulsoup4 (4.0.0~b3-1) unstable; urgency=low
* New upstream release with an incompatible API.
Modified: packages/beautifulsoup4/trunk/debian/control
===================================================================
--- packages/beautifulsoup4/trunk/debian/control 2012-02-09 10:45:49 UTC (rev 20382)
+++ packages/beautifulsoup4/trunk/debian/control 2012-02-09 16:33:51 UTC (rev 20383)
@@ -8,8 +8,9 @@
python-all (>= 2.6.5-13~),
python-lxml,
python-pkg-resources,
+ python-sphinx (>= 1.0.7+dfsg),
python-unittest2,
- python3-all (>= 3.1.2-1~),
+ python3-all (>= 3.1.2),
python3-lxml,
python3-pkg-resources
X-Python-Version: >= 2.6
@@ -21,7 +22,7 @@
Package: python-bs4
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}
-Recommends: python-html5lib | python-lxml, python-chardet
+Recommends: python-chardet, python-html5lib | python-lxml
Description: error-tolerant HTML parser for Python
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,
@@ -33,7 +34,7 @@
Package: python3-bs4
Architecture: all
Depends: ${misc:Depends}, ${python3:Depends}
-Recommends: python3-lxml, python3-chardet
+Recommends: python3-chardet, python3-lxml
Description: error-tolerant HTML parser for Python 3
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,
@@ -41,3 +42,15 @@
or days of work.
.
This package contains BeautifulSoup 4, for Python 3.x.
+
+Package: python-bs4-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: error-tolerant HTML parser for Python - documentation
+ 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's documentation.
Modified: packages/beautifulsoup4/trunk/debian/copyright
===================================================================
--- packages/beautifulsoup4/trunk/debian/copyright 2012-02-09 10:45:49 UTC (rev 20382)
+++ packages/beautifulsoup4/trunk/debian/copyright 2012-02-09 16:33:51 UTC (rev 20383)
@@ -1,4 +1,4 @@
-Format: Rhttp://anonscm.debian.org/loggerhead/dep/dep5/trunk/revision/179/dep5/copyright-format.xml
+Format: http://anonscm.debian.org/loggerhead/dep/dep5/trunk/revision/179/dep5/copyright-format.xml
Upstream-Name: Beautiful Soup
Upstream-Contact: Leonard Richardson <leonardr at segfault.org>
Source: https://launchpad.net/beautifulsoup
@@ -10,6 +10,11 @@
Beautiful Soup incorporates code from the html5lib library, which is also made
available under the MIT license.
+Files: bs4/doc/source/6.1.jpg
+Copyright: Out of copyright
+License: public-domain
+ Copyright protection expired. From Alice in Wonderland, published 1865.
+
Files: debian/*
Copyright:
2005-2009, Decklin Foster <decklin at red-bean.com>
Deleted: packages/beautifulsoup4/trunk/debian/patches/failing-tests
===================================================================
--- packages/beautifulsoup4/trunk/debian/patches/failing-tests 2012-02-09 10:45:49 UTC (rev 20382)
+++ packages/beautifulsoup4/trunk/debian/patches/failing-tests 2012-02-09 16:33:51 UTC (rev 20383)
@@ -1,30 +0,0 @@
-Description: Skip failing test (on python 2.7)
- This test "verifies" bad behavior on HTMLParser's part that appears in some
- versions of Python but not others.
-Author: Stefano Rivera <stefanor at debian.org>
-Bug-Upstream: https://bugs.launchpad.net/beautifulsoup/+bug/928320
-Forwarded: not-needed
-Last-Update: 2012-02-07
-
---- a/bs4/tests/test_htmlparser.py
-+++ b/bs4/tests/test_htmlparser.py
-@@ -7,6 +7,11 @@
- TestLXMLBuilderInvalidMarkup,
- )
-
-+try:
-+ import unittest2 as unittest
-+except ImportError:
-+ import unittest
-+
- class TestHTMLParserTreeBuilder(TestLXMLBuilder):
- """See `BuilderSmokeTest`."""
-
-@@ -97,6 +102,7 @@
- self.assertEqual(soup.textarea.contents[1].name, 'b')
- self.assertEqual(soup.textarea.b.string, u" tags and <&<&")
-
-+ @unittest.skip("Fails on Debian")
- def test_literal_in_script(self):
- # The contents of a <script> tag are supposed to be treated as
- # a literal string, even if that string contains HTML. But
Added: packages/beautifulsoup4/trunk/debian/patches/no-install-data
===================================================================
--- packages/beautifulsoup4/trunk/debian/patches/no-install-data (rev 0)
+++ packages/beautifulsoup4/trunk/debian/patches/no-install-data 2012-02-09 16:33:51 UTC (rev 20383)
@@ -0,0 +1,27 @@
+Description: Don't install docs from setup.py
+ The documentation will be installed separately, don't install it with setup.py.
+Author: Stefano Rivera <stefanor at debian.org>
+Forwarded: not-needed
+Last-Update: 20120-02-09
+
+--- a/setup.py
++++ b/setup.py
+@@ -15,12 +15,12 @@
+ long_description="""Beautiful Soup sits atop an HTML or XML parser, providing Pythonic idioms for iterating, searching, and modifying the parse tree.""",
+ license="MIT",
+ packages=['bs4', 'bs4.builder', 'bs4.tests'],
+- package_data={
+- "bs4": ["doc/source/*.jpg", "doc/source/*.rst",
+- "doc/source/*.py", "doc/Makefile"]
+- },
+- data_files=[
+- ('', ['COPYING.txt', 'NEWS.txt', 'AUTHORS.txt', 'README.txt'])],
++ #package_data={
++ # "bs4": ["doc/source/*.jpg", "doc/source/*.rst",
++ # "doc/source/*.py", "doc/Makefile"]
++ # },
++ #data_files=[
++ # ('', ['COPYING.txt', 'NEWS.txt', 'AUTHORS.txt', 'README.txt'])],
+ cmdclass = {'build_py':build_py},
+ classifiers=["Development Status :: 4 - Beta",
+ "Intended Audience :: Developers",
Modified: packages/beautifulsoup4/trunk/debian/patches/series
===================================================================
--- packages/beautifulsoup4/trunk/debian/patches/series 2012-02-09 10:45:49 UTC (rev 20382)
+++ packages/beautifulsoup4/trunk/debian/patches/series 2012-02-09 16:33:51 UTC (rev 20383)
@@ -1,2 +1,2 @@
unittest2
-failing-tests
+no-install-data
Added: packages/beautifulsoup4/trunk/debian/python-bs4-doc.doc-base
===================================================================
--- packages/beautifulsoup4/trunk/debian/python-bs4-doc.doc-base (rev 0)
+++ packages/beautifulsoup4/trunk/debian/python-bs4-doc.doc-base 2012-02-09 16:33:51 UTC (rev 20383)
@@ -0,0 +1,12 @@
+Document: python-bs4-doc
+Title: Beautiful Soup Documentation
+Author: Leonard Richardsonn
+Abstract: Beautiful Soup is a Python library for pulling data out of HTML and XML files
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-bs4-doc/html/index.html
+Files: /usr/share/doc/python-bs4-doc/html/*.html
+
+Format: Text
+Files: /usr/share/doc/python-bs4-doc/rst/*.txt
Added: packages/beautifulsoup4/trunk/debian/python-bs4-doc.docs
===================================================================
--- packages/beautifulsoup4/trunk/debian/python-bs4-doc.docs (rev 0)
+++ packages/beautifulsoup4/trunk/debian/python-bs4-doc.docs 2012-02-09 16:33:51 UTC (rev 20383)
@@ -0,0 +1,2 @@
+README.txt
+build/html
Added: packages/beautifulsoup4/trunk/debian/python-bs4-doc.links
===================================================================
--- packages/beautifulsoup4/trunk/debian/python-bs4-doc.links (rev 0)
+++ packages/beautifulsoup4/trunk/debian/python-bs4-doc.links 2012-02-09 16:33:51 UTC (rev 20383)
@@ -0,0 +1 @@
+/usr/share/doc/python-bs4-doc/html/_sources /usr/share/doc/python-bs4-doc/rst
Deleted: packages/beautifulsoup4/trunk/debian/python-bs4.docs
===================================================================
--- packages/beautifulsoup4/trunk/debian/python-bs4.docs 2012-02-09 10:45:49 UTC (rev 20382)
+++ packages/beautifulsoup4/trunk/debian/python-bs4.docs 2012-02-09 16:33:51 UTC (rev 20383)
@@ -1 +0,0 @@
-README.txt
Deleted: packages/beautifulsoup4/trunk/debian/python3-bs4.docs
===================================================================
--- packages/beautifulsoup4/trunk/debian/python3-bs4.docs 2012-02-09 10:45:49 UTC (rev 20382)
+++ packages/beautifulsoup4/trunk/debian/python3-bs4.docs 2012-02-09 16:33:51 UTC (rev 20383)
@@ -1 +0,0 @@
-README.txt
Modified: packages/beautifulsoup4/trunk/debian/rules
===================================================================
--- packages/beautifulsoup4/trunk/debian/rules 2012-02-09 10:45:49 UTC (rev 20382)
+++ packages/beautifulsoup4/trunk/debian/rules 2012-02-09 16:33:51 UTC (rev 20383)
@@ -4,13 +4,14 @@
PY3VERS := $(shell py3versions -r)
%:
- dh $@ --with python2,python3
+ dh $@ --with python2,python3,sphinxdoc
override_dh_auto_build:
set -xe; \
for py in $(PYVERS) $(PY3VERS); do \
$$py setup.py build; \
done
+ sphinx-build -aEN -b html -d build/doctrees bs4/doc/source build/html
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -43,6 +44,9 @@
--install-layout deb; \
done
+override_dh_installchangelogs:
+ dh_installchangelogs NEWS.txt
+
override_dh_auto_clean:
dh_auto_clean
rm -rf build
Modified: packages/beautifulsoup4/trunk/debian/watch
===================================================================
--- packages/beautifulsoup4/trunk/debian/watch 2012-02-09 10:45:49 UTC (rev 20382)
+++ packages/beautifulsoup4/trunk/debian/watch 2012-02-09 16:33:51 UTC (rev 20383)
@@ -1,3 +1,3 @@
version=3
opts=uversionmangle=s/([ab]\d+)/~$1/ \
-http://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-(.+)\.tar\.gz
+http://www.crummy.com/software/BeautifulSoup/bs4/download/(\d\.\d)/beautifulsoup4-([\d.abrc]+)\.tar\.gz
More information about the Python-modules-commits
mailing list