Request 2636 (accepted)

Overview

Request 2636 (accepted)

Without 5.6, with .ini (Plesk)

Created by vanmeeuwen over 5 years ago
In state accepted

Submit libkolabxml

Submit package Kolab:Winterfell / libkolabxml to package Kolab:16 / libkolabxml

debian.changelog Changed

debian.control Changed

debian.rules Changed

@@ -33,9 +33,10 @@
 			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 ; \
+			echo "debian/kolabformat.ini opt/plesk/php/$${version}/etc/php.d" >> debian/plesk-php$${shver}-kolabformat.install ; \
 		done ; \
 	fi
 
@@ -52,7 +53,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 +77,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 +107,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 \
@@ -123,9 +124,10 @@
 				continue ; \
 			fi ; \
 			shver=$$(echo $${version} | sed -e 's/\.//g') ; \
-			echo "debian/kolabformat.ini opt/plesk/php/$${version}/etc/php.d" >> debian/plesk-php$${shver}-kolabformat.install ; \
 			make -C php-$${version} install DESTDIR=$(PWD)/debian/plesk-php$${shver}-kolabformat/ ; \
+			mkdir -p debian/plesk-php$${shver}-kolabformat/opt/plesk/php/$${version}/etc/php.d/ ; \
 			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 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 ; \
 			rm -rf debian/plesk-php$${shver}-kolabformat/usr/ ; \

libkolabxml.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2636 0

Request History

vanmeeuwen created request over 5 years ago

Without 5.6, with .ini (Plesk)

vanmeeuwen accepted review over 5 years ago

vanmeeuwen approved review over 5 years ago

vanmeeuwen accepted request over 5 years ago