[SCM] efficient 2D data-plotting library branch, master, updated. debian/2.0.8.1-4-8-g5287b91

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit 1a80dc0cccae12aa11e90c4b425479fbca22804b
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Tue Feb 22 23:15:02 2011 +0100

    * regenerate the patch series

diff --git a/debian/patches/0001-features-01_bts614083.patch b/debian/patches/0001-features-01_bts614083.patch
new file mode 100644
index 0000000..6d0f162
--- /dev/null
+++ b/debian/patches/0001-features-01_bts614083.patch
@@ -0,0 +1,22 @@
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at synchrotron-soleil.fr>
+Date: Tue, 22 Feb 2011 22:44:10 +0100
+Subject: features/01_bts614083
+
+---
+ setup.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 4a61257..6e366ef 100644
+--- a/setup.py
++++ b/setup.py
+@@ -109,7 +109,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=["-Wall -Werror",],
+                              depends=[join("src", "traits.hpp"),
+                                       join("src", "points.hpp"),
+                                       join("src", "arrays.hpp"),
+-- 
diff --git a/debian/patches/features/01_bts614083.patch b/debian/patches/features/01_bts614083.patch
deleted file mode 100644
index 6f4fad2..0000000
--- a/debian/patches/features/01_bts614083.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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/local-options b/debian/patches/local-options
deleted file mode 100644
index 4aceb10..0000000
--- a/debian/patches/local-options
+++ /dev/null
@@ -1 +0,0 @@
-unapply-patches
diff --git a/debian/patches/series b/debian/patches/series
index 444d493..3691545 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-features/01_bts614083.patch
+0001-features-01_bts614083.patch

-- 
efficient 2D data-plotting library