From: Zeljko Boros Date: Thu, 7 Nov 2013 12:06:38 +0000 (+0100) Subject: Dodano brisanje /etc/php5/conf.d/mysql.ini X-Git-Tag: debian/5.4.4+3^0 X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=7c5e938cf5a11f216752f9b8817623b21b95dd5d;p=php5-cn.git Dodano brisanje /etc/php5/conf.d/mysql.ini --- diff --git a/debian/changelog b/debian/changelog index 4bf6e82..87f8d94 100644 --- 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 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 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: php Priority: optional Maintainer: Grupa za izradu paketa Uploaders: Valentin Vidic -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 --- 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. #