tags 436935 + patch tags 439778 + patch tags 441023 + patch thanks Hi,
Attached is the diff for my pyicqt 0.8a-1.1 NMU, which I'm just uploading to DELAYED/7. -- Michal Čihař | http://cihar.com | http://blog.cihar.com
diff -u pyicqt-0.8a/debian/patches/00list pyicqt-0.8a/debian/patches/00list --- pyicqt-0.8a/debian/patches/00list +++ pyicqt-0.8a/debian/patches/00list @@ -2,0 +3 @@ +03_fix-current-twisted diff -u pyicqt-0.8a/debian/changelog pyicqt-0.8a/debian/changelog --- pyicqt-0.8a/debian/changelog +++ pyicqt-0.8a/debian/changelog @@ -1,3 +1,13 @@ +pyicqt (0.8a-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix crash with current twisted (Closes: #436935, #441023). + * Fix missing dependency (Closes: #439778). + * I know there could be done more for this package, but this is just a NMU + to fix most annoying breakages. + + -- Michal Čihař <[EMAIL PROTECTED]> Tue, 16 Oct 2007 22:43:52 +0900 + pyicqt (0.8a-1) unstable; urgency=low * Initial release (Closes: #406659) diff -u pyicqt-0.8a/debian/control pyicqt-0.8a/debian/control --- pyicqt-0.8a/debian/control +++ pyicqt-0.8a/debian/control @@ -9,7 +9,7 @@ Package: pyicqt Architecture: all -Depends: ${python:Depends}, python-twisted (>=2.0.0), python-twisted-web (>=0.5.0), python-twisted-words (>= 0.1.0), python-crypto, adduser, ${misc:Depends} +Depends: ${python:Depends}, python-twisted (>=2.0.0), python-twisted-web (>=0.5.0), python-twisted-words (>= 0.1.0), python-crypto, adduser, ${misc:Depends}, python-pyopenssl Suggests: jabberd2 | jabber | ejabberd Recommends: python-nevow (>= 0.4.1), python-mysqldb (>= 1.0.0), python-imaging Description: ICQ transport for Jabber only in patch2: unchanged: --- pyicqt-0.8a.orig/debian/patches/03_fix-current-twisted.dpatch +++ pyicqt-0.8a/debian/patches/03_fix-current-twisted.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_fix-current-twisted.dpatch by Michal Čihař <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Imports correct module within current twisted. + [EMAIL PROTECTED]@ +diff -urNad pyicqt-0.8a~/src/main.py pyicqt-0.8a/src/main.py +--- pyicqt-0.8a~/src/main.py 2007-06-04 10:10:36.000000000 +0900 ++++ pyicqt-0.8a/src/main.py 2007-10-16 22:54:18.000000000 +0900 +@@ -89,7 +89,10 @@ + import signal + signal.signal(signal.SIGHUP, reloadConfig) + # Load scripts for PID and daemonizing +- from twisted.scripts import twistd ++ try: ++ from twisted.scripts import _twistd_unix as twistd ++ except: ++ from twisted.scripts import twistd + + selectWarning = "Unable to install any good reactors (kqueue, cf, epoll, poll).\nWe fell back to using select. You may have scalability problems.\nThis reactor will not support more than 1024 connections +at a time. You may silence this message by choosing 'select' or 'default' as your reactor in the transport config." + if config.reactor and len(config.reactor) > 0: