Package: tahoe-lafs
Version: 1.8.3-1
Severity: important
Tags: patch

I screwed up the patch I added to 631163.
The requires.txt gets regenerated during the build voiding my patch.

Attached a revised patch which should now really fix the issue by patching
_auto_deps.py from where the requires.txt is generated from.
I'm sorry for this mistake.

This issue could have been caught by the testsuite when executed in a clean
environment (without python-twisted installed!)
Tahoe has an excellent testsuite please utilize it so you can detect these
issues before you upload to the archive.



-- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 
'oneiric'), (100, 'oneiric-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages tahoe-lafs depends on:
ii  python                    2.7.2-5ubuntu1 interactive high-level object-orie
ii  python-crypto             2.3-2          cryptographic algorithms and proto
ii  python-foolscap           0.6.1-5        object-capability-based RPC system
ii  python-mock               0.7.1-0ubuntu1 Mocking and Testing Library
ii  python-nevow              0.10.0-4       Web application templating system 
ii  python-openssl            0.12-1ubuntu1  Python wrapper around the OpenSSL 
ii  python-pyasn1             0.0.11a-1      ASN.1 library for Python
ii  python-pycryptopp         0.5.29-1       Python wrappers for the Crypto++ l
ii  python-setuptools         0.6.16-1       Python Distutils Enhancements (set
ii  python-simplejson         2.1.6-1        simple, fast, extensible JSON enco
ii  python-support            1.0.13ubuntu1  automated rebuilding support for P
ii  python-twisted-conch      1:11.0.0-1     The Twisted SSH Implementation
ii  python-twisted-core       11.0.0-2       Event-based framework for internet
ii  python-twisted-web        11.0.0-1       An HTTP protocol implementation to
ii  python-zfec               1.4.5-0ubuntu4 fast erasure codec, with python bi

tahoe-lafs recommends no packages.

tahoe-lafs suggests no packages.

-- no debconf information
Description: Fix automatic dependency guessing.
 Debian splits the Twisted package in several modules, and tahoe-lafs depends
 only on some of them. For the package build process to guess the correct 
Twisted
 package dependency, the egg requires.txt need to be fixed.
 The egg is generated from the values in _auto_deps.py.
Author: Julian Taylor <jtaylor.deb...@googlemail.com>
Bug-Debian: http://bugs.debian.org/631163

Index: tahoe/src/allmydata/_auto_deps.py
===================================================================
--- tahoe.orig/src/allmydata/_auto_deps.py      2011-09-14 23:07:08.618202168 
+0200
+++ tahoe/src/allmydata/_auto_deps.py   2011-09-14 23:17:25.348200707 +0200
@@ -16,7 +16,8 @@
 
     "zope.interface",
 
-    "Twisted >= 2.4.0",
+    "Twisted-Core >= 2.4.0",
+    "Twisted-Web >= 2.4.0",
 
     # foolscap < 0.5.1 had a performance bug which spent
     # O(N**2) CPU for transferring large mutable files
@@ -46,7 +47,8 @@
     ('foolscap',        'foolscap'),
     ('pycryptopp',      'pycryptopp'),
     ('zfec',            'zfec'),
-    ('Twisted',         'twisted'),
+    ('Twisted-Core',    'twisted'),
+    ('Twisted-Web',     'twisted.web'),
     ('Nevow',           'nevow'),
     ('zope.interface',  'zope.interface'),
     ('python',          None),

Reply via email to