[Git][debian-gis-team/lerc][master] 4 commits: Improve package description

Antonio Valentino (@antonio.valentino) gitlab at salsa.debian.org
Tue Nov 2 12:00:18 GMT 2021



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


Commits:
6db3fa12 by Antonio Valentino at 2021-11-02T10:58:27+00:00
Improve package description

- - - - -
96d6cbdc by Antonio Valentino at 2021-11-02T11:00:10+00:00
001-Specify-the-soversion.patch Applied-Upstream

- - - - -
3f8c1f54 by Antonio Valentino at 2021-11-02T11:47:14+00:00
Improve 0002-Use-system-libLerc.patch

- - - - -
b53456d7 by Antonio Valentino at 2021-11-02T11:55:05+00:00
Reorder d/rules file

- - - - -


4 changed files:

- debian/control
- debian/patches/0001-Specify-the-soversion.patch
- debian/patches/0002-Use-system-libLerc.patch
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -36,7 +36,7 @@ Multi-Arch: same
 Section: libdevel
 Depends: liblerc3 (= ${binary:Version}),
          ${misc:Depends}
-Description: Limited Error Raster Compression library (-dev package)
+Description: Limited Error Raster Compression library (Development files)
  LERC is an open-source image or raster format which
  supports rapid encoding and decoding for any pixel
  type (not just RGB or Byte). Users set the maximum
@@ -53,7 +53,7 @@ Depends: liblerc3,
          python3-numpy,
          ${python3:Depends},
          ${misc:Depends}
-Description: Limited Error Raster Compression library (Python)
+Description: Python 3 bindings to the Limited Error Raster Compression library
  LERC is an open-source image or raster format which
  supports rapid encoding and decoding for any pixel
  type (not just RGB or Byte). Users set the maximum


=====================================
debian/patches/0001-Specify-the-soversion.patch
=====================================
@@ -3,6 +3,7 @@ Date: Sun, 31 Oct 2021 10:28:09 +0000
 Subject: Specify the soversion
 
 Forwarded: https://github.com/Esri/lerc/pull/188
+Applied-Upstream
 ---
  CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)


=====================================
debian/patches/0002-Use-system-libLerc.patch
=====================================
@@ -2,21 +2,48 @@ From: Antonio Valentino <antonio.valentino at tiscali.it>
 Date: Mon, 1 Nov 2021 11:26:49 +0100
 Subject: Use system libLerc
 
-Forwarded: not-needed
+Forwarded: https://github.com/Esri/lerc/pull/190
 ---
- OtherLanguages/Python/lerc/_lerc.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ OtherLanguages/Python/lerc/_lerc.py | 29 +++++++++++++++++++++--------
+ 1 file changed, 21 insertions(+), 8 deletions(-)
 
 diff --git a/OtherLanguages/Python/lerc/_lerc.py b/OtherLanguages/Python/lerc/_lerc.py
-index 46ce06b..5f712c3 100644
+index 46ce06b..d8052f4 100644
 --- a/OtherLanguages/Python/lerc/_lerc.py
 +++ b/OtherLanguages/Python/lerc/_lerc.py
-@@ -45,7 +45,7 @@ dir_path = os.path.dirname(os.path.realpath(__file__))
- if platform.system() == "Windows":
-     lercDll = ct.CDLL (os.path.join(dir_path, 'Lerc.dll'))
- if platform.system() == "Linux":
+@@ -40,14 +40,27 @@ import ctypes as ct
+ from timeit import default_timer as timer
+ import platform
+ import os
+-dir_path = os.path.dirname(os.path.realpath(__file__))
+-
+-if platform.system() == "Windows":
+-    lercDll = ct.CDLL (os.path.join(dir_path, 'Lerc.dll'))
+-if platform.system() == "Linux":
 -    lercDll = ct.CDLL (os.path.join(dir_path, 'Lerc.so'))
-+    lercDll = ct.CDLL ('libLerc.so.3')
- if platform.system() == "Darwin":
-     lercDll = ct.CDLL (os.path.join(dir_path, 'Lerc.dylib'))
+-if platform.system() == "Darwin":
+-    lercDll = ct.CDLL (os.path.join(dir_path, 'Lerc.dylib'))
++
++def _get_lib():
++    dir_path = os.path.dirname(os.path.realpath(__file__))
++
++    if platform.system() == "Windows":
++        lib = os.path.join(dir_path, 'Lerc.dll')
++    elif platform.system() == "Linux":
++        lib = os.path.join(dir_path, 'Lerc.so')
++    elif platform.system() == "Darwin":
++        lib = os.path.join(dir_path, 'Lerc.dylib')
++    else:
++        lib = None
++
++    if not lib or not os.path.exists(lib):
++        import ctypes.util
++        lib = ctypes.util.find_library('Lerc')
++
++    return lib
++
++lercDll = ct.CDLL (_get_lib())
++del _get_lib
+ 
+ #-------------------------------------------------------------------------------
  


=====================================
debian/rules
=====================================
@@ -13,6 +13,12 @@ export PYBUILD_NAME=lerc
 %:
 	dh $@ --with python3,pkgkde_symbolshelper --buildsystem=cmake
 
+override_dh_auto_clean:
+	dh_auto_clean
+	dh_auto_clean --builddirectory build-static
+	dh_auto_clean --buildsystem=pybuild --sourcedirectory=OtherLanguages/Python
+	$(RM) -r OtherLanguages/Python/lerc.egg-info
+
 override_dh_auto_configure:
 	dh_auto_configure
 	dh_auto_configure --builddirectory build-static -- -DBUILD_SHARED_LIBS=FALSE
@@ -21,23 +27,16 @@ override_dh_auto_build:
 	dh_auto_build
 	dh_auto_build --builddirectory build-static
 
-override_dh_makeshlibs:
-	dh_makeshlibs -- -v$(UPSTREAM_VERSION) -c0
-
-override_dh_auto_install:
-	dh_auto_install --buildsystem=pybuild -ppython3-lerc --sourcedirectory=OtherLanguages/Python
-	dh_auto_install --builddirectory build-static
-	dh_auto_install
-
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	env LD_LIBRARY_PATH=$(shell dirname $(CURDIR)/*/libLerc.so) PYTHONPATH=$(CURDIR)/OtherLanguages/Python \
 		python3 -c "import lerc; assert lerc.test() == 0"
 endif
 
-override_dh_auto_clean:
-	dh_auto_clean
-	dh_auto_clean --builddirectory build-static
-	dh_auto_clean --buildsystem=pybuild --sourcedirectory=OtherLanguages/Python
-	$(RM) -r OtherLanguages/Python/lerc.egg-info
-	$(RM) OtherLanguages/Python/lerc/Lerc.so
+override_dh_auto_install:
+	dh_auto_install --buildsystem=pybuild -ppython3-lerc --sourcedirectory=OtherLanguages/Python
+	dh_auto_install --builddirectory build-static
+	dh_auto_install
+
+override_dh_makeshlibs:
+	dh_makeshlibs -- -v$(UPSTREAM_VERSION) -c0



View it on GitLab: https://salsa.debian.org/debian-gis-team/lerc/-/compare/898f2f48d6ecf718d4501b23b2ad31f6833e6e42...b53456d7ffea92c1a96c1a3637e747a59e5cb555

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/lerc/-/compare/898f2f48d6ecf718d4501b23b2ad31f6833e6e42...b53456d7ffea92c1a96c1a3637e747a59e5cb555
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/20211102/069bedd6/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list