Kolab Groupware OBS

Changes of Revision 61

debian.rules Changed

@@ -53,7 +53,7 @@
 			else \
 				sed -r -i -e 's/-c\+\+ -php0-9? -o/-c++ -php -o/g' src/php/CMakeLists.txt ; \
 			fi ; \
-			dh_auto_build --builddirectory php-$${version} ; \
+			dh_auto_build --buildsystem cmake --builddirectory php-$${version} ; \
 		done ; \
 	fi
 
@@ -77,8 +77,7 @@
 			else \
 				sed -r -i -e 's/-c\+\+ -php0-9? -o/-c++ -php -o/g' src/php/CMakeLists.txt ; \
 			fi ; \
-			dh_auto_configure --builddirectory php-$${version} -- --configure-args \
-				"-DLIB_INSTALL_DIR=/usr/lib \
+			dh_auto_configure --buildsystem cmake --builddirectory php-$${version} -- -DLIB_INSTALL_DIR=/usr/lib \
 				-DQT5_BUILD=ON \
 				-DBoost_NO_BOOST_CMAKE=TRUE \
 				-DSWIG=/usr/bin/swig \
@@ -87,7 +86,7 @@
 				-DPHP_CONFIG_EXECUTABLE=/opt/plesk/php/$${version}/bin/php-config \
 				-DPHP_EXECUTABLE=/opt/plesk/php/$${version}/bin/php \
 				-DPHP_INCLUDE_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --include-dir) \
-				-DPHP_INSTALL_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir)" ; \
+				-DPHP_INSTALL_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir) ; \
 		done ; \
 	fi
 
@@ -145,7 +144,7 @@
 			mkdir -p debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/share/php/ ; \
 			cp -a debian/kolabformat.ini debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/etc/php.d/ ; \
 			mv -v debian/plesk-php$${shver}-kolabformat$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir)/kolabformat.php \
-				debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/share/php/kolabformat.php ; \
+				debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/share/php/kolabformat.php || exit 1; \
 			rm -rvf debian/plesk-php$${shver}-kolabformat/usr/ ; \
 			find debian/plesk-php$${shver}-kolabformat/ | sort ; \
 		done ; \
@@ -154,4 +153,5 @@
 	dh_install --list-missing
 
 override_dh_auto_test:
+    # Fails on ubuntu 20.04 and debian 10 because of missing qt libraries
 	dh_auto_test || :