[Pkg-php-commits] r911 - php5/branches/rg-extension-manager/debian

[Raphael Geissert]

Author: atomo64-guest
Date: 2007-10-23 23:47:08 +0000 (Tue, 23 Oct 2007)
New Revision: 911

Removed:
   php5/branches/rg-extension-manager/debian/php5-module.postrm
Modified:
   php5/branches/rg-extension-manager/debian/changelog
   php5/branches/rg-extension-manager/debian/php5-module.postinst
   php5/branches/rg-extension-manager/debian/rules
Log:
Make use of dh_phpext (which is aware of the new extensions manager)


Modified: php5/branches/rg-extension-manager/debian/changelog
===================================================================
--- php5/branches/rg-extension-manager/debian/changelog	2007-10-23 23:09:11 UTC (rev 910)
+++ php5/branches/rg-extension-manager/debian/changelog	2007-10-23 23:47:08 UTC (rev 911)
@@ -4,8 +4,9 @@
 
   [ Raphael Geissert ]
   * Added new extensions manager (see http://wiki.debian.org/PHP)
+  * Make use of dh_phpext (which is aware of the new extensions manager)
 
- -- Raphael Geissert <atomo64 at gmail.com>  Tue, 18 Sep 2007 17:10:26 -0500
+ -- Raphael Geissert <atomo64 at gmail.com>  Tue, 23 Oct 2007 18:44:56 -0500
 
 php5 (5.2.4-1) unstable; urgency=low
 

Modified: php5/branches/rg-extension-manager/debian/php5-module.postinst
===================================================================
--- php5/branches/rg-extension-manager/debian/php5-module.postinst	2007-10-23 23:09:11 UTC (rev 910)
+++ php5/branches/rg-extension-manager/debian/php5-module.postinst	2007-10-23 23:47:08 UTC (rev 911)
@@ -22,11 +22,6 @@
 	done
 fi
 
-# Enable extension on all SAPIs if @dsoname@
-if [ -x /usr/sbin/php5enext ]; then
-        /usr/sbin/php5enext all "@dsoname@" quiet nonfatal
-fi
-
 #EXTRA#
 #DEBHELPER#
 

Deleted: php5/branches/rg-extension-manager/debian/php5-module.postrm
===================================================================
--- php5/branches/rg-extension-manager/debian/php5-module.postrm	2007-10-23 23:09:11 UTC (rev 910)
+++ php5/branches/rg-extension-manager/debian/php5-module.postrm	2007-10-23 23:47:08 UTC (rev 911)
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" != "remove" ]; then
-	exit 0
-fi
-
-# Disable extension on all SAPIs if @dsoname@ is being removed
-if [ -x /usr/sbin/php5disext ]; then
-	/usr/sbin/php5disext all "@dsoname@" quiet nonfatal
-fi
-
-
-#DEBHELPER#
-
-exit 0
-

Modified: php5/branches/rg-extension-manager/debian/rules
===================================================================
--- php5/branches/rg-extension-manager/debian/rules	2007-10-23 23:09:11 UTC (rev 910)
+++ php5/branches/rg-extension-manager/debian/rules	2007-10-23 23:47:08 UTC (rev 911)
@@ -297,7 +297,6 @@
 	# clean up autogenerated cruft
 	cat debian/modulelist | while read package extname dsoname; do \
 		rm -f debian/php5-$$package.postinst; \
-		rm -f debian/php5-$$package.postrm; \
 	done
 	for sapi in libapache2-mod-php5 php5-cgi php5-cli; do \
 		for cruft in postrm; do \
@@ -447,9 +446,6 @@
 		  < debian/php5-module.postinst \
 		| sed -e'/#EXTRA#/ d' \
 		  > debian/php5-$${package}.postinst; \
-		sed -e"s/@extname@/$$extname/g; s/@dsoname@/$$dsoname/g" \
-		  < debian/php5-module.postrm \
-		  > debian/php5-$${package}.postrm; \
 	done
 
 	# generate the config snippets for various php
@@ -495,6 +491,10 @@
 	mkdir -p debian/php5-common/usr/share/linda/overrides
 	echo "Tag: non-standard-dir-perm" >> debian/php5-common/usr/share/linda/overrides/php5-common
 	echo "Data: /var/lib/php5.*" >> debian/php5-common/usr/share/linda/overrides/php5-common
+
+	# PATH needs to be extended for dh_phpext to find php-config
+	PATH="$(PATH):$(CURDIR)/debian/php5-dev/usr/bin/php-config5" \
+        PHP5COMMON_VERSION="$(PHP5_SOURCE_VERSION)" dh_phpext -r
 	dh_installdeb -s
 	dh_shlibdeps -s