[Pkg-php-commits] r1114 - php5/trunk/debian

[Raphael Geissert]

Author: atomo64-guest
Date: 2008-07-02 15:29:56 +0000 (Wed, 02 Jul 2008)
New Revision: 1114

Modified:
   php5/trunk/debian/libapache2-mod-php5filter.postinst
   php5/trunk/debian/libapache2-mod-php5filter.prerm
   php5/trunk/debian/rules
Log:
Also changed the name of the php5 filter config files


Modified: php5/trunk/debian/libapache2-mod-php5filter.postinst
===================================================================
--- php5/trunk/debian/libapache2-mod-php5filter.postinst	2008-07-02 06:08:37 UTC (rev 1113)
+++ php5/trunk/debian/libapache2-mod-php5filter.postinst	2008-07-02 15:29:56 UTC (rev 1114)
@@ -23,7 +23,7 @@
 
 if [ -n "$2" ]; then
 # we're upgrading. test if we're enabled, and if so, restart to reload the module.
-	if [ -e /etc/apache2/mods-enabled/php5.load ]; then
+	if [ -e /etc/apache2/mods-enabled/php5filter.load ]; then
 		reload_apache
 	fi
         exit 0
@@ -32,7 +32,7 @@
 if [ -e /etc/apache2/apache2.conf ]; then
 # Enable the module, but hide a2enmod's misleading message about apachectl
 # and force-reload the thing ourselves.
-        a2enmod php5 >/dev/null || true
+        a2enmod php5filter >/dev/null || true
 	reload_apache
 fi
 

Modified: php5/trunk/debian/libapache2-mod-php5filter.prerm
===================================================================
--- php5/trunk/debian/libapache2-mod-php5filter.prerm	2008-07-02 06:08:37 UTC (rev 1113)
+++ php5/trunk/debian/libapache2-mod-php5filter.prerm	2008-07-02 15:29:56 UTC (rev 1114)
@@ -9,7 +9,7 @@
 fi
 
 if [ -e /etc/apache2/apache2.conf ]; then
-	a2dismod php5 || true
+	a2dismod php5filter || true
 fi
 
 exit 0

Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules	2008-07-02 06:08:37 UTC (rev 1113)
+++ php5/trunk/debian/rules	2008-07-02 15:29:56 UTC (rev 1114)
@@ -361,9 +361,9 @@
 	cp apache2filter-build/.libs/libphp5.so \
 		debian/libapache2-mod-php5filter/`apxs2 -q LIBEXECDIR`/libphp5filter.so
 	cp debian/libapache2-mod-php5filter.load \
-		debian/libapache2-mod-php5filter/etc/apache2/mods-available/php5.load
+		debian/libapache2-mod-php5filter/etc/apache2/mods-available/php5filter.load
 	cp debian/libapache2-mod-php5filter.conf \
-		debian/libapache2-mod-php5filter/etc/apache2/mods-available/php5.conf
+		debian/libapache2-mod-php5filter/etc/apache2/mods-available/php5filter.conf
 
 	# sanitize php.ini file
 	cat php.ini-dist | tr "\t" " " > debian/php5-common/usr/share/php5/php.ini-dist