Manually merge experimental branch

1 files changed, 19 insertions, 15 deletions

diff --git a/debian/rules b/debian/rules
index 5a1479b2b..44d4c42f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -296,8 +296,7 @@ configure-apache2-stamp: prepared-stamp
 		--with-imap=shared,/usr \
 		--with-imap-ssl \
 		--enable-intl=shared \
-		--with-ttf=shared,/usr \
-		--with-t1lib=shared,/usr \
+		--without-t1lib \
 		--with-ldap=shared,/usr \
 		--with-ldap-sasl=/usr \
 		--with-mcrypt=shared,/usr \
@@ -451,6 +450,9 @@ endif
 	# clean up autogenerated cruft
 	cat debian/modulelist | while read package extname dsoname priority; do \
 		rm -f debian/php5-$$package.postinst; \
+		rm -f debian/php5-$$package.preinst; \
+		rm -f debian/php5-$$package.prerm; \
+		rm -f debian/php5-$$package.postrm; \
 	done
 	for sapi in libapache2-mod-php5 libapache2-mod-php5filter php5-cgi php5-cli php5-fpm; do \
 		for cruft in postrm links; do \
@@ -547,7 +549,8 @@ install: build
 		install -m 644 -o root -g root \
 			$${modulepath}/$$dsoname.so \
 			debian/php5-$$package$${ext}/$$dsoname.so; \
-		rm debian/libapache2-mod-php5/$${ext}/$$dsoname.so; \
+		rm $${modulepath}/$$dsoname.so; \
+		echo "$$dsoname $$priority" >> debian/php5-$$package/usr/lib/php5/$$package.modules; \
 	done
 
 	# install CGI
@@ -601,6 +604,8 @@ install: build
 
 	# install common files
 	install -m755 debian/maxlifetime debian/php5-common/usr/lib/php5
+	install -m755 debian/php5enmod debian/php5-common/usr/sbin/php5enmod
+	ln -s php5enmod debian/php5-common/usr/sbin/php5dismod
 
 	# install lintian overrides
 	cp debian/php5.lintian-overrides $(CURDIR)/debian/php5-common/usr/share/lintian/overrides/php5-common
@@ -657,25 +662,24 @@ binary-arch: build install
 	# generate the maintscripts for various php
 	# modules from the templates.
 	cat debian/modulelist | while read package extname dsoname priority; do \
-		if [ -z "$$dsoname" ]; then dsoname=$$package; fi; \
-		sed -e"s/@extname@/$$extname/g; s/@dsoname@/$$dsoname/g; \
-		       /#EXTRA#/ r debian/php5-$${package}.postinst.extra" \
-		  < debian/php5-module.postinst \
-		| sed -e'/#EXTRA#/ d' \
-		  > debian/php5-$${package}.postinst; \
-		c=`grep -vE '^(#|set|$$|exit 0)' < debian/php5-$${package}.postinst | wc -l`; \
-		[ "$$c" != "0" ] || $(RM) debian/php5-$${package}.postinst; \
+	    for script in postinst preinst postrm prerm; do \
+	        sed -e"s/@package@/$$package/g; \
+	               /#EXTRA#/ r debian/php5-$${package}.$${script}.extra" \
+	          < debian/php5-module.$${script} \
+	        | sed -e'/#EXTRA#/ d' \
+	          > debian/php5-$${package}.$${script}; \
+	    done; \
+	    cp debian/php5-module.triggers debian/php5-$${package}.triggers; \
 	done
 
 	# generate the config snippets for various php
 	# modules from the templates.
 	cat debian/modulelist debian/extramodulelist | while read package extname dsoname priority; do \
 		if [ -z "$$dsoname" ]; then dsoname=$$package; fi; \
-		if [ -n "$$priority" ]; then prepend="$${priority}-"; else prepend=""; fi; \
-		mkdir -p debian/php5-$$package/etc/php5/conf.d; \
+		mkdir -p debian/php5-$$package/etc/php5/mods-available; \
 		sed -e"s/@extname@/$$extname/g; s/@dsoname@/$$dsoname/g" \
 		  < debian/php5-module.ini \
-		  > debian/php5-$${package}/etc/php5/conf.d/$${prepend}$${dsoname}.ini; \
+		  > debian/php5-$${package}/etc/php5/mods-available/$${dsoname}.ini; \
 	done
 
 	# likewise, for the different sapi implementations
@@ -700,7 +704,7 @@ binary-arch: build install
 	cat debian/copyright.header LICENSE Zend/LICENSE > debian/copyright
 	dh_installdocs -s
 
-	cat debian/modulelist | while read package extname dsoname priority; do \
+	cat debian/modulelist | grep -v common | while read package extname dsoname priority; do \
 		rm -rf debian/php5-$$package/usr/share/doc/php5-$$package; \
 		ln -s php5-common debian/php5-$$package/usr/share/doc/php5-$$package; \
 	done