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

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

    Date: Friday, February 25, 2011 @ 01:11:46
  Author: chaica-guest
Revision: 15869

  * Added patch to ignore ca-certificates.crt from sources
  * Added debian/links for ca-certificates.crt
  * debian/copyright
    - Added copyrights and license for some files
  * debian/control
    - Added Depends: ca-certificates

Added:
  packages/python-tornado/trunk/debian/links
  packages/python-tornado/trunk/debian/patches/
  packages/python-tornado/trunk/debian/patches/ignore-ca-certificates.patch
  packages/python-tornado/trunk/debian/patches/series
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-24 23:09:24 UTC (rev 15868)
+++ packages/python-tornado/trunk/debian/changelog	2011-02-25 01:11:46 UTC (rev 15869)
@@ -2,20 +2,23 @@
 
   * New upstream release.
   * Added debian/examples
+  * Added patch to ignore ca-certificates.crt from sources
+  * Added debian/links for ca-certificates.crt
   * debian/copyright
-    - Added copyrights and license for some files under website/ directory.
+    - Added copyrights and license for some files
     - 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
+    - Added Depends: ca-certificates
   * debian/rules
     - Replaced dh $@ by dh $@ --with python2
   * debian/watch
     - fixed the path
 
- -- Carl Chenet <chaica at ohmytux.com>  Tue, 22 Feb 2011 00:14:18 +0100
+ -- Carl Chenet <chaica at ohmytux.com>  Fri, 25 Feb 2011 03:08:07 +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-24 23:09:24 UTC (rev 15868)
+++ packages/python-tornado/trunk/debian/control	2011-02-25 01:11:46 UTC (rev 15869)
@@ -12,7 +12,7 @@
 
 Package: python-tornado
 Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python-pycurl, python (>= 2.6) | python-simplejson
+Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python-pycurl, python (>= 2.6) | python-simplejson, ca-certificates
 Recommends: python-mysqldb, python (>= 2.6) | python-multiprocessing
 Breaks: ${python:Breaks}
 Description: scalable, non-blocking web server and tools

Modified: packages/python-tornado/trunk/debian/copyright
===================================================================
--- packages/python-tornado/trunk/debian/copyright	2011-02-24 23:09:24 UTC (rev 15868)
+++ packages/python-tornado/trunk/debian/copyright	2011-02-25 01:11:46 UTC (rev 15869)
@@ -103,6 +103,42 @@
 
 and is under the BSD license described above.
 
+
+The following file:
+    tornado/ca-certificates.crt
+is under the following copyright and licenses:
+
+    The contents of this file are subject to the Mozilla Public
+    License Version 1.1 (the "License"); you may not use this file
+    except in compliance with the License. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
+
+    Software distributed under the License is distributed on an "AS
+    IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+    implied. See the License for the specific language governing
+    rights and limitations under the License.
+
+    The Original Code is the Netscape security libraries.
+
+    The Initial Developer of the Original Code is Netscape
+    Communications Corporation.  Portions created by Netscape are 
+    Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+    Rights Reserved.
+
+    Contributor(s):
+
+    Alternatively, the contents of this file may be used under the
+    terms of the GNU General Public License Version 2 or later (the
+    "GPL"), in which case the provisions of the GPL are applicable 
+    instead of those above.  If you wish to allow use of your 
+    version of this file only under the terms of the GPL and not to
+    allow others to use your version of this file under the MPL,
+    indicate your decision by deleting the provisions above and
+    replace them with the notice and other provisions required by
+    the GPL.  If you do not delete the provisions above, a recipient
+    may use your version of this file under either the MPL or the
+    GPL.
+
 Debian packaging is:
 
     Copyright © 2010 Carl Chenet <chaica at ohmytux.com>

Added: packages/python-tornado/trunk/debian/links
===================================================================
--- packages/python-tornado/trunk/debian/links	                        (rev 0)
+++ packages/python-tornado/trunk/debian/links	2011-02-25 01:11:46 UTC (rev 15869)
@@ -0,0 +1 @@
+/etc/ssl/certs/ca-certificates.crt /usr/share/pyshared/tornado/ca-certificates.crt

Added: packages/python-tornado/trunk/debian/patches/ignore-ca-certificates.patch
===================================================================
--- packages/python-tornado/trunk/debian/patches/ignore-ca-certificates.patch	                        (rev 0)
+++ packages/python-tornado/trunk/debian/patches/ignore-ca-certificates.patch	2011-02-25 01:11:46 UTC (rev 15869)
@@ -0,0 +1,16 @@
+Description: Remove the ca-certificate file from being added to the package
+Author: Carl Chenet <chaica at ohmytux.com>
+
+Index: facebook-tornado-778ed51/setup.py
+===================================================================
+--- facebook-tornado-778ed51.orig/setup.py	2011-02-25 02:42:28.000000000 +0100
++++ facebook-tornado-778ed51/setup.py	2011-02-25 02:42:50.000000000 +0100
+@@ -44,7 +44,7 @@
+     version=version,
+     packages = ["tornado", "tornado.test"],
+     package_data = {
+-        "tornado": ["ca-certificates.crt"],
++#        "tornado": ["ca-certificates.crt"],
+         "tornado.test": ["README", "test.crt", "test.key"],
+         },
+     ext_modules = extensions,

Added: packages/python-tornado/trunk/debian/patches/series
===================================================================
--- packages/python-tornado/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-tornado/trunk/debian/patches/series	2011-02-25 01:11:46 UTC (rev 15869)
@@ -0,0 +1 @@
+ignore-ca-certificates.patch