Dear maintainer,

Here is the NMU diff according to DevRef 5.11.1[1][2] for bug: #573691.
See the debian/patches directory for the important fixes.

Please let me know if it is ok to proceed with NMU.

Thank you for maintaining the package,
Jari Aalto

[1] http://www.debian.org/doc/developers-reference/pkgs.html#nmu
[2] http://dep.debian.net/deps/dep1.html

lsdiff(1) of changes:

    flumotion-0.6.1/debian/changelog
    flumotion-0.6.1/debian/patches/20_configure_twisted.patch

diffstat for flumotion_0.6.1-1 flumotion_0.6.1-1.1

 debian/patches/20_configure_twisted.patch |   21 +++++++++++++++++++++
 flumotion-0.6.1/debian/changelog          |   10 ++++++++++
 2 files changed, 31 insertions(+)

diff -u flumotion-0.6.1/debian/changelog flumotion-0.6.1/debian/changelog
--- flumotion-0.6.1/debian/changelog
+++ flumotion-0.6.1/debian/changelog
@@ -1,3 +1,13 @@
+flumotion (0.6.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches
+    - (20): New. fix configure file to detect correctly twisted > 9.x.
+    This fixes a FTBFS with twisted 10.x. Patch thanks to Ubuntu
+    Fabrice <coutade...@gmail.com> (FTBFS; Closes: #573691).
+
+ -- Jari Aalto <jari.aa...@cante.net>  Sun, 17 Oct 2010 01:18:59 +0300
+
 flumotion (0.6.1-1) unstable; urgency=low
 
   [ Marc-André Lureau ]
only in patch2:
unchanged:
--- flumotion-0.6.1.orig/debian/patches/20_configure_twisted.patch
+++ flumotion-0.6.1/debian/patches/20_configure_twisted.patch
@@ -0,0 +1,21 @@
+Description: Fix configure script to accept twisted version greater than 9.
+  Patch inspired by what has been done by upstream in 0.6.2
+Author: Fabrice Coutadeur <fabric...@ubuntu.com>
+
+diff -Nur -x '*.orig' -x '*~' flumotion-0.6.1//configure flumotion-0.6.1.new//configure
+--- flumotion-0.6.1//configure	2009-09-09 11:37:51.000000000 +0000
++++ flumotion-0.6.1.new//configure	2010-08-21 07:38:08.815443393 +0000
+@@ -13322,9 +13322,10 @@
+ $as_echo_n "checking for Twisted >= 2.0.1... " >&6; }
+   prog="
+ import sys
+-import twisted.copyright
+-minver = '2.0.1'
+-if twisted.copyright.version < minver:
++from twisted import version as v
++minver = (2, 0, 1)
++curver = (v.major, v.minor, v.micro)
++if curver < minver:
+     sys.exit(1)
+ sys.exit(0)
+ "

Reply via email to