[Python-modules-commits] r10552 - in packages/python-scrapy/trunk/debian (9 files)

Sat Nov 21 15:25:49 UTC 2009

Date: Saturday, November 21, 2009 @ 15:25:49
  Author: ghantoos-guest
Revision: 10552

* Converted the package to "3.0 (quilt)" format.
* debian/control:
  - Changed Build dependency from python-all-dev to python.
  - Added dependency on python-beautifulsoup and python-clientform.
  - Added Recommends field listing listing all the non absolute dependencies.
  - Moved python-simplejson dependency from Suggests to Recommends.
* debian/copyright:
  - Removed the copyright mention of BeautifulSoup and ClientForm as they
    are now dependencies, hence not installed by the python-scrapy package.
* debian/rules:
  - Now excludes BeautifulSoup.py and ClientForm.py.
* debian/patches:
  - 01_external_modules.diff: Updated imports of BeautifulSoup and ClientForm
    to point to the main Python modules.
* debian/source/format:
  - New file set to "3.0 (quilt)".

Added:
  packages/python-scrapy/trunk/debian/patches/
  packages/python-scrapy/trunk/debian/patches/01_external_modules.diff
  packages/python-scrapy/trunk/debian/patches/series
  packages/python-scrapy/trunk/debian/source/
  packages/python-scrapy/trunk/debian/source/format
Modified:
  packages/python-scrapy/trunk/debian/changelog
  packages/python-scrapy/trunk/debian/control
  packages/python-scrapy/trunk/debian/copyright
  packages/python-scrapy/trunk/debian/rules

Modified: packages/python-scrapy/trunk/debian/changelog
===================================================================

--- packages/python-scrapy/trunk/debian/changelog	2009-11-21 14:50:48 UTC (rev 10551)
+++ packages/python-scrapy/trunk/debian/changelog	2009-11-21 15:25:49 UTC (rev 10552)
@@ -1,3 +1,24 @@
+python-scrapy (0.7-2) unstable; urgency=low
+
+  * Converted the package to "3.0 (quilt)" format.
+  * debian/control:
+    - Changed Build dependency from python-all-dev to python.
+    - Added dependency on python-beautifulsoup and python-clientform.
+    - Added Recommends field listing listing all the non absolute dependencies.
+    - Moved python-simplejson dependency from Suggests to Recommends.
+  * debian/copyright:
+    - Removed the copyright mention of BeautifulSoup and ClientForm as they
+      are now dependencies, hence not installed by the python-scrapy package.
+  * debian/rules:
+    - Now excludes BeautifulSoup.py and ClientForm.py.
+  * debian/patches:
+    - 01_external_modules.diff: Updated imports of BeautifulSoup and ClientForm
+      to point to the main Python modules.
+  * debian/source/format:
+    - New file set to "3.0 (quilt)".
+
+ -- Ignace Mouzannar <mouzannar at gmail.com>  Sat, 21 Nov 2009 15:05:09 +0100
+
 python-scrapy (0.7-1) unstable; urgency=low
 
   * Initial release. (Closes: #551038)
@@ -2,2 +23,2 @@
 
- -- Ignace Mouzannar <mouzannar at gmail.com>  Mon, 09 Nov 2009 16:08:45 +0100
+ -- Ignace Mouzannar <mouzannar at gmail.com>  Thu, 19 Nov 2009 23:25:57 +0100

Modified: packages/python-scrapy/trunk/debian/control
===================================================================
--- packages/python-scrapy/trunk/debian/control	2009-11-21 14:50:48 UTC (rev 10551)
+++ packages/python-scrapy/trunk/debian/control	2009-11-21 15:25:49 UTC (rev 10552)
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Ignace Mouzannar <mouzannar at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), python-jinja
-Build-Depends-Indep: python-support, python-all-dev, python-sphinx, libjs-jquery, python-twisted
+Build-Depends-Indep: python-support, python, python-sphinx, libjs-jquery, python-twisted
 Standards-Version: 3.8.3
 Homepage: http://scrapy.org/
 Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/python-scrapy/trunk/
@@ -12,9 +12,10 @@
 
 Package: python-scrapy
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-twisted, python-libxml2
+Depends: ${misc:Depends}, ${python:Depends}, python-twisted, python-libxml2, python-beautifulsoup, python-clientform
+Recommends: python (>= 2.6) | python-simplejson, python-lxml, python-guppy, python-boto, python-django, ipython, python-pygments, python-imaging, python-mysqldb
 Provides: ${python:Provides}
-Suggests: python-openssl, python-simplejson 
+Suggests: python-openssl
 Description: Python web scraping and crawling framework
  Scrapy is a fast high-level screen scraping and web crawling framework, 
  used to crawl websites and extract structured data from their pages. 

Modified: packages/python-scrapy/trunk/debian/copyright
===================================================================
--- packages/python-scrapy/trunk/debian/copyright	2009-11-21 14:50:48 UTC (rev 10551)
+++ packages/python-scrapy/trunk/debian/copyright	2009-11-21 15:25:49 UTC (rev 10552)
@@ -20,19 +20,6 @@
     Johan Dahlin <johan at gnome.org>
 License: MIT
 
-File: scrapy/xlib/BeautifulSoup.py 
-Copyright:
-    2004-2008, Leonard Richardson <leonardr at segfault.org>
-License: BSD
-
-File: scrapy/xlib/ClientForm.py
-Copyright:
-    2002-2007, John J. Lee <jjl at pobox.com>
-         2005, Gary Poster
-         2005, Zope Corporation
-    1998-2000, Gisle Aas
-Licence: BSD
-
 Files: scrapy/xlib/pydispatch/*
 Copyright:
     2001-2006, Patrick K. O'Brien <pydispatcher-devel at lists.sourceforge.net>

Added: packages/python-scrapy/trunk/debian/patches/01_external_modules.diff
===================================================================
--- packages/python-scrapy/trunk/debian/patches/01_external_modules.diff	                        (rev 0)
+++ packages/python-scrapy/trunk/debian/patches/01_external_modules.diff	2009-11-21 15:25:49 UTC (rev 10552)
@@ -0,0 +1,60 @@
+Description:
+ - Updated imports of BeautifulSoup and ClientForm to point to the main
+   Python modules.
+Author: Ignace Mouzannar <mouzannar at gmail.com>
+Last-Update: 2009-11-20
+
+--- a/scrapy/http/response/text.py
++++ b/scrapy/http/response/text.py
+@@ -7,7 +7,7 @@
+ 
+ import re
+ 
+-from scrapy.xlib.BeautifulSoup import UnicodeDammit
++from BeautifulSoup import UnicodeDammit
+ 
+ from scrapy.http.response import Response
+ from scrapy.utils.python import memoizemethod_noargs
+--- a/scrapy/tests/test_utils_response.py
++++ b/scrapy/tests/test_utils_response.py
+@@ -1,6 +1,6 @@
+ import unittest
+ 
+-from scrapy.xlib.BeautifulSoup import BeautifulSoup
++from BeautifulSoup import BeautifulSoup
+ from scrapy.http import Response, TextResponse
+ from scrapy.utils.response import body_or_str, get_base_url, get_meta_refresh, \
+     response_httprepr, get_cached_beautifulsoup
+--- a/scrapy/utils/response.py
++++ b/scrapy/utils/response.py
+@@ -13,7 +13,7 @@
+ from twisted.web import http
+ from twisted.web.http import RESPONSES
+ 
+-from scrapy.xlib.BeautifulSoup import BeautifulSoup
++from BeautifulSoup import BeautifulSoup
+ from scrapy.http import Response, HtmlResponse
+ 
+ def body_or_str(obj, unicode=True):
+--- a/scrapy/xlib/ClientForm.py
++++ b/scrapy/xlib/ClientForm.py
+@@ -919,7 +919,7 @@
+ try:
+     if sys.version_info[:2] < (2, 2):
+         raise ImportError  # BeautifulSoup uses generators
+-    from scrapy.xlib import BeautifulSoup
++    import BeautifulSoup
+ except ImportError:
+     pass
+ else:
+--- a/scrapy/http/request/form.py
++++ b/scrapy/http/request/form.py
+@@ -8,7 +8,7 @@
+ import urllib
+ from cStringIO import StringIO
+ 
+-from scrapy.xlib.ClientForm import ParseFile
++from ClientForm import ParseFile
+ 
+ from scrapy.http.request import Request
+ from scrapy.utils.python import unicode_to_str

Added: packages/python-scrapy/trunk/debian/patches/series
===================================================================
--- packages/python-scrapy/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-scrapy/trunk/debian/patches/series	2009-11-21 15:25:49 UTC (rev 10552)
@@ -0,0 +1 @@
+01_external_modules.diff

Modified: packages/python-scrapy/trunk/debian/rules
===================================================================
--- packages/python-scrapy/trunk/debian/rules	2009-11-21 14:50:48 UTC (rev 10551)
+++ packages/python-scrapy/trunk/debian/rules	2009-11-21 15:25:49 UTC (rev 10552)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-export DH_ALWAYS_EXCLUDE=license.txt:_sources/:.buildinfo
+export DH_ALWAYS_EXCLUDE=license.txt:_sources/:.buildinfo:BeautifulSoup.py:ClientForm.py
 
 %:
 	dh $@

Added: packages/python-scrapy/trunk/debian/source/format
===================================================================
--- packages/python-scrapy/trunk/debian/source/format	                        (rev 0)
+++ packages/python-scrapy/trunk/debian/source/format	2009-11-21 15:25:49 UTC (rev 10552)
@@ -0,0 +1 @@
+3.0 (quilt)


