@@ -1,3 +1,9 @@

+libkolabxml (1.2~dev20160909-0~kolab7) unstable; urgency=low

+

+  * Fix warnings caused by duplicate configuration-file symlinks

+

+ -- Christoph Erhardt <kolab@sicherha.de>  Sun, 04 Jun 2017 12:02:01 +0200

+

 libkolabxml (1.2~dev20160909-0~kolab6) unstable; urgency=low

   * Prioritize kolabformat library appropriately

​

@@ -6,13 +6,17 @@

 #DEBHELPER#

 if [ -d "/etc/php/7.0/mods-available" ]; then

-    inidir=/etc/php/7.0/mods-available

+    basedir=/etc/php/7.0

+    inidir=${basedir}/mods-available

 elif [ -d "/etc/php/mods-available" ]; then

-    inidir=/etc/php/mods-available

+    basedir=/etc/php

+    inidir=${basedir}/mods-available

 elif [ -d "/etc/php5/mods-available" ]; then

-    inidir=/etc/php5/mods-available

+    basedir=/etc/php5

+    inidir=${basedir}/mods-available

 else

-    inidir=/etc/php5/conf.d/

+    basedir=/etc/php5

+    inidir=${basedir}/conf.d

 fi

 module=kolabformat

@@ -42,6 +46,19 @@

        fi

    fi

+   # Remove module symlinks with wrong priority possibly left over from an old

+   # installation

+   if [ -x "$(which phpquery 2>/dev/null)" ]; then

+       sapis=$(phpquery -S)

+   elif [ -x "$(which php5query 2>/dev/null)" ]; then

+       sapis=$(php5query -S)

+   fi

+   for sapi in ${sapis}; do

+       if [ -L ${basedir}/${sapi}/conf.d/20-${inifile} ]; then

+           rm ${basedir}/${sapi}/conf.d/20-${inifile}

+       fi

+   done

+

    # Enable the module

    if [ -x "$(which phpenmod 2>/dev/null)" ]; then

        phpenmod ${module}/${priority:-20}

​

@@ -2,7 +2,7 @@

 Source: libkolabxml

 Binary: libkolabxml1v5, php-kolabformat, python-kolabformat, libkolabxml-dev

 Architecture: any

-Version: 1.2~dev20160909-0~kolab6

+Version: 1.2~dev20160909-0~kolab7

 Maintainer: Kolab Systems AG <contact@kolabsystems.com>

 Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>

 Homepage: http://git.kolab.org/libkolabxml

@@ -21,11 +21,11 @@

                python-dev,

                swig (>= 2.0),

                xsdcxx

-Package-List:

+Package-List: 

  libkolabxml-dev deb libdevel optional

  libkolabxml1v5 deb libs optional

  php-kolabformat deb libs optional

  python-kolabformat deb python optional

-Files:

+Files: 

  00000000000000000000000000000000 0 libkolabxml-1.2.tar.gz

  00000000000000000000000000000000 0 debian.tar.gz

​