[pytables] 11/14: Drop unnecessary patches (system libs)

[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 7126b36e8db25f0947d511756cfb2d47f5de3175
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Mon Oct 31 13:26:48 2016 +0000

    Drop unnecessary patches (system libs)
---
 debian/changelog                                   |  3 +-
 .../patches/0002-Use-system-compression-libs.patch | 42 ----------------------
 debian/patches/0006-Use-system-blosc.patch         | 32 -----------------
 debian/patches/series                              |  2 --
 4 files changed, 2 insertions(+), 77 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 891a327..03e08b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,10 +5,11 @@ pytables (3.3.0-1) UNRELEASED; urgency=medium
   * debian/watch
     - add compatibility to the new tagging schema
   * debian/patches
-    - refresh all patches
     - drop 0005-fix-index-inheritance-order.patch and
       0006-fix-typo-in-hdf5extension.pyx.patch: applied upstream
     - new 0005-fix-compatibility-with-HDF5-1.10.patch
+    - drop 0002-Use-system-compression-libs.patch: not necessary
+    - refresh all patches
   * debian/copyright
     - add copyright for zsrd source
   * debian/rules
diff --git a/debian/patches/0002-Use-system-compression-libs.patch b/debian/patches/0002-Use-system-compression-libs.patch
deleted file mode 100644
index 7a6d4e3..0000000
--- a/debian/patches/0002-Use-system-compression-libs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sun, 19 Jan 2014 17:13:17 +0000
-Subject: Use system compression libs
-
-Now Blosc supports different compressors (fastlz, zlib, snappy and lz4).
-This patch enables the use of system libraries rather then the internal
-copies bundled with blosc itself.
----
- setup.py | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 0d9b408..d87b893 100755
---- a/setup.py
-+++ b/setup.py
-@@ -780,18 +780,19 @@ if 'BLOSC' not in optional_libs:
-     blosc_sources += [f for f in glob.glob('c-blosc/blosc/*.c')
-                       if 'avx2' not in f and 'sse2' not in f]
-     # LZ4 sources
--    blosc_sources += glob.glob('c-blosc/internal-complibs/lz4*/*.c')
-+    #blosc_sources += glob.glob('c-blosc/internal-complibs/lz4*/*.c')
-     # Snappy sources
--    blosc_sources += glob.glob('c-blosc/internal-complibs/snappy*/*.cc')
-+    #blosc_sources += glob.glob('c-blosc/internal-complibs/snappy*/*.cc')
-     # Zlib sources
--    blosc_sources += glob.glob('c-blosc/internal-complibs/zlib*/*.c')
-+    #blosc_sources += glob.glob('c-blosc/internal-complibs/zlib*/*.c')
-     # Zstd sources
--    blosc_sources += glob.glob('c-blosc/internal-complibs/zstd*/*/*.c')
-+    #blosc_sources += glob.glob('c-blosc/internal-complibs/zstd*/*/*.c')
-+    ADDLIBS.extend(['lz4', 'snappy', 'zstd', 'z'])
-     # Finally, add all the include dirs...
-     inc_dirs += [os.path.join('c-blosc', 'blosc')]
--    inc_dirs += glob.glob('c-blosc/internal-complibs/*')
--    inc_dirs += glob.glob('c-blosc/internal-complibs/zstd*/common')
--    inc_dirs += glob.glob('c-blosc/internal-complibs/zstd*')
-+    #inc_dirs += glob.glob('c-blosc/internal-complibs/*')
-+    #inc_dirs += glob.glob('c-blosc/internal-complibs/zstd*/common')
-+    #inc_dirs += glob.glob('c-blosc/internal-complibs/zstd*')
-     # ...and the macros for all the compressors supported
-     def_macros += [('HAVE_LZ4', 1), ('HAVE_SNAPPY', 1), ('HAVE_ZLIB', 1),
-                    ('HAVE_ZSTD', 1)]
diff --git a/debian/patches/0006-Use-system-blosc.patch b/debian/patches/0006-Use-system-blosc.patch
deleted file mode 100644
index 7c79997..0000000
--- a/debian/patches/0006-Use-system-blosc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Mon, 31 Oct 2016 13:16:45 +0000
-Subject: Use system blosc
-
----
- setup.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 6d0fbae..1e35645 100755
---- a/setup.py
-+++ b/setup.py
-@@ -773,8 +773,8 @@ blosc_sources = ["hdf5-blosc/src/blosc_filter.c"]
- if 'BLOSC' not in optional_libs:
-     # Compiling everything from sources
-     # Blosc + BloscLZ sources
--    blosc_sources += [f for f in glob.glob('c-blosc/blosc/*.c')
--                      if 'avx2' not in f and 'sse2' not in f]
-+    #blosc_sources += [f for f in glob.glob('c-blosc/blosc/*.c')
-+    #                  if 'avx2' not in f and 'sse2' not in f]
-     # LZ4 sources
-     #blosc_sources += glob.glob('c-blosc/internal-complibs/lz4*/*.c')
-     # Snappy sources
-@@ -785,7 +785,7 @@ if 'BLOSC' not in optional_libs:
-     #blosc_sources += glob.glob('c-blosc/internal-complibs/zstd*/*/*.c')
-     ADDLIBS.extend(['lz4', 'snappy', 'zstd', 'z'])
-     # Finally, add all the include dirs...
--    inc_dirs += [os.path.join('c-blosc', 'blosc')]
-+    #inc_dirs += [os.path.join('c-blosc', 'blosc')]
-     #inc_dirs += glob.glob('c-blosc/internal-complibs/*')
-     #inc_dirs += glob.glob('c-blosc/internal-complibs/zstd*/common')
-     #inc_dirs += glob.glob('c-blosc/internal-complibs/zstd*')
diff --git a/debian/patches/series b/debian/patches/series
index f37b082..0d6c893 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 0001-use-dynamic-lib.patch
-0002-Use-system-compression-libs.patch
 0003-Never-use-the-msse2-flag-explicitly.patch
 0004-Do-not-fetch-icons-for-external-web-sites.patch
 0005-fix-compatibility-with-HDF5-1.10.patch
-0006-Use-system-blosc.patch

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