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

[Sean Finney]

Author: seanius
Date: 2008-06-30 19:53:45 +0000 (Mon, 30 Jun 2008)
New Revision: 1104

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/libapache2-mod-php5filter.load
   php5/trunk/debian/rules
Log:
rename php5filter module to allow for debug symbols that don't conflict


Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-06-30 19:41:58 UTC (rev 1103)
+++ php5/trunk/debian/changelog	2008-06-30 19:53:45 UTC (rev 1104)
@@ -27,6 +27,8 @@
   * At the suggestion of Stefan Esser, try replacing two specific references
     of size_t* with char*, due to possible alignment problems on some
     architectures.
+  * Rename the apache2 filter module to libphp5filter.so, to prevent
+    conflicting filenames for symbols in the debug package.
 
  -- Raphael Geissert <atomo64 at gmail.com>  Thu, 19 Jun 2008 23:34:39 -0500
 

Modified: php5/trunk/debian/libapache2-mod-php5filter.load
===================================================================
--- php5/trunk/debian/libapache2-mod-php5filter.load	2008-06-30 19:41:58 UTC (rev 1103)
+++ php5/trunk/debian/libapache2-mod-php5filter.load	2008-06-30 19:53:45 UTC (rev 1104)
@@ -1 +1 @@
-LoadModule php5_module /usr/lib/apache2/modules/libphp5.so
+LoadModule php5_module /usr/lib/apache2/modules/libphp5filter.so

Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules	2008-06-30 19:41:58 UTC (rev 1103)
+++ php5/trunk/debian/rules	2008-06-30 19:53:45 UTC (rev 1104)
@@ -359,7 +359,7 @@
 	# Add here commands to install the package into debian/php5.
 	# install apache2 DSO filter module
 	cp apache2filter-build/.libs/libphp5.so \
-		debian/libapache2-mod-php5filter/`apxs2 -q LIBEXECDIR`/
+		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
 	cp debian/libapache2-mod-php5filter.conf \