[Python-modules-commits] r17866 - in packages/foolscap/trunk/debian (6 files)

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

    Date: Sunday, July 17, 2011 @ 12:01:38
  Author: jtaylor-guest
Revision: 17866

patch setup.py to setup minimal dependencies properly

removes need for pydist-override and depends in control

Added:
  packages/foolscap/trunk/debian/patches/
  packages/foolscap/trunk/debian/patches/minimal_twisted_deps.patch
  packages/foolscap/trunk/debian/patches/series
Modified:
  packages/foolscap/trunk/debian/changelog
  packages/foolscap/trunk/debian/control
Deleted:
  packages/foolscap/trunk/debian/pydist-overrides

Modified: packages/foolscap/trunk/debian/changelog
===================================================================
--- packages/foolscap/trunk/debian/changelog	2011-07-17 11:54:20 UTC (rev 17865)
+++ packages/foolscap/trunk/debian/changelog	2011-07-17 12:01:38 UTC (rev 17866)
@@ -1,8 +1,10 @@
-foolscap (0.6.1-5) unstable; urgency=low
+foolscap (0.6.1-5) UNRELEASED; urgency=low
 
   * fix dep-5 format error in copyright
+  * patch setup.py to generate minimal twisted dependencies in the egg
+    - removes need for pydist-override and depends in debian/control
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Wed, 13 Jul 2011 20:42:11 +0200
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Tue, 21 Jun 2011 15:48:02 +0200
 
 foolscap (0.6.1-4) unstable; urgency=low
 

Modified: packages/foolscap/trunk/debian/control
===================================================================
--- packages/foolscap/trunk/debian/control	2011-07-17 11:54:20 UTC (rev 17865)
+++ packages/foolscap/trunk/debian/control	2011-07-17 12:01:38 UTC (rev 17866)
@@ -19,11 +19,7 @@
 
 Package: python-foolscap
 Architecture: all
-Depends: python-twisted-core,
-         python-twisted-web,
-         python-zope.interface,
-         ${misc:Depends},
-         ${python:Depends}
+Depends: ${misc:Depends}, ${python:Depends}
 Recommends: python-openssl (>= 0.6)
 Description: object-capability-based RPC system for Twisted Python
  Foolscap (also known as "newpb") contains a new RPC system for Twisted Python,

Added: packages/foolscap/trunk/debian/patches/minimal_twisted_deps.patch
===================================================================
--- packages/foolscap/trunk/debian/patches/minimal_twisted_deps.patch	                        (rev 0)
+++ packages/foolscap/trunk/debian/patches/minimal_twisted_deps.patch	2011-07-17 12:01:38 UTC (rev 17866)
@@ -0,0 +1,18 @@
+Description: minimize twisted dependencies
+Author: Julian Taylor <jtaylor.debian at googlemail.com>
+Forwarded: not-needed
+Index: foolscap.git/setup.py
+===================================================================
+--- foolscap.git.orig/setup.py	2011-06-15 18:11:07.168005624 +0200
++++ foolscap.git/setup.py	2011-06-15 18:11:11.838005620 +0200
+@@ -71,7 +71,9 @@
+             "flappserver = foolscap.appserver.cli:run_flappserver",
+             "flappclient = foolscap.appserver.client:run_flappclient",
+             ] }
+-    setup_args['install_requires'] = ['twisted >= 2.4.0']
++    setup_args['install_requires'] = ['twisted-core >= 2.4.0',
++                                      'twisted-web >= 2.4.0',
++                                      'zope.interface']
+     setup_args['extras_require'] = { 'secure_connections' : ["pyOpenSSL"] }
+     # note that pyOpenSSL-0.7 and recent Twisted causes unit test failures,
+     # see bug #62

Added: packages/foolscap/trunk/debian/patches/series
===================================================================
--- packages/foolscap/trunk/debian/patches/series	                        (rev 0)
+++ packages/foolscap/trunk/debian/patches/series	2011-07-17 12:01:38 UTC (rev 17866)
@@ -0,0 +1 @@
+minimal_twisted_deps.patch

Deleted: packages/foolscap/trunk/debian/pydist-overrides
===================================================================
--- packages/foolscap/trunk/debian/pydist-overrides	2011-07-17 11:54:20 UTC (rev 17865)
+++ packages/foolscap/trunk/debian/pydist-overrides	2011-07-17 12:01:38 UTC (rev 17866)
@@ -1 +0,0 @@
-twisted python-twisted-core