[Git][debian-gis-team/pylibtiff][master] 2 commits: Robust definition list generation

[Antonio Valentino]

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


Commits:
e10c6e21 by Antonio Valentino at 2018-12-31T09:46:01Z
Robust definition list generation

- - - - -
003c4ff0 by Antonio Valentino at 2018-12-31T09:46:09Z
Set distribution to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/0006-Robust-definition-list-generation.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+pylibtiff (0.4.2-3) unstable; urgency=medium
+
+  * debain/patchesi:
+    - new 0006-Robust-definition-list-generation.patch.
+      The patch avoids permission errors when the definition list is
+      generated at runtime. The definition list is no longer written to
+      file (tiff_h_X_Y_Z.py) in the system path.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Mon, 31 Dec 2018 09:31:37 +0000
+
 pylibtiff (0.4.2-2) unstable; urgency=medium
 
   * debian/patches


=====================================
debian/control
=====================================
@@ -22,7 +22,7 @@ Homepage: https://github.com/pearu/pylibtiff
 
 Package: python-libtiff
 Architecture: any
-Depends: libtiff5,
+Depends: libtiff5 (>= 4.0.10) | libtiff-dev,
          python-bitarray,
          ${python:Depends},
          ${shlibs:Depends},
@@ -54,7 +54,7 @@ Description: wrapper to the libtiff library to Python using ctypes
 
 Package: python3-libtiff
 Architecture: any
-Depends: libtiff5,
+Depends: libtiff5 (>= 4.0.10) | libtiff-dev,
          python3-bitarray,
          ${python3:Depends},
          ${shlibs:Depends},


=====================================
debian/patches/0006-Robust-definition-list-generation.patch
=====================================
@@ -0,0 +1,32 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Mon, 31 Dec 2018 09:07:28 +0000
+Subject: Robust definition list generation
+
+---
+ libtiff/libtiff_ctypes.py | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/libtiff/libtiff_ctypes.py b/libtiff/libtiff_ctypes.py
+index 9a18dc9..7fc5d98 100644
+--- a/libtiff/libtiff_ctypes.py
++++ b/libtiff/libtiff_ctypes.py
+@@ -131,12 +131,13 @@ if tiff_h is None:
+         l.append('%s = %s' % (name, value))
+     f.close()
+ 
+-    fn = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+-                      tiff_h_name + '.py')
+-    print('Generating %r from %r' % (fn,include_tiff_h))
+-    f = open(fn, 'w')
+-    f.write('\n'.join(l) + '\n')
+-    f.close()
++    if os.environ.get('PYLIBRIFF_WRITE_DEFINITION_FILE', 'NO') == 'YES':
++        fn = os.path.join(os.path.dirname(os.path.abspath(__file__)),
++                          tiff_h_name + '.py')
++        print('Generating %r from %r' % (fn,include_tiff_h))
++        f = open(fn, 'w')
++        f.write('\n'.join(l) + '\n')
++        f.close()
+ else:
+     d = tiff_h.__dict__
+ 


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@
 0003-fix-future-division.patch
 0004-Improve-tiff.h-detection.patch
 0005-Disable-bittools-extension.patch
+0006-Robust-definition-list-generation.patch



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

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pylibtiff/compare/56eb4f80287951f2def8e984f0a6ae94d003a71a...003c4ff06e8cd625fc8f9b5c7acf96139b054fcf
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/20181231/4f8ef0f3/attachment-0001.html>