[Git][debian-gis-team/pylibtiff][master] 2 commits: Disable teh bittools extension

[Antonio Valentino]

Antonio Valentino pushed to branch master at Debian GIS Project / pylibtiff


Commits:
d1737ffa by Antonio Valentino at 2018-12-30T10:35:24Z
Disable teh bittools extension

- - - - -
56eb4f80 by Antonio Valentino at 2018-12-30T10:35:48Z
Set distribution to unstable

- - - - -


6 changed files:

- + debian/README.Debian
- debian/changelog
- debian/control
- + debian/patches/0005-Disable-bittools-extension.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/README.Debian
=====================================
@@ -0,0 +1,9 @@
+pylibtiff for Debian
+--------------------
+
+In Debian the bittools extension has been totally disabled because it
+seems to be broken on many architectures.
+Use bitarray package is used instead of bittools as backend in the
+libtiff.lzw module.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 30 Dec 2018 11:21:45 +0100


=====================================
debian/changelog
=====================================
@@ -1,10 +1,12 @@
-pylibtiff (0.4.2-2) UNRELEASED; urgency=medium
+pylibtiff (0.4.2-2) unstable; urgency=medium
 
   * debian/patches
     - new 0004-Improve-tiff.h-detection.patch: fix detection of the
       tiff.h header on arm* and kfreebsd*
+  * Disable bittools extension: it is broken in many platforms.
+    Use bitarray instead as backend in the libtiff.lzw module.
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Wed, 26 Dec 2018 19:42:58 +0000
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 30 Dec 2018 10:35:29 +0000
 
 pylibtiff (0.4.2-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -23,6 +23,7 @@ Homepage: https://github.com/pearu/pylibtiff
 Package: python-libtiff
 Architecture: any
 Depends: libtiff5,
+         python-bitarray,
          ${python:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
@@ -54,6 +55,7 @@ Description: wrapper to the libtiff library to Python using ctypes
 Package: python3-libtiff
 Architecture: any
 Depends: libtiff5,
+         python3-bitarray,
          ${python3:Depends},
          ${shlibs:Depends},
          ${misc:Depends}


=====================================
debian/patches/0005-Disable-bittools-extension.patch
=====================================
@@ -0,0 +1,53 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Sun, 30 Dec 2018 11:15:42 +0100
+Subject: Disable bittools extension
+
+---
+ libtiff/lzw.py | 2 +-
+ setup.py       | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libtiff/lzw.py b/libtiff/lzw.py
+index 9e486b6..1d5736d 100644
+--- a/libtiff/lzw.py
++++ b/libtiff/lzw.py
+@@ -7,7 +7,7 @@ This module is obsolete, use tif_lzw extension module instead.
+ 
+ import numpy
+ 
+-default_backend='bittools'
++default_backend='bitarray'
+ #default_backend='bittools'
+ 
+ if default_backend=='bitarray':
+diff --git a/setup.py b/setup.py
+index b1dec57..27581e5 100644
+--- a/setup.py
++++ b/setup.py
+@@ -20,7 +20,7 @@ MICRO = 2
+ ISRELEASED = True
+ VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)
+ 
+-if os.path.exists('MANIFEST'): 
++if os.path.exists('MANIFEST'):
+     os.remove('MANIFEST')
+ 
+ 
+@@ -76,8 +76,8 @@ def configuration(parent_package='', top_path=None):
+ if __name__ == '__main__':
+     from numpy.distutils.core import setup, Extension
+ 
+-    bittools_mod = Extension('bittools',
+-                             sources=['libtiff/src/bittools.c'])
++    #bittools_mod = Extension('bittools',
++    #                         sources=['libtiff/src/bittools.c'])
+     tif_lzw_mod = Extension('tif_lzw',
+                             sources=['libtiff/src/tif_lzw.c'])
+ 
+@@ -105,5 +105,5 @@ PyLibTiff? is a Python package that provides the following modules:
+           # packages = ['libtiff'],
+           # package_dir = {'libtiff': 'libtiff'},
+           configuration=configuration,
+-          ext_modules=[bittools_mod, tif_lzw_mod], requires=['numpy']
++          ext_modules=[tif_lzw_mod], requires=['numpy']
+           )


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
 0002-ctypes.patch
 0003-fix-future-division.patch
 0004-Improve-tiff.h-detection.patch
+0005-Disable-bittools-extension.patch


=====================================
debian/rules
=====================================
@@ -3,7 +3,7 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 
 export PYBUILD_NAME=libtiff
-export PYBUILD_TEST_PYTEST=1
+export PYBUILD_DISABLE=test
 
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild



View it on GitLab: https://salsa.debian.org/debian-gis-team/pylibtiff/compare/7b36a7fb099118040bea3c5a967707cd37e2bcef...56eb4f80287951f2def8e984f0a6ae94d003a71a

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pylibtiff/compare/7b36a7fb099118040bea3c5a967707cd37e2bcef...56eb4f80287951f2def8e984f0a6ae94d003a71a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20181230/bd84682b/attachment-0001.html>