Dodano brisanje /etc/php5/conf.d/mysql.ini

diff --git a/debian/changelog b/debian/changelog
index 4bf6e82..87f8d94 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+php5-cn (5.4.4+3) stable; urgency=low
+
+  * debhelper >= 9
+  * Izbaceno dodavanje ekstenzije mysql u /etc/php5/conf.d/php.ini
+  * Dodano brisanje _obsolete_ datoteke php.ini
+
+ -- Zeljko Boros <Zeljko.Boros@CARNet.hr>  Thu, 07 Nov 2013 12:41:30 +0100
+
 php5-cn (5.4.4+2) stable; urgency=low
 
   * Ispravke za lintian.

diff --git a/debian/control b/debian/control
index a5eefd6..109bddb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: php
 Priority: optional
 Maintainer: Grupa za izradu paketa <paketi@carnet.hr>
 Uploaders: Valentin Vidic <Valentin.Vidic@CARNet.hr>
-Build-Depends: debhelper (>= 7), po-debconf
+Build-Depends: debhelper (>= 9), po-debconf
 Standards-Version: 3.9.4
 
 Package: php5-cn

diff --git a/debian/postinst b/debian/postinst
index a527e5a..26cec9d 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -28,8 +28,11 @@ esac
 
 PKG="php5-cn"
 A2MODEDIR="/etc/apache2/mods-enabled"
-EXTENSIONS="mysql"
+### mysql je vec ukljucen u wheezyu
+### EXTENSIONS="mysql"
+EXTENSIONS=""
 PHP5DIR="/etc/php5"
+PHP5MODADIR="$PHP5DIR/mods-available"
 PHP5CONFD="/etc/php5/conf.d"
 PHP4DIR="/etc/php4"
 
@@ -133,6 +136,17 @@ if [ ! -d "$PHP5CONFD" ]; then
     mkdir -p $PHP5CONFD/
 fi
 
+# Brisanje obsolete datoteke mysql.ini u $PHP5CONFD
+#
+if [ -f "$PHP5CONFD/mysql.ini" ]; then
+       # just to make sure mysql is included in _new-style_ configuration
+       if [ -f "$PHP5MODADIR/mysql.ini" ]; then
+               cp_echo "CN: Removing obsolete $PHP5CONFD/mysql.ini"
+               rm -f $PHP5CONFD/mysql.ini
+       else
+               cp_echo "CN: WARNING: Obsolete $PHP5CONFD/mysql.ini present, and no $PHP5MODADIR/mysql.ini!"
+       fi
+fi
 
 # Check if PHP5 extensions are enabled.
 #