[SCM] efficient 2D data-plotting library branch, master, updated. upstream/2.0.7.1-21-g0a0a9cd

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit 0a0a9cd5995cba0774b52ffff72b46ba3d710dd5
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Sun Feb 20 19:50:12 2011 +0100

    * debian/patch/01_bts614083.patch
      -  FTBFS on multiple architectures -unrecognized command line option "-msse2"
         thanks Hector Oron for reporting and Lifeng Sun for the patch.
         Closes: 614083

diff --git a/debian/changelog b/debian/changelog
index 7f8e8a3..37d502f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+guiqwt (2.0.8.1-2) unstable; urgency=low
+
+  * fix the Original-Source-Location : sourceforge -> google code.
+  * add the guiqwt-test.desktop file
+  * debian/patch/01_bts614083.patch
+    - FTBFS on multiple architectures -unrecognized command line option "-msse2"
+    thanks Hector Oron for reporting and Lifeng Sun for the patch.
+    Closes: 614083
+
+ -- Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>  Sun, 20 Feb 2011 19:47:00 +0100
+
 guiqwt (2.0.8.1-1) unstable; urgency=low
 
   * Initial release (Closes: #602555)
diff --git a/debian/patches/features/01_bts614083.patch b/debian/patches/features/01_bts614083.patch
new file mode 100644
index 0000000..6f4fad2
--- /dev/null
+++ b/debian/patches/features/01_bts614083.patch
@@ -0,0 +1,47 @@
+Description: Upstream changes introduced in version 2.0.8.1-2
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ fix the FTBFS due to an hardcoded "-sse2" flag.
+ thanks Lifeng Sun <lifongsun at gmail.com> for the patch
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor>, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=614083#10
+Bug-Debian: http://bugs.debian.org/614083
+Forwarded: <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=614083#10>
+
+--- guiqwt-2.0.8.1.orig/setup.py
++++ guiqwt-2.0.8.1/setup.py
+@@ -97,6 +97,15 @@ if sphinx:
+ 
+     cmdclass['build_doc'] = build_doc
+ 
++from numpy.distutils.cpuinfo import cpu
++
++sse2_flag=""
++
++try:
++    if cpu._has_sse2():
++        sse2_flag="-msse2 "
++except KeyError:
++    pass
+ 
+ setup(name=LIBNAME, version=version,
+       download_url='http://%s.googlecode.com/files/%s-%s.zip' % (
+@@ -108,7 +117,7 @@ setup(name=LIBNAME, version=version,
+       ext_modules=[Extension(LIBNAME+'._ext', [join("src", 'histogram.f')]),
+                    Extension(LIBNAME+'._mandel', [join("src", 'mandel.f90')]),
+                    Extension(LIBNAME+'._scaler', [join("src", "scaler.cpp")],
+-                             extra_compile_args=["-msse2 -Wall -Werror",],
++                             extra_compile_args=[sse2_flag+"-Wall -Werror",],
+                              depends=[join("src", "traits.hpp"),
+                                       join("src", "points.hpp"),
+                                       join("src", "arrays.hpp"),
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..444d493
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+features/01_bts614083.patch
diff --git a/setup.py b/setup.py
index d33b70b..c19e0d4 100644
--- a/setup.py
+++ b/setup.py
@@ -97,6 +97,15 @@ if sphinx:
 
     cmdclass['build_doc'] = build_doc
 
+from numpy.distutils.cpuinfo import cpu
+
+sse2_flag=""
+
+try:
+    if cpu._has_sse2():
+        sse2_flag="-msse2 "
+except KeyError:
+    pass
 
 setup(name=LIBNAME, version=version,
       download_url='http://%s.googlecode.com/files/%s-%s.zip' % (
@@ -108,7 +117,7 @@ setup(name=LIBNAME, version=version,
       ext_modules=[Extension(LIBNAME+'._ext', [join("src", 'histogram.f')]),
                    Extension(LIBNAME+'._mandel', [join("src", 'mandel.f90')]),
                    Extension(LIBNAME+'._scaler', [join("src", "scaler.cpp")],
-                             extra_compile_args=["-msse2 -Wall -Werror",],
+                             extra_compile_args=[sse2_flag+"-Wall -Werror",],
                              depends=[join("src", "traits.hpp"),
                                       join("src", "points.hpp"),
                                       join("src", "arrays.hpp"),

-- 
efficient 2D data-plotting library