Kolab Groupware OBS

debian.changelog Changed

debian.control Changed

@@ -6,6 +6,7 @@
 Build-Depends:  cmake,
                 debhelper,
                 extra-cmake-modules,
+                dh-python,
                 libboost-dev,
                 libboost-system-dev,
                 libboost-thread-dev,
@@ -21,7 +22,9 @@
                 plesk-php73-dev | bash,
                 plesk-php74-dev | bash,
                 psa | bash,
-                python-dev,
+                python2-dev | python-dev,
+                python-minimal | python2-minimal,
+                python3-all-dev,
                 swig (>= 2.0),
                 xsdcxx
 X-Python-Version: >= 2.7
@@ -68,6 +71,19 @@
  .
  This package provides Python bindings for libkolabxml
 
+Package: python3-kolabformat
+Architecture: any
+Section: python
+Depends: libkolabxml1v5 (= ${binary:Version}),
+	${python3:Depends},
+	${misc:Depends},
+	${shlibs:Depends}
+Description: Python 3 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 Python 3 bindings for libkolabxml
+
 Package: libkolabxml-dev
 Section: libdevel
 Architecture: any

debian.rules Changed

@@ -4,7 +4,6 @@
 PHPBIN := $(shell php-config --php-binary)
 PHPEXT := $(shell php-config --extension-dir)
 PHPINC := $(shell php-config --include-dir)
-PYTHON_SITEARCH := $(shell python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)')
 
 PHP_VERSIONS=7.4 7.3 7.2 7.1 7.0 5.6
 
@@ -14,8 +13,8 @@
 export DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed"
 
 %:
-	python utils/zonetabconversion.py
-	dh $@ --parallel --with python2
+	python3 utils/zonetabconversion.py
+	dh $@ --parallel --with python2,python3 --buildsystem=pybuild
 
 override_dh_gencontrol:
 	echo "php:Depends=phpapi-${PHPAPI}" >> debian/php-kolabformat.substvars
@@ -78,8 +77,8 @@
 			else \
 				sed -r -i -e 's/-c\+\+ -php[0-9]? -o/-c++ -php -o/g' src/php/CMakeLists.txt ; \
 			fi ; \
-			dh_auto_configure --builddirectory php-$${version} -- \
-				-DLIB_INSTALL_DIR=/usr/lib \
+			dh_auto_configure --builddirectory php-$${version} -- --configure-args \
+				"-DLIB_INSTALL_DIR=/usr/lib \
 				-DQT5_BUILD=ON \
 				-DBoost_NO_BOOST_CMAKE=TRUE \
 				-DSWIG=/usr/bin/swig \
@@ -88,7 +87,7 @@
 				-DPHP_CONFIG_EXECUTABLE=/opt/plesk/php/$${version}/bin/php-config \
 				-DPHP_EXECUTABLE=/opt/plesk/php/$${version}/bin/php \
 				-DPHP_INCLUDE_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --include-dir) \
-				-DPHP_INSTALL_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir) ; \
+				-DPHP_INSTALL_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --extension-dir)" ; \
 		done ; \
 	fi
 
@@ -100,8 +99,8 @@
 
 	grep kolabformat.i src/php/CMakeLists.txt
 
-	dh_auto_configure -- \
-		-DLIB_INSTALL_DIR=/usr/lib \
+	dh_auto_configure -- --configure-args \
+		"-DLIB_INSTALL_DIR=/usr/lib \
 		-DQT5_BUILD=ON \
 		-DBoost_NO_BOOST_CMAKE=TRUE \
 		-DPHP_BINDINGS=ON \
@@ -109,7 +108,7 @@
 		-DPHP_EXECUTABLE=$(PHPBIN) \
 		-DPHP_INCLUDE_DIR=$(PHPINC) \
 		-DPYTHON_BINDINGS=ON \
-		-DPYTHON_INSTALL_DIR=$(PYTHON_SITEARCH)
+		-DPYTHON_INSTALL_DIR={install_dir}"
 
 override_dh_install:
 	mkdir -p debian/tmp/usr/share/php

debian.tar.gz/python-kolabformat.install Changed

debian.tar.gz/python3-kolabformat.install Added

libkolabxml.dsc Changed

Changes of Revision 60