Merge lp:~jtaylor/ubuntu/natty/pyfltk/fix-779340 into lp:ubuntu/natty/pyfltk

[Julian Taylor]

simple fix to make sure that the extension is linked against the needed libgl

[Marc Deslauriers (mdeslaur)]

Looks good, ACK! Thanks.

I've uploaded it to natty-proposed, and will prepare an SRU.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-07 04:18:27 +0000
+++ debian/changelog	2011-07-17 22:51:18 +0000
@@ -1,3 +1,10 @@
+pyfltk (1.1.5-3ubuntu0.1) natty; urgency=low
+
+  * Added debian/patches/opengl_fix. This corrects the inability to import
+    pyfltk when compiled with the new g++ linker (LP: #779340)
+
+ -- Julian Taylor <[e-mail]>  Mon, 18 Jul 2011 00:41:21 +0200
+
 pyfltk (1.1.5-3) unstable; urgency=low
 
   * debian/control:

=== added file 'debian/patches/opengl_fix'
--- debian/patches/opengl_fix	1970-01-01 00:00:00 +0000
+++ debian/patches/opengl_fix	2011-07-17 22:51:18 +0000
@@ -0,0 +1,16 @@
+Description: This corrects import error when compiled with new g++ linker.
+Author: Julian Taylor <[e-mail]>
+
+Index: pyfltk-1.1.5/setup.py
+===================================================================
+--- pyfltk-1.1.5.orig/setup.py	2011-05-16 16:52:59.000000000 -0500
++++ pyfltk-1.1.5/setup.py	2011-05-16 16:53:44.000000000 -0500
+@@ -241,7 +241,7 @@
+         lowercase_item = item.lower()
+         if string.find(lowercase_item, "pthread") >= 0:
+             doMulti = True
+-        if string.find(lowercase_item, "fltk") < 0 and string.find(lowercase_item, "gl") >= 0:
++        if string.find(lowercase_item, "fltk") >= 0 and string.find(lowercase_item, "gl") >= 0:
+             doOpenGL = True
+         if string.find(lowercase_item, "fltk") >= 0 and string.find(lowercase_item, "forms") >= 0:
+             doForms = True

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-01-09 15:51:20 +0000
+++ debian/patches/series	2011-07-17 22:51:18 +0000
@@ -1,2 +1,3 @@
 no_docs
 platform_startswith
+opengl_fix