[med-svn] [Git][med-team/mricron][master] 3 commits: Build-Depends: lazarus-src-3.0, Fix build

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / mricron


Commits:
b326d794 by Andreas Tille at 2024-01-17T13:28:47+01:00
Build-Depends: lazarus-src-3.0, Fix build

- - - - -
385bb6c5 by Andreas Tille at 2024-01-17T14:07:28+01:00
Fix clean target

- - - - -
51bd5328 by Andreas Tille at 2024-01-17T14:09:07+01:00
routine-update: Ready to upload to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+mricron (1.2.20211006+dfsg-5) unstable; urgency=medium
+
+  * Team upload.
+  * Build-Depends: lazarus-src-3.0
+  * Fix build
+    Closes: #1060943
+  * Fix clean target
+    Closes: #1046546
+
+ -- Andreas Tille <tille at debian.org>  Wed, 17 Jan 2024 14:07:57 +0100
+
 mricron (1.2.20211006+dfsg-4) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -10,18 +10,22 @@ Build-Depends: debhelper-compat (= 13),
                lcl-qt5,
                lcl-units,
                lcl-utils,
-               libx11-dev
+               libx11-dev,
+               lazarus-src-3.0
 Standards-Version: 4.6.2
-Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/med-team/mricron
 Vcs-Git: https://salsa.debian.org/med-team/mricron.git
 Homepage: https://www.nitrc.org/projects/mricron
+Rules-Requires-Root: no
 
 Package: mricron
 Architecture: any-amd64 any-i386 ppc64el arm64 armel armhf ia64
-Depends: mricron-data, ${misc:Depends}, ${shlibs:Depends}
-Recommends: pigz, dcm2niix
-Suggests: fsl-core, mricron-doc
+Depends: mricron-data,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: pigz,
+            dcm2niix
+Suggests: mricron-doc
 Description: magnetic resonance image conversion, viewing and analysis
  This is a GUI-based visualization and analysis tool for (functional) magnetic
  resonance imaging. MRIcron can be used to create 2D or 3D renderings of
@@ -36,8 +40,8 @@ Description: magnetic resonance image conversion, viewing and analysis
 
 Package: mricron-data
 Architecture: all
-Depends: ${misc:Depends}
 Multi-Arch: foreign
+Depends: ${misc:Depends}
 Description: data files for MRIcron
  This is a GUI-based visualization and analysis tool for (functional) magnetic
  resonance imaging. MRIcron can be used to create 2D or 3D renderings of
@@ -51,9 +55,9 @@ Description: data files for MRIcron
 
 Package: mricron-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends}
-Multi-Arch: foreign
 Description: data files for MRIcron
  This is a GUI-based visualization and analysis tool for (functional) magnetic
  resonance imaging. MRIcron can be used to create 2D or 3D renderings of


=====================================
debian/rules
=====================================
@@ -2,6 +2,7 @@
 # -*- makefile -*-
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export HOME=/tmp
 
 # one ring to rule them all ...
 %:
@@ -13,7 +14,7 @@ override_dh_auto_build:
 	cp common/notgui.inc common/isgui.inc
 	# and now the gui parts
 	cp common/gui.inc common/isgui.inc
-	lazbuild --build-all --ws=qt5 --pcp=/etc/lazarus mricron.lpi
+	lazbuild --build-all --ws=qt5 --pcp=/tmp/etc/lazarus mricron.lpi
 	mv ./MRIcron mricron
 	# build icon
 	convert iconfinal.ico -resize 32x32 iconfinal.xpm
@@ -33,7 +34,13 @@ override_dh_clean:
 	find . -name '*.o' -delete -o -name '*.ppu' -delete -o -name '*.a' -delete
 	find . -name '*.compiled' -delete
 	find . -name '*.or' -delete
+	rm -rf lib
 	-rm mricron.rc mricron.lrs mricron
 	-rm iconfinal*.xpm mricron.xpm
 	-rm text.lrs
+	if [ -e mricron.res~ ] ; then mv mricron.res~ mricron.res ; fi
 	dh_clean
+
+override_dh_auto_configure:
+	cp -a mricron.res mricron.res~
+	dh_auto_configure



View it on GitLab: https://salsa.debian.org/med-team/mricron/-/compare/c3a64df6f230d9b1141ec1524ccb9acc08f127c9...51bd532836a2b67ec0337a9bbb3bfab4cadbe727

-- 
View it on GitLab: https://salsa.debian.org/med-team/mricron/-/compare/c3a64df6f230d9b1141ec1524ccb9acc08f127c9...51bd532836a2b67ec0337a9bbb3bfab4cadbe727
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/debian-med-commit/attachments/20240117/abd28819/attachment-0001.htm>