From d6cb89b63c2b956d678fcce222be3dfff857c30c Mon Sep 17 00:00:00 2001 From: Markus Rosenstihl Date: Mon, 9 Mar 2026 15:22:06 +0100 Subject: [PATCH] bumped version, python3 now working, deprecated python build replaced with pybuild --- debian/changelog | 11 ++++++++- debian/compat | 2 +- debian/control | 10 ++++---- debian/rules | 56 ++++--------------------------------------- requirements.debian | 2 +- src/gui/DamarisGUI.py | 2 +- 6 files changed, 22 insertions(+), 61 deletions(-) diff --git a/debian/changelog b/debian/changelog index 947f1e3..0d343c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,13 @@ -python3-damaris (0.18.2) UNRELEASED; urgency=medium +python3-damaris (0.19) stable; urgency=medium + + * JBs python3-damaris code adapted to new python3 syntax + * debian/rules using pybuild + * debian pacakaging upgraded to new version, removed deprectated stuff + * version bump + + -- Markus Rosenstihl Mon, 09 Mar 2026 15:15:34 +0100 + +python3-damaris (0.18.2) stable; urgency=medium * Experiment queuing implemented * Joachim Beerwerths (JB) fixes merged diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index b50021a..94c6f06 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,16 @@ Source: python3-damaris Section: science Priority: optional -Maintainer: Markus Rosenstihl -Build-Depends: debhelper, python3-dev, dh-python, dpkg-dev +Maintainer: Markus Rosenstihl +Build-Depends: python3, debhelper, python3-dev, dh-sequence-python3, dpkg-dev Standards-Version: 3.7.3 X-Python3-Version: >= 3.5 +Rules-Requires-Root: no Package: python3-damaris Architecture: all -XB-Python-Version: ${python3:Versions} -Provides: ${python3:Provides}, damaris-frontend-py3 -Depends: ${python3:Depends}, python3-numpy, python3-scipy, python3-gi, python3-matplotlib, python3-tables, lzop, python3-xdg, libgtksourceview-3.0-1 +Provides: damaris-frontend-py3 +Depends: ${python3:Depends}, python3-numpy, python3-scipy, python3-gi, python3-matplotlib, python3-tables, lzop, python3-xdg, libgtksourceview-3.0-1, libgirepository1.0-dev | libgirepository-2.0-dev Recommends: damaris-backends, python3-numpy-ext Suggests: python3-doc, python3-tables-doc, python3-numpy-doc Description: python frontend for DAMARIS project diff --git a/debian/rules b/debian/rules index 1c9002c..9bdaaed 100755 --- a/debian/rules +++ b/debian/rules @@ -7,58 +7,10 @@ export DH_VERBOSE=1 PYVERS=$(shell py3versions -vr) PACKAGE_NAME=python3-damaris +PYBUILD_NAME=python3-damaris MODULE_NAME=damaris3 PYBASE=$(CURDIR)/debian/${PACKAGE_NAME} -DH_ALWAYS_EXCLUDE=CVS:.svn +DH_ALWAYS_EXCLUDE=CVS:.git:venv -clean: - dh_testdir - dh_testroot - dh_installdirs - # Add here commands to clean up after the build process. - rm -f *-stamp - rm -rf dist build $(PYVERS:%=build-ext-%) - find . -name *\.py[co] -exec rm {} \; - dh_clean - -build: build-stamp -build-stamp: $(PYVERS:%=build-ext-%) - touch $@ -build-ext-%: - dh_testdir - python$* setup.py build - touch $@ - -install: install-stamp -# install menu related things - dh_install debian/damaris3.desktop /usr/share/applications/ - -install-stamp: build-stamp $(PYVERS:%=install-ext-%) -install-ext-%: - python$* setup.py install --root $(PYBASE) --install-layout=deb - echo "DAMARIS3 script: removing path to local installation" - -sed 's/^sys.path.insert(0,.*).*/# damaris package is found on default path/' <$(PYBASE)/usr/bin/DAMARIS3 >$(PYBASE)/usr/bin/DAMARIS3.new - -mv $(PYBASE)/usr/bin/DAMARIS3.new $(PYBASE)/usr/bin/DAMARIS3 - -binary-indep: build install - dh_link usr/share/python3-damaris/doc usr/share/doc/python3-damaris/html - dh_link usr/share/python3-damaris/images usr/share/doc/python3-damaris/images - dh_link usr/share/python3-damaris/images/DAMARIS3.png usr/share/icons/DAMARIS3.png - dh_testdir -i - dh_testroot -i - dh_installchangelogs -i - dh_installdocs -i - dh_python3 - dh_installmenu -i - dh_compress -i -X.py - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -binary-arch: build install - -binary: binary-indep binary-arch - -.PHONY: build clean binary-indep binary-arch binary install configure +%: + dh $@ --buildsystem=pybuild diff --git a/requirements.debian b/requirements.debian index e8ba18b..aabe186 100644 --- a/requirements.debian +++ b/requirements.debian @@ -1,6 +1,6 @@ #!/bin/bash sudo apt install libcairo2-dev -sudo apt install python3-scipy python3-lmfit python3-matplotlib +sudo apt install python3-scipy python3-lmfit python3-matplotlib python3-tables python3-xdg sudo apt install gir1.2-gtksource-3.0 DEBRELEASE=$(lsb_release -cs) case $DEBRELEASE in diff --git a/src/gui/DamarisGUI.py b/src/gui/DamarisGUI.py index 580a718..3854b6b 100644 --- a/src/gui/DamarisGUI.py +++ b/src/gui/DamarisGUI.py @@ -79,7 +79,7 @@ from damaris.data import DataPool, Accumulation, ADC_Result, MeasurementResult debug = False # version info -__version__ = "0.18.2" +__version__ = "0.19" class logstream: