debian/changelog

+doris (5.0.3~beta+dfsg-10) experimental; urgency=medium
+
+  * Set compat to 12.
+  * Use debhelper-compat instead of debian/compat.
+  * debian/rules:
+    - use pybuild where appropriate
+  * debian/patches:
+    - improve and rename python3.patch
+    - new 0009-Python-doris-package.patch
+  * New python3-doris package containing helper modules written in Python.
+
+ -- Antonio Valentino <antonio.valentino@tiscali.it>  Tue, 06 Aug 2019 13:17:57 +0000
+
 doris (5.0.3~beta+dfsg-9) unstable; urgency=medium
 
   * Team upload.

debian/compat

-11

debian/control

@@ -3,7 +3,7 @@ Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Antonio Valentino <antonio.valentino@tiscali.it>
 Section: contrib/science
 Priority: optional
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper-compat (= 12),
                dh-python,
                tcsh | c-shell,
                libepr-api-dev,
@@ -15,6 +15,7 @@ Build-Depends: debhelper (>= 11),
                python3-fastkml,
                python3-fiona,
                python3-gdal,
+               python3-lxml,
                python3-numpy,
                python3-requests,
                python3-scipy,
@@ -27,7 +28,39 @@ Homepage: http://doris.tudelft.nl
 
 Package: doris
 Architecture: any
-Depends: python3,
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends},
+         gawk | mawk,
+         gdal-bin,
+         python3-h5py,
+         python3-lxml,
+         python3-numpy,
+         tcsh | c-shell
+Recommends: gmt,
+            gv,
+            snaphu
+Suggests: eog,
+          imagemagick
+Description: Delft object-oriented radar interferometric software
+ DORIS is an Interferometric Synthetic Aperture Radar (InSAR) processor
+ developed by the Delft Institute of Earth Observation and Space Systems
+ of Delft University of Technology.
+ .
+ Interferometric products and endproducts such as Digital Elevation
+ Models and displacement maps can be generated with this software from
+ Single Look Complex data.
+ Data from the satellites ERS, ENVISAT (first ENVISAT interferogram,
+ DEM, and perspective view, JERS (first JERS interferogram), and
+ RADARSAT (first RADARSAT interferogram) can be processed with the
+ Doris software.
+
+Package: python3-doris
+Section: contrib/python
+Architecture: all
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends},
          python3-fastkml,
          python3-fiona,
          python3-gdal,
@@ -36,20 +69,11 @@ Depends: python3,
          python3-requests,
          python3-scipy,
          python3-shapely,
-         libxslt1.1,
-         gdal-bin,
-         gawk | mawk,
-         tcsh | c-shell,
-         ${python3:Depends},
-         ${shlibs:Depends},
-         ${misc:Depends}
-Recommends: snaphu,
-            gmt,
+         gdal-bin
+Recommends: gmt,
             gv,
-            python3-h5py
-Suggests: eog,
-          imagemagick
-Description: Delft object-oriented radar interferometric software
+            snaphu
+Description: Delft object-oriented radar interferometric software - Python tools
  DORIS is an Interferometric Synthetic Aperture Radar (InSAR) processor
  developed by the Delft Institute of Earth Observation and Space Systems
  of Delft University of Technology.
@@ -61,3 +85,5 @@ Description: Delft object-oriented radar interferometric software
  DEM, and perspective view, JERS (first JERS interferogram), and
  RADARSAT (first RADARSAT interferogram) can be processed with the
  Doris software.
+ .
+ This package contains support modules written in Python.

debian/patches/0009-Python-doris-package.patch

+From: Antonio Valentino <antonio.valentino@tiscali.it>
+Date: Tue, 6 Aug 2019 11:34:27 +0000
+Subject: Python doris package
+
+---
+ setup.py | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index fb17780..3124936 100644
+--- a/setup.py
++++ b/setup.py
+@@ -3,7 +3,20 @@ from setuptools import setup
+ setup(
+     name='doris',
+     version='5.0.3',
+-    packages=['doris_stack', 'doris_stack.functions', 'doris_stack.main_code', 'prepare_stack'],
++    packages=[
++        'doris',
++        'doris.doris_stack',
++        'doris.doris_stack.functions',
++        'doris.doris_stack.main_code',
++        'doris.prepare_stack',
++    ],
++    package_dir = {
++        'doris': '',
++        'doris.doris_stack': 'doris_stack',
++        'doris.doris_stack.functions': 'doris_stack/functions',
++        'doris.doris_stack.main_code': 'doris_stack/main_code',
++        'doris.prepare_stack': 'prepare_stack',
++    },
+     url='https://github.com/TUDelftGeodesy/Doris',
+     license='LICENSE.txt',
+     author='Gert Mulder',

debian/patches/series

@@ -5,4 +5,5 @@
 0005-fix-build.patch
 0006-remove-osr-from-dependencies.patch
 0007-drop-the-install-package.patch
-python3.patch
+0008-python3.patch
+0009-Python-doris-package.patch

debian/python3-doris.install

+usr/lib/python*
+install/init_cfg.py usr/share/doris
+install/*.xml usr/share/doris

debian/rules

@@ -38,13 +38,17 @@ override_dh_auto_configure:
 	rm -f doris_core/Makefile
 	doris_core/configure < /dev/null
 	mv Makefile doris_core
+	dh_auto_configure --buildsystem=pybuild
 
 override_dh_auto_build:
-	dh_auto_build --sourcedirectory=sar_tools -- CFLAGS="$(CXXFLAGS) $(COMMON_FLAGS)" LDFLAGS="$(LDFLAGS)"
-	dh_auto_build --sourcedirectory=envisat_tools -- CFLAGS="$(CFLAGS) $(COMMON_FLAGS)" LDFLAGS="$(LDFLAGS)"
-	dh_auto_build --sourcedirectory=doris_core -- CFLAGS="$(CXXFLAGS) $(COMMON_FLAGS) $(EXTRA_FLAGS)" LDFLAGS="$(LDFLAGS)"
+	dh_auto_build --buildsystem=makefile --sourcedirectory=sar_tools -- CFLAGS="$(CXXFLAGS) $(COMMON_FLAGS)" LDFLAGS="$(LDFLAGS)"
+	dh_auto_build --buildsystem=makefile --sourcedirectory=envisat_tools -- CFLAGS="$(CFLAGS) $(COMMON_FLAGS)" LDFLAGS="$(LDFLAGS)"
+	dh_auto_build --buildsystem=makefile --sourcedirectory=doris_core -- CFLAGS="$(CXXFLAGS) $(COMMON_FLAGS) $(EXTRA_FLAGS)" LDFLAGS="$(LDFLAGS)"
+	dh_auto_build --buildsystem=pybuild
 
 override_dh_auto_install:
+	dh_auto_install --buildsystem=pybuild -p python3-doris
+
 	install -D --mode=0755 debian/doris.sh debian/doris/usr/bin/doris
 
 	dh_auto_install --sourcedirectory=sar_tools -- INSTALL_DIR=../debian/doris/usr/lib/doris
@@ -69,17 +73,11 @@ override_dh_auto_install:
 	install -D --mode=0644 bin/README_CSK.txt \
 		debian/doris/usr/share/doc/doris/README_CSK.txt
 
-	cp install/init_cfg.py install/*.xml debian/doris/usr/share/doris
-	chmod 0755 debian/doris/usr/share/doris/init_cfg.py
-
-	dh_auto_install
+	dh_auto_install --buildsystem=makefile
 
 	rm -f debian/doris/usr/lib/python*/dist-packages/doris_stack/functions/create_image.py
 
-	install -D --mode=0644 debian/overrides debian/doris/usr/share/lintian/overrides/doris
-
 override_dh_auto_clean:
-	dh_auto_clean
 	$(MAKE) -C sar_tools cleaner
 	#$(MAKE) -C envisat_tools cleaner
 	rm -f envisat_tools/*.o \
@@ -95,9 +93,15 @@ override_dh_auto_clean:
 			mv doris_core/Makefile.bak doris_core/Makefile;\
 		fi \
 	fi
+	dh_auto_clean --buildsystem=makefile
+	dh_auto_clean --buildsystem=pybuild
 
 override_dh_python3:
 	dh_python3 --shebang=/usr/bin/python3
 
+override_dh_auto_test:
+	dh_auto_test --buildsystem=pybuild
+
 .PHONY: override_dh_auto_configure override_dh_auto_build \
-        override_dh_auto_install override_dh_auto_clean
+        override_dh_auto_install override_dh_auto_clean \
+        override_dh_auto_test