[med-svn] [Git][med-team/ugene][master] 2 commits: Clean up and simplfy "arch: all" builds

[Michael R. Crusoe (@crusoe)]

Michael R. Crusoe pushed to branch master at Debian Med / ugene


Commits:
b05f7ba5 by Michael R. Crusoe at 2025-08-29T14:50:45+02:00
Clean up and simplfy "arch: all" builds

- - - - -
501760be by Michael R. Crusoe at 2025-08-29T14:54:39+02:00
fix patch metadata

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/patches/do_not_build_phylip_and_psipred.patch
- debian/rules
- debian/ugene-data.install


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-ugene (52.1+dfsg-2) unstable; urgency=medium
+ugene (52.1+dfsg-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Install plugins_checker


=====================================
debian/control
=====================================
@@ -7,21 +7,21 @@ Uploaders: Steffen Moeller <moeller at debian.org>,
 Section: science
 Priority: optional
 Build-Depends: architecture-is-64-bit,
-               qtbase5-dev,
-               libqt5websockets5-dev,
-               libqt5opengl5-dev,
-               libqt5networkauth5-dev,
-               libqt5svg5-dev,
-               qtscript5-dev,
-               qtwebengine5-dev,
-               qt5-qmake,
-               qtchooser,
-               qttools5-dev,
-               zlib1g-dev,
-               debhelper-compat (= 13),
-               libxtst-dev,
-               libsqlite3-dev,
-               libproc2-dev
+               debhelper-compat (= 13)
+Build-Depends-Arch: qtbase5-dev,
+                    libqt5websockets5-dev,
+                    libqt5opengl5-dev,
+                    libqt5networkauth5-dev,
+                    libqt5svg5-dev,
+                    qtscript5-dev,
+                    qtwebengine5-dev,
+                    qt5-qmake,
+                    qtchooser,
+                    qttools5-dev,
+                    zlib1g-dev,
+                    libxtst-dev,
+                    libsqlite3-dev,
+                    libproc2-dev
 Build-Conflicts: libqt4-dev,
                  qt4-qmake
 Standards-Version: 4.7.2


=====================================
debian/patches/do_not_build_phylip_and_psipred.patch
=====================================
@@ -1,5 +1,5 @@
 Author:  Andreas Tille <tille at debian.org>
-Last-Update: Thu, 31 Jan 2019 21:14:50 +0100
+Last-Update: 2024-04-04
 Description: Do not build phylip plugin which is removed since
  the code copy of the old version has no free license
  Also omitting psipred for the same reason


=====================================
debian/rules
=====================================
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export DH_OPTIONS
+export DH_VERBOSE=1
 
 export QT_SELECT=qt5
 
@@ -12,7 +12,7 @@ DEFINES =
 %:
 	dh $@ --buildsystem=qmake
 
-override_dh_auto_configure:
+override_dh_auto_configure-arch:
 	# exclude non-free plugins
 	dh_auto_configure -- DEFINES+="U2_APP_VERSION=$(DEB_VERSION_UPSTREAM)" \
 		QMAKE_CFLAGS_ISYSTEM= \
@@ -22,24 +22,30 @@ override_dh_auto_configure:
 		UGENE_LUPDATE=lupdate-qt5 \
 		UGENE_USE_BUNDLED_ZLIB=0 \
 		UGENE_USE_SYSTEM_SQLITE=1
-
 	find . -name Makefile.* | xargs -r sed -i '/STRIP/d'
 
-#override_dh_auto_build:
-#	$(MAKE)
+override_dh_auto_configure-indep:
+	echo "No configuration needed."
+
+override_dh_auto_build-indep:
+	echo "No build needed."
 
 execute_after_dh_auto_clean:
 	rm -rf src/_debug src/_release ugene
 	rm -f .qmake.stash
 	rm -f src/libs_3rdparty/sqlite3/Makefile src/libs_3rdparty/sqlite3/Makefile.Debug src/libs_3rdparty/sqlite3/Makefile.Release
 
-execute_after_dh_auto_install:
-	# This should be default:
-	# $(MAKE) INSTALL_ROOT=$$(pwd)/debian/$(DEB_SOURCE) install
+override_dh_auto_test-indep:
+	echo "No tests for the data package."
+
+execute_after_dh_auto_install-arch:
 	# Remove data dir which goes to ugene-data package
 	rm -rf debian/$(DEB_SOURCE)/usr/share/$(DEB_SOURCE)
 
-execute_after_dh_install:
+override_dh_auto_install-indep:
+	echo "No auto installation needed."
+
+execute_after_dh_install-arch:
 	cd debian/ugene/usr/lib/ugene && ln -s ../../share/data ./
 
 execute_after_dh_fixperms-indep:
@@ -47,5 +53,5 @@ execute_after_dh_fixperms-indep:
 	chmod -x debian/ugene-data/usr/share/ugene/data/genome_lengths/*.genome
 	rm -f debian/ugene-data/usr/share/ugene/data/license
 
-override_dh_shlibdeps:
+override_dh_shlibdeps-arch:
 	dh_shlibdeps -l$(CURDIR)/debian/tmp/usr/lib/ugene/plugins/:$(CURDIR)/debian/tmp/usr/lib/ugene:$(CURDIR)/debian/$(DEB_SOURCE)/usr/lib/$(DEB_SOURCE)/


=====================================
debian/ugene-data.install
=====================================
@@ -1 +1 @@
-debian/tmp/usr/data usr/share/ugene
+data usr/share/ugene



View it on GitLab: https://salsa.debian.org/med-team/ugene/-/compare/60b164eb265ed5548dcd0eb0ba432b4933c90c7c...501760be5c47202024a590a4780e9049661f0a0c

-- 
View it on GitLab: https://salsa.debian.org/med-team/ugene/-/compare/60b164eb265ed5548dcd0eb0ba432b4933c90c7c...501760be5c47202024a590a4780e9049661f0a0c
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/20250829/05903024/attachment-0001.htm>