[Python-modules-commits] r15836 - in packages/python-tornado/trunk/debian (3 files)

[chaica-guest at users.alioth.debian.org]

    Date: Monday, February 21, 2011 @ 22:18:59
  Author: chaica-guest
Revision: 15836

  * New upstream release.
  * Added debian/examples
  * debian/copyright
    - Added copyrights and license for some files under website/ directory.
    - some files no more in the upstream sources
  * debian/control
    - Removed python-support
    - Replaced XS-Python-Version by X-Python-Version
    - Added Breaks: ${python:Breaks}
    - Added Recommends: python (>= 2.6) | python-multiprocessing
  * debian/rules
    - Replaced dh $@ by dh $@ --with python2
  * debian/watch
    - fixed the path

Modified:
  packages/python-tornado/trunk/debian/changelog
  packages/python-tornado/trunk/debian/control
  packages/python-tornado/trunk/debian/copyright

Modified: packages/python-tornado/trunk/debian/changelog
===================================================================
--- packages/python-tornado/trunk/debian/changelog	2011-02-21 21:18:54 UTC (rev 15835)
+++ packages/python-tornado/trunk/debian/changelog	2011-02-21 22:18:59 UTC (rev 15836)
@@ -1,19 +1,21 @@
-python-tornado (1.1.1-1) unstable; urgency=low
+python-tornado (1.2.0-1) unstable; urgency=low
 
   * New upstream release.
   * Added debian/examples
+  * debian/copyright
+    - Added copyrights and license for some files under website/ directory.
+    - some files no more in the upstream sources
   * debian/control
     - Removed python-support
     - Replaced XS-Python-Version by X-Python-Version
     - Added Breaks: ${python:Breaks}
+    - Added Recommends: python (>= 2.6) | python-multiprocessing
   * debian/rules
     - Replaced dh $@ by dh $@ --with python2
   * debian/watch
     - fixed the path
-  * debian/copyright
-    - some files no more in the upstream sources
 
- -- Carl Chenet <chaica at ohmytux.com>  Fri, 18 Feb 2011 04:02:54 +0100
+ -- Carl Chenet <chaica at ohmytux.com>  Tue, 22 Feb 2011 00:14:18 +0100
 
 python-tornado (1.0.1-1) unstable; urgency=low
 

Modified: packages/python-tornado/trunk/debian/control
===================================================================
--- packages/python-tornado/trunk/debian/control	2011-02-21 21:18:54 UTC (rev 15835)
+++ packages/python-tornado/trunk/debian/control	2011-02-21 22:18:59 UTC (rev 15836)
@@ -13,7 +13,7 @@
 Package: python-tornado
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python-pycurl, python (>= 2.6) | python-simplejson
-Recommends: python-mysqldb
+Recommends: python-mysqldb, python (>= 2.6) | python-multiprocessing
 Breaks: ${python:Breaks}
 Description: scalable, non-blocking web server and tools
  Tornado is an open source version of the scalable, non-blocking

Modified: packages/python-tornado/trunk/debian/copyright
===================================================================
--- packages/python-tornado/trunk/debian/copyright	2011-02-21 21:18:54 UTC (rev 15835)
+++ packages/python-tornado/trunk/debian/copyright	2011-02-21 22:18:59 UTC (rev 15836)
@@ -24,18 +24,26 @@
     /usr/share/common-licenses/Apache-2.0 .
 
 The following files :
-demos/chat/static/chat.js
-demos/chat/static/chat.css
-demos/blog/schema.sql
+    demos/chat/static/chat.js
+    demos/chat/static/chat.css
+    demos/blog/schema.sql
 are:
 
     Copyright © 2009 FriendFeed
 
 and are under the Apache-2.0 license described above.
 
+The following file:
+    website/website.py
+is:
+
+    Copyright 2009 Bret Taylor
+
+and is under the Apache-2.0 license described above.
+
 The following files:
-demos/appengine/markdown.py
-demos/blog/markdown.py
+    demos/appengine/markdown.py
+    demos/blog/markdown.py
 are:
 
     Copyright © 2007-2008 ActiveState Corp.
@@ -43,6 +51,58 @@
 and are under the MIT license available at
 http://www.opensource.org/licenses/mit-license.php
 
+The following file:
+    website/markdown/__init__.py
+is:
+
+    Started by [Manfred Stienstra](http://www.dwerg.net/).  Continued and
+    maintained  by [Yuri Takhteyev](http://www.freewisdom.org), [Waylan
+    Limberg](http://achinghead.com/) and [Artem Yunusov](http://blog.splyer.com).
+
+    Contact: markdown at freewisdom.org
+
+    Copyright 2007, 2008 The Python Markdown Project (v. 1.7 and later)
+    Copyright 200? Django Software Foundation (OrderedDict implementation)
+    Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b)
+    Copyright 2004 Manfred Stienstra (the original version)
+
+and is under the BSD license:
+
+    Copyright (c) The Regents of the University of California.
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. 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.
+    3. Neither the name of the University 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 REGENTS 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 REGENTS 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.
+
+The following file:
+    website/markdown/html4.py
+is:
+
+    Copyright (c) 1999-2007 by Fredrik Lundh
+
+and is under the BSD license described above.
+
 Debian packaging is:
 
     Copyright © 2010 Carl Chenet <chaica at ohmytux.com>