diff -Nru libkolabxml-1.1.2/debian/changelog libkolabxml-1.1.2/debian/changelog --- libkolabxml-1.1.2/debian/changelog 2016-03-09 11:41:52.000000000 +0000 +++ libkolabxml-1.1.2/debian/changelog 2016-04-06 00:04:36.000000000 +0000 @@ -1,3 +1,10 @@ +libkolabxml (1.1.2-0ubuntu3) xenial; urgency=medium + + * Disable php-kolabformat while swig does not support PHP7.0 (LP: #1546823). + - http://lists.kolab.org/pipermail/users/2015-December/020357.html + + -- Nishanth Aravamudan Tue, 05 Apr 2016 10:02:53 -0700 + libkolabxml (1.1.2-0ubuntu2) xenial; urgency=medium * Update symbols for all architectures diff -Nru libkolabxml-1.1.2/debian/control libkolabxml-1.1.2/debian/control --- libkolabxml-1.1.2/debian/control 2016-03-04 18:54:59.000000000 +0000 +++ libkolabxml-1.1.2/debian/control 2016-04-06 00:04:36.000000000 +0000 @@ -1,7 +1,8 @@ Source: libkolabxml Section: libs Priority: optional -Maintainer: Debian Kolab Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Kolab Maintainers Uploaders: Paul Klos , Diane Trout , Sandro Knauß Build-Depends: cmake, debhelper (>= 9), @@ -15,8 +16,6 @@ libboost-thread-dev, swig, libcurl4-gnutls-dev, - php5-dev, - php5-cli, python-dev (>= 2.7), libqt4-dev X-Python-Version: >= 2.7 @@ -40,19 +39,6 @@ This package provides serialization/deserialization from/to in-memory representations for all Kolab Objects, including input validation. -Package: php-kolabformat -Architecture: any -Depends: libkolabxml1v5 (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends}, - ${php:Depends}, - ucf -Description: PHP bindings for Kolab Format 3.0 XML parsing - Libkolabxml is the reference implementation of the Kolab XML format - For more information see the libkolabxml package. - . - This package provides PHP bindings for libkolabxml. - Package: python-kolabformat Architecture: any Section: python diff -Nru libkolabxml-1.1.2/debian/php-kolabformat.install libkolabxml-1.1.2/debian/php-kolabformat.install --- libkolabxml-1.1.2/debian/php-kolabformat.install 2016-03-04 18:54:59.000000000 +0000 +++ libkolabxml-1.1.2/debian/php-kolabformat.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -debian/kolabformat.ini usr/share/php5/kolab/ -usr/lib/php5/*/*kolabformat.so -usr/share/php/kolabformat.php diff -Nru libkolabxml-1.1.2/debian/php-kolabformat.postinst libkolabxml-1.1.2/debian/php-kolabformat.postinst --- libkolabxml-1.1.2/debian/php-kolabformat.postinst 2016-03-04 18:54:59.000000000 +0000 +++ libkolabxml-1.1.2/debian/php-kolabformat.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -#!/bin/sh - -set -e - -#EXTRA# -#DEBHELPER# - -inidir=/etc/php5/mods-available -module=kolabformat -package=php-${module} -inifile=${module}.ini -priority=30 - -if [ "$1" = "configure" ]; then - - # Register new conffile with UCF - ucf /usr/share/php5/kolab/${inifile} ${inidir}/${inifile} - ucfr --force ${package} ${inidir}/${inifile} - - # Move pre-extension manager conffile - dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} ${inidir}/${inifile} 0.8.1-3~ -- "$@"; - - if [ -f "${inidir}/${inifile}.dpkg-new" ]; then - md5sum="$(md5sum ${inidir}/${inifile}.dpkg-new | sed -e 's/ .*//')" - old_md5sum="$(md5sum ${inidir}/${inifile} | sed -e 's/ .*//')" - if [ "$md5sum" = "$old_md5sum" ]; then - mv "${inidir}/${inifile}.dpkg-new" "${inidir}/${inifile}" - fi - fi - - # Enable the module - php5enmod ${module}/${priority:-20} -fi - -exit 0 diff -Nru libkolabxml-1.1.2/debian/php-kolabformat.postrm libkolabxml-1.1.2/debian/php-kolabformat.postrm --- libkolabxml-1.1.2/debian/php-kolabformat.postrm 2016-03-04 18:54:59.000000000 +0000 +++ libkolabxml-1.1.2/debian/php-kolabformat.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -#!/bin/sh - -set -e - -#EXTRA# -#DEBHELPER# - -inidir=/etc/php5/mods-available -module=kolabformat -package=php-${module} -inifile=${module}.ini - -dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} ${inidir}/${inifile} 0.8.1-3~ -- "$@"; - -# Query which package has this conffile registered -if which ucfq >/dev/null; then -ucfp=$(ucfq -w ${inidir}/${inifile} | cut -f 2 -d:) -fi - -# Only work with the config file if it still belongs to us -if test "$ucfp" = ${package}; then - if [ "$1" = "purge" ]; then - for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist; do - rm -f ${inidir}/${inifile}${ext} - done - rm -f ${inidir}/${inifile} - if which ucf >/dev/null; then - ucf --purge ${inidir}/${inifile} - fi - if which ucfr >/dev/null; then - ucfr --purge ${package} ${inidir}/${inifile} - fi - fi -fi - -exit 0 diff -Nru libkolabxml-1.1.2/debian/php-kolabformat.preinst libkolabxml-1.1.2/debian/php-kolabformat.preinst --- libkolabxml-1.1.2/debian/php-kolabformat.preinst 2016-03-04 18:54:59.000000000 +0000 +++ libkolabxml-1.1.2/debian/php-kolabformat.preinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -#!/bin/sh - -set -e - -#EXTRA# -#DEBHELPER# - -inifile=kolabformat.ini - -dpkg-maintscript-helper mv_conffile /etc/php5/conf.d/${inifile} /etc/php5/mods-available/${inifile} 0.8.1-3~ -- "$@"; - -exit 0 diff -Nru libkolabxml-1.1.2/debian/php-kolabformat.prerm libkolabxml-1.1.2/debian/php-kolabformat.prerm --- libkolabxml-1.1.2/debian/php-kolabformat.prerm 2016-03-04 18:54:59.000000000 +0000 +++ libkolabxml-1.1.2/debian/php-kolabformat.prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -#EXTRA# -#DEBHELPER# - -module=kolabformat - -if [ "$1" = "remove" ]; then - php5dismod ${module} -fi - -exit 0 diff -Nru libkolabxml-1.1.2/debian/php-kolabformat.triggers libkolabxml-1.1.2/debian/php-kolabformat.triggers --- libkolabxml-1.1.2/debian/php-kolabformat.triggers 2016-03-04 18:54:59.000000000 +0000 +++ libkolabxml-1.1.2/debian/php-kolabformat.triggers 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -activate /etc/php5/conf.d diff -Nru libkolabxml-1.1.2/debian/rules libkolabxml-1.1.2/debian/rules --- libkolabxml-1.1.2/debian/rules 2016-03-04 18:54:59.000000000 +0000 +++ libkolabxml-1.1.2/debian/rules 2016-04-06 00:04:36.000000000 +0000 @@ -1,6 +1,5 @@ #!/usr/bin/make -f -PHPAPI := $(shell php-config --phpapi) PYTHON := $(shell pyversions -d) PYTHON_SITEARCH := $(shell python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)') @@ -13,20 +12,17 @@ dh $@ --parallel --with python2,pkgkde_symbolshelper override_dh_gencontrol: - echo "php:Depends=phpapi-${PHPAPI}" >> debian/php-kolabformat.substvars dh_gencontrol override_dh_auto_configure: dh_auto_configure -- \ - -DPHP_BINDINGS=ON \ + -DPHP_BINDINGS=OFF \ -DPYTHON_BINDINGS=ON \ -DPYTHON_INSTALL_DIR=$(PYTHON_SITEARCH) \ -DPYTHON_INCLUDE_DIR=/usr/include/$(PYTHON) \ -DPYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/lib$(PYTHON).so override_dh_install: - mkdir -p debian/tmp/usr/share/php - mv debian/tmp/usr/lib/php5/$(PHPAPI)/kolabformat.php debian/tmp/usr/share/php/kolabformat.php dh_install --fail-missing override_dh_makeshlibs: