[pytables] 04/04: Referesh all patches

[Antonio Valentino]

This is an automated email from the git hooks/post-receive script.

a_valentino-guest pushed a commit to branch master
in repository pytables.

commit 64fcd92d511e40d3cf68a589c7102619d40d5e04
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Thu Mar 27 21:11:56 2014 +0000

    Referesh all patches
---
 debian/changelog                                   |  4 ++++
 debian/patches/0001-use-dynamic-lib.patch          |  4 ++--
 .../patches/0002-Use-system-compression-libs.patch |  6 +++---
 .../0003-Only-use-msse2-flag-on-x86_64.patch       | 22 ----------------------
 debian/patches/series                              |  1 -
 5 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e66074..deae6e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 pytables (3.1.1-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * debian/patches
+    - dropped debian/patches/0003-Only-use-msse2-flag-on-x86_64.patch,
+      the problem has been fixed upstream
+    - all remaining patches has been refreshed
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Thu, 27 Mar 2014 21:06:21 +0000
 
diff --git a/debian/patches/0001-use-dynamic-lib.patch b/debian/patches/0001-use-dynamic-lib.patch
index 9c8535d..bce7cbe 100644
--- a/debian/patches/0001-use-dynamic-lib.patch
+++ b/debian/patches/0001-use-dynamic-lib.patch
@@ -14,10 +14,10 @@ sthe setup script
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index dcc3b6b..4bb28ce 100755
+index 0f2f3f7..555e3dc 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -301,7 +301,7 @@ class Package(object):
+@@ -302,7 +302,7 @@ class Package(object):
  
  class PosixPackage(Package):
      _library_prefixes = ['lib']
diff --git a/debian/patches/0002-Use-system-compression-libs.patch b/debian/patches/0002-Use-system-compression-libs.patch
index 96d4935..d27a178 100644
--- a/debian/patches/0002-Use-system-compression-libs.patch
+++ b/debian/patches/0002-Use-system-compression-libs.patch
@@ -10,10 +10,10 @@ copies bundled with blosc itself.
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 4bb28ce..6fe9c02 100755
+index 555e3dc..d9e2ef6 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -724,14 +724,15 @@ if 'BLOSC' not in optional_libs:
+@@ -725,14 +725,15 @@ if 'BLOSC' not in optional_libs:
      # Blosc + BloscLZ sources
      blosc_files += glob.glob('c-blosc/blosc/*.c')
      # LZ4 sources
@@ -32,4 +32,4 @@ index 4bb28ce..6fe9c02 100755
 +    #inc_dirs += glob.glob('c-blosc/internal-complibs/*')
      # ...and the macros for all the compressors supported
      def_macros += [('HAVE_LZ4', 1), ('HAVE_SNAPPY', 1), ('HAVE_ZLIB', 1)]
-     # Add -msse2 flag for optimizing shuffle in include Blosc
+ 
diff --git a/debian/patches/0003-Only-use-msse2-flag-on-x86_64.patch b/debian/patches/0003-Only-use-msse2-flag-on-x86_64.patch
deleted file mode 100644
index 178a34c..0000000
--- a/debian/patches/0003-Only-use-msse2-flag-on-x86_64.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Tue, 18 Mar 2014 23:26:24 +0100
-Subject: Only use -msse2 flag on x86_64
-
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 6fe9c02..5562dd9 100755
---- a/setup.py
-+++ b/setup.py
-@@ -736,7 +736,8 @@ if 'BLOSC' not in optional_libs:
-     # ...and the macros for all the compressors supported
-     def_macros += [('HAVE_LZ4', 1), ('HAVE_SNAPPY', 1), ('HAVE_ZLIB', 1)]
-     # Add -msse2 flag for optimizing shuffle in include Blosc
--    if os.name == 'posix':
-+    import platform
-+    if os.name == 'posix' and 'x86_64' in platform.machine():
-         CFLAGS.append("-msse2")
- else:
-     ADDLIBS += ['blosc']
diff --git a/debian/patches/series b/debian/patches/series
index 11100fb..7e7c3c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-use-dynamic-lib.patch
 0002-Use-system-compression-libs.patch
-0003-Only-use-msse2-flag-on-x86_64.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytables.git