[Python-modules-commits] r20465 - in packages/beautifulsoup4/trunk/debian (3 files)

[stefanor at users.alioth.debian.org]

    Date: Wednesday, February 15, 2012 @ 17:59:07
  Author: stefanor
Revision: 20465

* Refresh patches.
* Swap alternative dependency order for html5lib | lxml, lxml is now
  preferred, upstream.

Modified:
  packages/beautifulsoup4/trunk/debian/changelog
  packages/beautifulsoup4/trunk/debian/control
  packages/beautifulsoup4/trunk/debian/patches/unittest2

Modified: packages/beautifulsoup4/trunk/debian/changelog
===================================================================
--- packages/beautifulsoup4/trunk/debian/changelog	2012-02-15 10:55:01 UTC (rev 20464)
+++ packages/beautifulsoup4/trunk/debian/changelog	2012-02-15 17:59:07 UTC (rev 20465)
@@ -1,14 +1,17 @@
-beautifulsoup4 (4.0.0~b4-1) UNRELEASED; urgency=low
+beautifulsoup4 (4.0.0~b5-1) unstable; urgency=low
 
   * New upstream beta.
+  * Refresh patches.
   * Drop failing-tests patch, incorporated upstream.
   * Patch no-install-data: Don't install documentation from setup.py.
   * Update watch file to new download location.
+  * Swap alternative dependency order for html5lib | lxml, lxml is now
+    preferred, upstream.
   * 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
+ -- Stefano Rivera <stefanor at debian.org>  Wed, 15 Feb 2012 19:58:57 +0200
 
 beautifulsoup4 (4.0.0~b3-1) unstable; urgency=low
 

Modified: packages/beautifulsoup4/trunk/debian/control
===================================================================
--- packages/beautifulsoup4/trunk/debian/control	2012-02-15 10:55:01 UTC (rev 20464)
+++ packages/beautifulsoup4/trunk/debian/control	2012-02-15 17:59:07 UTC (rev 20465)
@@ -22,7 +22,7 @@
 Package: python-bs4
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
-Recommends: python-chardet, python-html5lib | python-lxml
+Recommends: python-chardet, python-lxml | python-html5lib
 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,

Modified: packages/beautifulsoup4/trunk/debian/patches/unittest2
===================================================================
--- packages/beautifulsoup4/trunk/debian/patches/unittest2	2012-02-15 10:55:01 UTC (rev 20464)
+++ packages/beautifulsoup4/trunk/debian/patches/unittest2	2012-02-15 17:59:07 UTC (rev 20465)
@@ -68,6 +68,6 @@
 +    import unittest2 as unittest
 +except ImportError:
 +    import unittest
+ from bs4 import BeautifulSoup
  from bs4.element import SoupStrainer
  from bs4.dammit import EntitySubstitution, UnicodeDammit
- from bs4.testing import SoupTest