Kolab Groupware OBS

Changes of Revision 44

debian.rules Changed

@@ -33,7 +33,7 @@
 			echo "Description: Kolab format bindings for Plesk PHP $${version}" >> debian/control ; \
 			echo "" >> debian/control ; \
 			sed -i -e "/Files:/ i\
- plesk-php$$(echo $${version} | sed -e 's/\.//g')-kolabformat deb web extra" debian/control ; \
+ plesk-php$${shver}-kolabformat deb web extra" debian/control ; \
 			echo "opt/plesk/php/$${version}/lib/php/modules/*kolabformat.so" >> debian/plesk-php$${shver}-kolabformat.install ; \
 			echo "opt/plesk/php/$${version}/share/php/kolabformat.php" >> debian/plesk-php$${shver}-kolabformat.install ; \
 		done ; \
@@ -52,7 +52,6 @@
 			else \
 				sed -r -i -e 's/-c\+\+ -php[0-9]? -o/-c++ -php5 -o/g' src/php/CMakeLists.txt ; \
 			fi ; \
-			grep kolabformat.i src/php/CMakeLists.txt ; \
 			dh_auto_build --builddirectory php-$${version} ; \
 		done ; \
 	fi
@@ -77,12 +76,11 @@
 			else \
 				sed -r -i -e 's/-c\+\+ -php[0-9]? -o/-c++ -php5 -o/g' src/php/CMakeLists.txt ; \
 			fi ; \
-			grep kolabformat.i src/php/CMakeLists.txt ; \
 			dh_auto_configure --builddirectory php-$${version} -- \
 				-DSWIG=/usr/bin/swig \
 				-DPHP_BINDINGS=ON \
 				-DPHP_INCLUDE_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --include-dir) \
-				-DPHP_CONFIG_EXECUTABLE=/opt/plesk/bin/$${version}/bin/php-config \
+				-DPHP_CONFIG_EXECUTABLE=/opt/plesk/php/$${version}/bin/php-config \
 				-DPHP_INSTALL_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir) ; \
 		done ; \
 	fi
@@ -108,6 +106,8 @@
 		echo "debian/kolabformat.ini etc/php/7.3/mods-available" >> debian/php-kolabformat.install ; \
 	elif [ -d "/etc/php/7.2/mods-available/" ]; then \
 		echo "debian/kolabformat.ini etc/php/7.2/mods-available" >> debian/php-kolabformat.install ; \
+	elif [ -d "/etc/php/7.1/mods-available/" ]; then \
+		echo "debian/kolabformat.ini etc/php/7.1/mods-available" >> debian/php-kolabformat.install ; \
 	elif [ -d "/etc/php/7.0/mods-available/" ]; then \
 		echo "debian/kolabformat.ini etc/php/7.0/mods-available" >> debian/php-kolabformat.install ; \
 	elif [ -d "/etc/php/mods-available/" ]; then \