[Python-modules-commits] r15631 - in packages/beautifulsoup/trunk (14 files)
stefanor at users.alioth.debian.org
stefanor at users.alioth.debian.org
Sun Feb 13 20:33:32 UTC 2011
Date: Sunday, February 13, 2011 @ 20:33:21
Author: stefanor
Revision: 15631
* Adopting beatifulsoup for Debian Python Modules Team. (Closes: #612875)
* Bump standards version to 3.9.1. Moved into python section.
* Switch to Source Format 3.0 (quilt).
* Switch to dh_python2.
- Use X-Python-Version.
* debian/control:
- Drop -XB-Python-Version. Deprecated.
- Drop Provides, Replaces, Conflicts. Versioned package names for Python
modules are deprecated. No supported releases have packages requiring
them.
- Add Homepage.
- Add VCS- URLs.
- Recommend python-chardet.
* Bump debhelper dependency and compat level to 8.
- Since 7.0.2, CHANGELOG will be installed as upstream Changelog.
(Closes: #530408)
* Use DEP5 format debian/copyright.
* Add watch file. (Closes: #607864)
* Don't install tests as an example.
* debian/rules:
- Use minimal dh 7 style.
- Run test suite during build.
Added:
packages/beautifulsoup/trunk/debian/patches/
packages/beautifulsoup/trunk/debian/patches/series
packages/beautifulsoup/trunk/debian/patches/unwanted-scripts
packages/beautifulsoup/trunk/debian/source/
packages/beautifulsoup/trunk/debian/source/format
packages/beautifulsoup/trunk/debian/watch
Modified:
packages/beautifulsoup/trunk/debian/changelog
packages/beautifulsoup/trunk/debian/compat
packages/beautifulsoup/trunk/debian/control
packages/beautifulsoup/trunk/debian/copyright
packages/beautifulsoup/trunk/debian/rules
Deleted:
packages/beautifulsoup/trunk/debian/python-beautifulsoup.dirs
packages/beautifulsoup/trunk/debian/pyversions
packages/beautifulsoup/trunk/setup.py
Modified: packages/beautifulsoup/trunk/debian/changelog
===================================================================
--- packages/beautifulsoup/trunk/debian/changelog 2011-02-13 20:08:14 UTC (rev 15630)
+++ packages/beautifulsoup/trunk/debian/changelog 2011-02-13 20:33:21 UTC (rev 15631)
@@ -1,3 +1,30 @@
+beautifulsoup (3.1.0.1-3) UNRELEASED; urgency=low
+
+ * Adopting beatifulsoup for Debian Python Modules Team. (Closes: #612875)
+ * Bump standards version to 3.9.1. Moved into python section.
+ * Switch to Source Format 3.0 (quilt).
+ * Switch to dh_python2.
+ - Use X-Python-Version.
+ * debian/control:
+ - Drop -XB-Python-Version. Deprecated.
+ - Drop Provides, Replaces, Conflicts. Versioned package names for Python
+ modules are deprecated. No supported releases have packages requiring
+ them.
+ - Add Homepage.
+ - Add VCS- URLs.
+ - Recommend python-chardet.
+ * Bump debhelper dependency and compat level to 8.
+ - Since 7.0.2, CHANGELOG will be installed as upstream Changelog.
+ (Closes: #530408)
+ * Use DEP5 format debian/copyright.
+ * Add watch file. (Closes: #607864)
+ * Don't install tests as an example.
+ * debian/rules:
+ - Use minimal dh 7 style.
+ - Run test suite during build.
+
+ -- Stefano Rivera <stefanor at debian.org> Sun, 13 Feb 2011 17:04:39 +0200
+
beautifulsoup (3.1.0.1-2) unstable; urgency=low
* Disable installation of test scripts (Closes: #528430)
Modified: packages/beautifulsoup/trunk/debian/compat
===================================================================
--- packages/beautifulsoup/trunk/debian/compat 2011-02-13 20:08:14 UTC (rev 15630)
+++ packages/beautifulsoup/trunk/debian/compat 2011-02-13 20:33:21 UTC (rev 15631)
@@ -1 +1 @@
-4
+8
Modified: packages/beautifulsoup/trunk/debian/control
===================================================================
--- packages/beautifulsoup/trunk/debian/control 2011-02-13 20:08:14 UTC (rev 15630)
+++ packages/beautifulsoup/trunk/debian/control 2011-02-13 20:33:21 UTC (rev 15631)
@@ -1,18 +1,20 @@
Source: beautifulsoup
-Section: web
+Section: python
Priority: optional
-Maintainer: Decklin Foster <decklin at red-bean.com>
-Build-Depends: debhelper (>= 5.0.37.1), python, python-dev
-Build-Depends-Indep: python-support (>= 0.5.3)
-Standards-Version: 3.7.2
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Stefano Rivera <stefanor at debian.org>
+Build-Depends: debhelper (>= 8), python-all (>= 2.6.5-13~)
+X-Python-Version: >= 2.2
+Standards-Version: 3.9.1
+Homepage: http://www.crummy.com/software/BeautifulSoup
+Vcs-Svn: svn://svn.debian.org/python-modules/packages/beautifulsoup/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/beautifulsoup/trunk/
Package: python-beautifulsoup
Architecture: all
-XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}
-Provides: ${python:Provides}
-Replaces: python2.3-beautifulsoup (<< 3.0.1-2), python2.4-beautifulsoup (<< 3.0.1-2)
-Conflicts: python2.3-beautifulsoup (<< 3.0.1-2), python2.4-beautifulsoup (<< 3.0.1-2)
+Depends: ${misc:Depends}, ${python:Depends}
+Recommends: python-chardet
+Breaks: ${python:Breaks}
Description: error-tolerant HTML parser for Python
The BeautifulSoup class turns arbitrarily bad HTML into a tree-like nested
tag-soup list of Tag objects and text snippets. A Tag object corresponds to
Modified: packages/beautifulsoup/trunk/debian/copyright
===================================================================
--- packages/beautifulsoup/trunk/debian/copyright 2011-02-13 20:08:14 UTC (rev 15630)
+++ packages/beautifulsoup/trunk/debian/copyright 2011-02-13 20:33:21 UTC (rev 15631)
@@ -1,38 +1,37 @@
-This package was debianized by Decklin Foster <decklin at red-bean.com> on
-Thu, 10 Feb 2005 13:59:28 -0500
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Upstream-Name: Beautiful Soup
+Upstream-Contact: Leonard Richardson <leonardr at segfault.org>
+Source: http://www.crummy.com/software/BeautifulSoup/download/3.x/
-It was downloaded from http://www.crummy.com/software/BeautifulSoup/
+Files: *
+Copyright: 2004-2009, Leonard Richardson
+License: bsdish
-Upstream Author: Leonard Richardson <leonardr at segfault>
-Copyright (c) 2004-2007, Leonard Richardson
+Files: debian/*
+Copyright:
+ 2005-2009, Decklin Foster <decklin at red-bean.com>
+ 2011, Stefano Rivera <stefanor at debian.org>
+License: bsdish
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
- * Neither the name of the the Beautiful Soup Consortium and All
- Night Kosher Bakery nor the names of its contributors may be
- used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE, DAMMIT.
+License: bsdish
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of the the Beautiful Soup Consortium and All Night Kosher
+ Bakery nor the names of its contributors may be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE, DAMMIT.
Added: packages/beautifulsoup/trunk/debian/patches/series
===================================================================
--- packages/beautifulsoup/trunk/debian/patches/series (rev 0)
+++ packages/beautifulsoup/trunk/debian/patches/series 2011-02-13 20:33:21 UTC (rev 15631)
@@ -0,0 +1 @@
+unwanted-scripts
Added: packages/beautifulsoup/trunk/debian/patches/unwanted-scripts
===================================================================
--- packages/beautifulsoup/trunk/debian/patches/unwanted-scripts (rev 0)
+++ packages/beautifulsoup/trunk/debian/patches/unwanted-scripts 2011-02-13 20:33:21 UTC (rev 15631)
@@ -0,0 +1,16 @@
+Description: Upstream setup.py has unwanted scripts. Fixed upstream.
+Author: Decklin Foster <decklin at red-bean.com>
+Bug-Debian: http://bugs.debian.org/528430
+Forwarded: no
+Last-Update: 2011-02-13
+--- a/setup.py
++++ b/setup.py
+@@ -37,7 +37,7 @@
+ setup(name="BeautifulSoup",
+ version=__version__,
+ py_modules=['BeautifulSoup', 'BeautifulSoupTests'],
+- scripts=['testall.sh', 'to3.sh',
++ scripts=[#'testall.sh', 'to3.sh',
+ ## Whatever, I'll fix this later.
+ #'README', 'CHANGELOG',
+ # 'BeautifulSoup.py.3.diff', 'BeautifulSoupTests.py.3.diff'],
Deleted: packages/beautifulsoup/trunk/debian/python-beautifulsoup.dirs
===================================================================
--- packages/beautifulsoup/trunk/debian/python-beautifulsoup.dirs 2011-02-13 20:08:14 UTC (rev 15630)
+++ packages/beautifulsoup/trunk/debian/python-beautifulsoup.dirs 2011-02-13 20:33:21 UTC (rev 15631)
@@ -1 +0,0 @@
-usr/share/python-support/beautifulsoup
Deleted: packages/beautifulsoup/trunk/debian/pyversions
===================================================================
--- packages/beautifulsoup/trunk/debian/pyversions 2011-02-13 20:08:14 UTC (rev 15630)
+++ packages/beautifulsoup/trunk/debian/pyversions 2011-02-13 20:33:21 UTC (rev 15631)
@@ -1 +0,0 @@
-2.2-
Modified: packages/beautifulsoup/trunk/debian/rules
===================================================================
--- packages/beautifulsoup/trunk/debian/rules 2011-02-13 20:08:14 UTC (rev 15630)
+++ packages/beautifulsoup/trunk/debian/rules 2011-02-13 20:33:21 UTC (rev 15631)
@@ -3,42 +3,13 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-clean:
- dh_testdir
- dh_testroot
+%:
+ dh $@ --with python2
- python setup.py clean --all
- # setup.py imports these. see http://python.org/sf/602345
- rm BeautifulSoup.pyc BeautifulSoupTests.pyc
-
- dh_clean
-
-build:
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- python setup.py install --no-compile --prefix $(CURDIR)/debian/python-beautifulsoup/usr --install-lib $(CURDIR)/debian/python-beautifulsoup/usr/share/python-support/beautifulsoup
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_compress
- dh_fixperms
- dh_pysupport
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ set -e; \
+ for python in $(shell pyversions -r); do \
+ $$python BeautifulSoupTests.py; \
+ done
+endif
Added: packages/beautifulsoup/trunk/debian/source/format
===================================================================
--- packages/beautifulsoup/trunk/debian/source/format (rev 0)
+++ packages/beautifulsoup/trunk/debian/source/format 2011-02-13 20:33:21 UTC (rev 15631)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: packages/beautifulsoup/trunk/debian/watch
===================================================================
--- packages/beautifulsoup/trunk/debian/watch (rev 0)
+++ packages/beautifulsoup/trunk/debian/watch 2011-02-13 20:33:21 UTC (rev 15631)
@@ -0,0 +1,2 @@
+version=3
+https://launchpad.net/beautifulsoup/+download .*/BeautifulSoup-(.+)\.tar\.gz
Deleted: packages/beautifulsoup/trunk/setup.py
===================================================================
--- packages/beautifulsoup/trunk/setup.py 2011-02-13 20:08:14 UTC (rev 15630)
+++ packages/beautifulsoup/trunk/setup.py 2011-02-13 20:33:21 UTC (rev 15631)
@@ -1,65 +0,0 @@
-from distutils.core import setup
-import unittest
-import warnings
-warnings.filterwarnings("ignore", "Unknown distribution option")
-
-import sys
-# patch distutils if it can't cope with the "classifiers" keyword
-if sys.version < '2.2.3':
- from distutils.dist import DistributionMetadata
- DistributionMetadata.classifiers = None
- DistributionMetadata.download_url = None
-
-from BeautifulSoup import __version__
-
-#Make sure all the tests complete.
-import BeautifulSoupTests
-loader = unittest.TestLoader()
-result = unittest.TestResult()
-suite = loader.loadTestsFromModule(BeautifulSoupTests)
-suite.run(result)
-if not result.wasSuccessful():
- print "Unit tests have failed!"
- for l in result.errors, result.failures:
- for case, error in l:
- print "-" * 80
- desc = case.shortDescription()
- if desc:
- print desc
- print error
- print '''If you see an error like: "'ascii' codec can't encode character...", see\nthe Beautiful Soup documentation:\n http://www.crummy.com/software/BeautifulSoup/documentation.html#Why%20can't%20Beautiful%20Soup%20print%20out%20the%20non-ASCII%20characters%20I%20gave%20it?'''
- print "This might or might not be a problem depending on what you plan to do with\nBeautiful Soup."
- if sys.argv[1] == 'sdist':
- print
- print "I'm not going to make a source distribution since the tests don't pass."
- sys.exit(1)
-
-setup(name="BeautifulSoup",
- version=__version__,
- py_modules=['BeautifulSoup', 'BeautifulSoupTests'],
- scripts=[ #'testall.sh', 'to3.sh',
- ## Whatever, I'll fix this later.
- #'README', 'CHANGELOG',
- # 'BeautifulSoup.py.3.diff', 'BeautifulSoupTests.py.3.diff'],
- ],
- description="HTML/XML parser for quick-turnaround applications like screen-scraping.",
- author="Leonard Richardson",
- author_email = "leonardr at segfault.org",
- long_description="""Beautiful Soup parses arbitrarily invalid SGML and provides a variety of methods and Pythonic idioms for iterating and searching the parse tree.""",
- classifiers=["Development Status :: 5 - Production/Stable",
- "Intended Audience :: Developers",
- "License :: OSI Approved :: Python Software Foundation License",
- "Programming Language :: Python",
- "Topic :: Text Processing :: Markup :: HTML",
- "Topic :: Text Processing :: Markup :: XML",
- "Topic :: Text Processing :: Markup :: SGML",
- "Topic :: Software Development :: Libraries :: Python Modules",
- ],
- url="http://www.crummy.com/software/BeautifulSoup/",
- license="BSD",
- download_url="http://www.crummy.com/software/BeautifulSoup/download/"
- )
-
- # Send announce to:
- # python-announce at python.org
- # python-list at python.org
More information about the Python-modules-commits
mailing list