From abcac4fcbda3a9e913857a046900fe3d50d4a44e Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Wed, 2 May 2012 03:25:35 -0300 Subject: [PATCH] updated maintainer to scrapinghub --- AUTHORS | 3 ++- debian/changelog | 2 +- debian/control | 2 +- debian/copyright | 6 +++--- docs/conf.py | 4 ++-- docs/topics/ubuntu.rst | 4 ++-- extras/makedeb.py | 11 +++++++---- 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/AUTHORS b/AUTHORS index 24b20a17ddb..7893de449ad 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,7 +1,8 @@ Scrapy was brought to life by Shane Evans while hacking a scraping framework prototype for Mydeco (mydeco.com). It soon became maintained, extended and improved by Insophia (insophia.com), with the initial sponsorship of Mydeco to -bootstrap the project. +bootstrap the project. In mid-2011, Scrapinghub became the new official +maintainer. Here is the list of the primary authors & contributors: diff --git a/debian/changelog b/debian/changelog index a9c54e63c68..f4f5b9d9c40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,4 +2,4 @@ scrapy-SUFFIX (0.11) unstable; urgency=low * Initial release. - -- Insophia Team Thu, 10 Jun 2010 17:24:02 -0300 + -- Scrapinghub Team Thu, 10 Jun 2010 17:24:02 -0300 diff --git a/debian/control b/debian/control index 7cd4013c691..d94b2933121 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: scrapy-SUFFIX Section: python Priority: optional -Maintainer: Insophia Team +Maintainer: Scrapinghub Team Build-Depends: debhelper (>= 7.0.50), python (>=2.6), python-twisted, python-w3lib, python-lxml Standards-Version: 3.8.4 Homepage: http://scrapy.org/ diff --git a/debian/copyright b/debian/copyright index 71d3765e63b..cb28bc02312 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,10 +1,10 @@ -This package was debianized by the Insophia . +This package was debianized by the Scrapinghub team . It was downloaded from http://scrapy.org Upstream Author: Scrapy Developers -Copyright: 2007-2010 Scrapy Developers +Copyright: 2007-2012 Scrapy Developers License: bsd @@ -36,5 +36,5 @@ 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. -The Debian packaging is (C) 2010, Insophia and +The Debian packaging is (C) 2010-2012, Scrapinghub and is licensed under the BSD, see `/usr/share/common-licenses/BSD'. diff --git a/docs/conf.py b/docs/conf.py index 90823c0c2c8..df567c57dd8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -42,7 +42,7 @@ # General information about the project. project = u'Scrapy' -copyright = u'2008-2011, Insophia' +copyright = u'2008-2012, Scrapinghub' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -173,7 +173,7 @@ # (source start file, target name, title, author, document class [howto/manual]). latex_documents = [ ('index', 'Scrapy.tex', ur'Scrapy Documentation', - ur'Insophia', 'manual'), + ur'Scrapinghub', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of diff --git a/docs/topics/ubuntu.rst b/docs/topics/ubuntu.rst index d530102b79c..5c8c0e9741f 100644 --- a/docs/topics/ubuntu.rst +++ b/docs/topics/ubuntu.rst @@ -6,7 +6,7 @@ Ubuntu packages .. versionadded:: 0.10 -`Insophia`_ publishes apt-gettable packages which are generally fresher than +`Scrapinghub`_ publishes apt-gettable packages which are generally fresher than those in Ubuntu, and more stable too since they're continuously built from `Github repo`_ (master & stable branches) and so they contain the latest bug fixes. @@ -54,5 +54,5 @@ keyring as follows:: curl -s http://archive.scrapy.org/ubuntu/archive.key | sudo apt-key add - -.. _Insophia: http://insophia.com/ +.. _Scrapinghub: http://scrapinghub.com/ .. _Github repo: https://github.com/scrapy/scrapy diff --git a/extras/makedeb.py b/extras/makedeb.py index 70b13671f89..08a02645f41 100644 --- a/extras/makedeb.py +++ b/extras/makedeb.py @@ -1,4 +1,4 @@ -import sys, os, glob +import sys, os, glob, shutil from subprocess import check_call def build(suffix): @@ -21,9 +21,12 @@ def build(suffix): check_call('debuild -us -uc -b', shell=True) def clean(suffix): - for f in glob.glob("debian/scrapy-%s.*" % suffix) + \ - glob.glob("debian/scrapyd-%s.*" % suffix): - os.remove(f) + for f in glob.glob("debian/python-scrapy%s*" % suffix) + \ + glob.glob("debian/scrapyd%s*" % suffix): + if os.path.isdir(f): + shutil.rmtree(f) + else: + os.remove(f) def main(): cmd = sys.argv[1]