[med-svn] [Git][med-team/camitk][master] Fix FTBFS during build all and build any

[Emmanuel Promayon (@promayon-guest)]

Emmanuel Promayon pushed to branch master at Debian Med / camitk


Commits:
93036fd5 by Emmanuel Promayon at 2022-02-24T14:47:01+01:00
Fix FTBFS during build all and build any

- - - - -


3 changed files:

- debian/changelog
- + debian/libcamitk5-doc.links
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+camitk (5.0.2-3) UNRELEASED; urgency=medium
+
+  * Fix FTBFS during build all and build any
+
+ -- Emmanuel Promayon <Emmanuel.Promayon at univ-grenoble-alpes.fr>  Thu, 24 Feb 2022 14:42:18 +0100
+
 camitk (5.0.2-2) unstable; urgency=medium
 
   * Add missing Copyright entry


=====================================
debian/libcamitk5-doc.links
=====================================
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/camitk-5/apidoc/html/jquery.js
\ No newline at end of file


=====================================
debian/rules
=====================================
@@ -55,9 +55,10 @@ override_dh_auto_configure:
 
 # let's be smart with doc
 override_dh_auto_build-indep:
-	$(MAKE) -C camitk-build camitk-ce-api-doc
-	# remove the javascript search field
-	rm -f camitk-build/share/camitk-$(VER_SHORT)/apidoc/html/jquery.js
+	# Building API DOC
+	dh_auto_build -- camitk-ce-api-doc
+	# Building all (required to avoid cmake error)
+	dh_auto_build 
 
 # No tests needed for docs
 override_dh_auto_test-indep:
@@ -81,7 +82,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	(cd camitk-build && xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" ctest -V --timeout 1800)
 endif
 
-# make packages
+# packages for specific arch
 override_dh_install:
 	# $(CURDIR) is the current source dir
 	# camitk dynamic library
@@ -145,12 +146,6 @@ override_dh_install:
 	dh_install -p$(pkg_qpb_dev) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libqtpropertybrowser.so usr/lib/$(DEB_HOST_MULTIARCH)
 	dh_install -p$(pkg_qpb_dev) debian/tmp/usr/include/camitk-$(VER_SHORT)/libraries/qtpropertybrowser usr/include
 
-	# api doc
-	dh_install -p$(pkg_doc) debian/tmp/usr/share/camitk-$(VER_SHORT)/apidoc usr/share/doc/camitk-$(VER_SHORT)/apidoc
-
-	# all test data excluding extra licence files (everything is already specified in d/c)
-	dh_install -p$(pkg_data) --exclude=LICENSE --autodest debian/tmp/usr/share/camitk-$(VER_SHORT)/testdata
-
 	# imp
 	dh_install -p$(pkg_imp) --autodest debian/tmp/usr/bin/camitk-imp
 	dh_install -p$(pkg_imp) --autodest debian/tmp/usr/share/applications/camitk-imp.desktop
@@ -163,6 +158,17 @@ override_dh_install:
 	dh_install -p$(pkg_asm) --autodest debian/tmp/usr/share/pixmaps/camitk-actionstatemachine.xpm
 	dh_installman -p$(pkg_asm) debian/tmp/usr/share/man/man1/camitk-actionstatemachine.1
 
+	# packages for indep arch
+	# api doc
+	dh_install -p$(pkg_doc) debian/tmp/usr/share/camitk-$(VER_SHORT)/apidoc usr/share/doc/camitk-$(VER_SHORT)/apidoc
+
+	# all test data excluding extra licence files (everything is already specified in d/c)
+	dh_install -p$(pkg_data) --exclude=LICENSE --autodest debian/tmp/usr/share/camitk-$(VER_SHORT)/testdata
+
+# required to avoid FTBFS for architecture build all or any
+override_dh_missing:
+	dh_missing --list-missing
+
 # dpkg-shlibdeps needs to know about camitk extension directories to manage inner-dependencies
 # between extensions (i.e., mml component extension depends on physicalmodel component extensions)
 # Lib dependencies can be in any extensions lib directory (viewers, component and action extensions)



View it on GitLab: https://salsa.debian.org/med-team/camitk/-/commit/93036fd5c0c5056a1016366ed0c84d3387d4a444

-- 
View it on GitLab: https://salsa.debian.org/med-team/camitk/-/commit/93036fd5c0c5056a1016366ed0c84d3387d4a444
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/20220224/f7a12061/attachment-0001.htm>