[Python-modules-commits] r33207 - in packages/foolscap/trunk/debian (4 files)

Thu Jul 2 21:24:37 UTC 2015

Date: Thursday, July 2, 2015 @ 21:24:36
  Author: jtaylor-guest
Revision: 33207

New upstream release

Modified:
  packages/foolscap/trunk/debian/changelog
  packages/foolscap/trunk/debian/control
  packages/foolscap/trunk/debian/copyright
  packages/foolscap/trunk/debian/patches/minimal_twisted_deps.patch

Modified: packages/foolscap/trunk/debian/changelog
===================================================================

--- packages/foolscap/trunk/debian/changelog	2015-07-02 02:31:11 UTC (rev 33206)
+++ packages/foolscap/trunk/debian/changelog	2015-07-02 21:24:36 UTC (rev 33207)
@@ -1,3 +1,11 @@
+foolscap (0.8.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * cleanup debian/copyright
+  * bump standard to 3.9.6, no changes required
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Thu, 02 Jul 2015 22:43:14 +0200
+
 foolscap (0.6.5-1) unstable; urgency=medium
 
   * New upstream release

Modified: packages/foolscap/trunk/debian/control
===================================================================
--- packages/foolscap/trunk/debian/control	2015-07-02 02:31:11 UTC (rev 33206)
+++ packages/foolscap/trunk/debian/control	2015-07-02 21:24:36 UTC (rev 33207)
@@ -12,7 +12,7 @@
                      python-twisted-web,
                      python-zope.interface
 X-Python-Version: >= 2.4
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://foolscap.lothar.com/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/foolscap/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/foolscap/trunk/

Modified: packages/foolscap/trunk/debian/copyright
===================================================================
--- packages/foolscap/trunk/debian/copyright	2015-07-02 02:31:11 UTC (rev 33206)
+++ packages/foolscap/trunk/debian/copyright	2015-07-02 21:24:36 UTC (rev 33207)
@@ -7,19 +7,6 @@
 Files: *
 Copyright: 2006-2008 Brian Warner
 License: MIT
-
-Files: foolscap/sslverify.py
-Copyright: Copyright 2005 Divmod, Inc
-License: MIT
-Comment:  Slightly modified of sslverify.py which can also be found in python-epsilon
-
-Files: misc/testutils/figleaf.py
-Copyright: Copyright: 2006, 2007 C. Titus Brown
-License: BSD
-Comment: copied from http://darcs.idyll.org/~t/projects/figleaf/doc/
-
-
-License: MIT
   Permission is hereby granted, free of charge, to any person
   obtaining a copy of this software and associated documentation
   files (the "Software"), to deal in the Software without
@@ -40,32 +27,3 @@
   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
   OTHER DEALINGS IN THE SOFTWARE.
-
-
-License: BSD
-  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.

Modified: packages/foolscap/trunk/debian/patches/minimal_twisted_deps.patch
===================================================================
--- packages/foolscap/trunk/debian/patches/minimal_twisted_deps.patch	2015-07-02 02:31:11 UTC (rev 33206)
+++ packages/foolscap/trunk/debian/patches/minimal_twisted_deps.patch	2015-07-02 21:24:36 UTC (rev 33207)
@@ -1,18 +1,19 @@
 Description: minimize twisted dependencies
 Author: Julian Taylor <jtaylor.debian at googlemail.com>
 Forwarded: not-needed
---- a/setup.py
-+++ b/setup.py
-@@ -89,7 +89,11 @@ if have_setuptools:
-             "flappserver = foolscap.appserver.cli:run_flappserver",
-             "flappclient = foolscap.appserver.client:run_flappclient",
-             ] }
--    setup_args['install_requires'] = setup_args['tests_require'] = ['twisted >= 2.5.0']
-+    setup_args['install_requires'] = setup_args['tests_require'] = [
-+        'twisted-core >= 2.5.0',
-+        'twisted-web >= 2.5.0',
-+        'zope.interface'
-+    ]
-     # note that pyOpenSSL-0.7 and recent Twisted causes unit test failures,
-     # see bug #62
+Index: foolscap-0.8.0/setup.py
+===================================================================
+--- foolscap-0.8.0.orig/setup.py
++++ foolscap-0.8.0/setup.py
+@@ -59,7 +59,10 @@ object reference system, and a capabilit
+                  "foolscap.appserver", "foolscap.test"],
+     "scripts": ["bin/flogtool", "bin/flappserver", "bin/flappclient"],
+     "cmdclass": commands,
+-    "install_requires": ["twisted >= 2.5.0", "pyOpenSSL", "service_identity"],
++    "install_requires": ["twisted-core >= 2.5.0",
++                         "twisted-web >= 2.5.0",
++                         "zope.interface",
++                         "pyOpenSSL", "service_identity"],
+ }
  
+ if platform.system() == "Windows":


