Merge lp:~bkerensa/ubuntu/precise/hellanzb/fix-for-957323 into lp:ubuntu/precise/hellanzb

[Benjamin Kerensa]

[lp:~bkerensa/ubuntu/precise/hellanzb/fix-for-957323]

14. By Benjamin Kerensa on 2012-09-07

Incorporated debian/patches/008-Twisted_11.1.0_compat to work with Python Twisted 11.1.0

15. By Benjamin Kerensa on 2012-09-07

Adjusted Version

[Brian Murray (brian-murray)]

I've uploaded this to precise-proposed thanks!

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-16 12:13:35 +0000
+++ debian/changelog	2012-09-07 20:58:19 +0000
@@ -1,3 +1,10 @@
+hellanzb (0.13-6.1ubuntu0) precise-proposed; urgency=low
+
+  * Add debian/patches/008-Twisted_11.1.0_compat to work
+    with Python Twisted 11.1.0 (LP: #950972) 
+
+ -- Benjamin Kerensa <[e-mail]>  Fri, 07 Sep 2012 13:30:28 -0700
+
 hellanzb (0.13-6.1) unstable; urgency=low
 
   * Non-maintainer upload.
 
=== added file 'debian/patches/008-Twisted_11.1.0_compat.dpatch'
--- debian/patches/008-Twisted_11.1.0_compat.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/008-Twisted_11.1.0_compat.dpatch	2012-09-07 20:58:19 +0000
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 008-Twisted_11.1.0_compat.dpatch by Christophe Sauthier <[e-mail]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix the compat with python twisted 11.1.0 and above
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hellanzb-0.13~/Hellanzb/HellaReactor.py hellanzb-0.13/Hellanzb/HellaReactor.py
+--- hellanzb-0.13~/Hellanzb/HellaReactor.py	2012-05-06 05:51:07.000000000 -0700
++++ hellanzb-0.13/Hellanzb/HellaReactor.py	2012-05-06 05:51:26.486696613 -0700
+@@ -9,7 +9,12 @@
+ import Hellanzb, sys, time
+ 
+ import twisted.copyright
+-if twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0':
++
++if twisted.copyright.version >= '11.0.0':
++    from twisted.internet.selectreactor import SelectReactor
++    from twisted.internet.posixbase import _NO_FILENO
++    from twisted.internet.posixbase import _NO_FILEDESC
++elif twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0':
+     from twisted.internet.selectreactor import SelectReactor
+     from twisted.internet.selectreactor import _NO_FILENO
+     from twisted.internet.selectreactor import _NO_FILEDESC
 
=== modified file 'debian/patches/00list'
--- debian/patches/00list	2010-03-12 14:53:32 +0000
+++ debian/patches/00list	2012-09-07 20:58:19 +0000
@@ -6,4 +6,5 @@
 005-Fix_crash_on_missing_unrar
 006-Fix_embedded_nzb_postprocessing
 007-Twisted_10.0.0_compat
+008-Twisted_11.1.0_compat.dpatch
 100-python_26_fixes