Request 2791 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 2791 (accepted)

Update libkolab

Created by vanmeeuwen over 3 years ago
In state accepted

Submit libkolab

Submit package Kolab:Winterfell / libkolab to package Kolab:16 / libkolab

libkolab.spec Changed

debian.changelog Changed

debian.control Changed

@@ -6,15 +6,16 @@
 Build-Depends:
 	cmake,
 	debhelper,
+	libcurl4-gnutls-dev,
 	libboost-dev,
-	libboost-program-options-dev,
 	libboost-thread-dev,
 	libboost-system-dev,
-	libcalendaring-dev (>= 4.9.1),
-	libcurl4-gnutls-dev,
 	libkolabxml-dev (>= 1.0),
 	libossp-uuid-dev,
-	libqt4-dev,
+    qtbase5-dev,
+    libkf5coreaddons-dev,
+    libkf5calendarcore-dev,
+    libkf5mime-dev,
 	libxerces-c-dev,
 	php-cgi | php5-cli,
 	php-dev | php5-dev,
@@ -30,7 +31,7 @@
 Standards-Version: 3.9.3
 Homepage: http://git.kolab.org/libkolab
 
-Package: libkolab2
+Package: libkolab3
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, libkolabxml1v5 (>= 1.0)
 Conflicts: libkolab0
@@ -53,10 +54,9 @@
 
 Package: php-kolab
 Architecture: any
-Depends: libkolab2 (>= ${binary:Version}),
+Depends: libkolab3 (>= ${binary:Version}),
 	php-kolabformat,
 	ucf,
-	libcalendaring (>= 4.9.1),
 	${php:Depends},
 	${misc:Depends},
 	${shlibs:Depends}
@@ -72,7 +72,7 @@
 Package: python-kolab
 Architecture: any
 Section: python
-Depends: libkolab2 (= ${binary:Version}),
+Depends: libkolab3 (= ${binary:Version}),
 	python,
 	${misc:Depends},
 	${shlibs:Depends}
@@ -87,8 +87,7 @@
 Package: libkolab-dev
 Section: libdevel
 Architecture: any
-Depends: libkolab2 (= ${binary:Version}),
-         libcalendaring-dev (>= 4.9.1),
+Depends: libkolab3 (= ${binary:Version}),
          ${misc:Depends}
 Conflicts: libkolab-kde-dev
 Description: Development package for Kolab library

debian.rules Changed

@@ -28,7 +28,7 @@
 			echo "" >> debian/control ; \
 			echo "Package: plesk-php$${shver}-kolab" >> debian/control ; \
 			echo "Architecture: amd64" >> debian/control ; \
-			echo "Depends: libkolab2, plesk-php$${shver}" >> debian/control ; \
+			echo "Depends: libkolab3, plesk-php$${shver}" >> debian/control ; \
 			echo "Provides: php-bindings-libkolab" >> debian/control ; \
 			echo "Description: Kolab library bindings for Plesk PHP $${version}" >> debian/control ; \
 			echo "" >> debian/control ; \
@@ -78,8 +78,8 @@
 			fi ; \
 			dh_auto_configure --builddirectory php-$${version} -- \
 				-DLIB_INSTALL_DIR=/usr/lib \
+                -DBoost_NO_BOOST_CMAKE=TRUE \
 				-DSWIG=/usr/bin/swig \
-				-DUSE_LIBCALENDARING=ON \
 				-DPHP_BINDINGS=ON \
 				-DPHP_INCLUDE_DIR=$$(/opt/plesk/php/$${version}/bin/php-config --include-dir) \
 				-DPHP_CONFIG_EXECUTABLE=/opt/plesk/php/$${version}/bin/php-config \
@@ -97,13 +97,13 @@
 
 	dh_auto_configure -- \
 		-DLIB_INSTALL_DIR=/usr/lib \
+        -DBoost_NO_BOOST_CMAKE=TRUE \
 		-DPHP_BINDINGS=ON \
 		-DPHP_INSTALL_DIR=$(PHPEXT) \
 		-DPHP_EXECUTABLE=$(PHPBIN) \
 		-DPHP_INCLUDE_DIR=$(PHPINC) \
 		-DPYTHON_BINDINGS=ON \
-		-DPYTHON_INSTALL_DIR=$(PYTHON_SITEARCH) \
-		-DUSE_LIBCALENDARING=ON
+		-DPYTHON_INSTALL_DIR=$(PYTHON_SITEARCH)
 
 override_dh_install:
 	# Install the PHP modules manually, because they depend on PHP the API version,

debian.tar.gz/libkolab-kde-dev.install Deleted

debian.tar.gz/libkolab-kde2.install Deleted

debian.tar.gz/libkolab-kde2.lintian-overrides Deleted

debian.tar.gz/libkolab-kde2.shlibs Deleted

debian.tar.gz/libkolab2.install Deleted

debian.tar.gz/libkolab2.lintian-overrides Deleted

debian.tar.gz/libkolab2.shlibs Deleted

debian.tar.gz/libkolab3.install Added

debian.tar.gz/libkolab3.lintian-overrides Added

debian.tar.gz/libkolab3.shlibs Added

libkolab-2.0.tar.gz -> libkolab-3.0.0.tar.gz Changed

libkolab.dsc Changed

@@ -1,8 +1,8 @@
 Format: 1.0
 Source: libkolab
-Binary: libkolab2, php-kolab, python-kolab, libkolab-dev
+Binary: libkolab3, php-kolab, python-kolab, libkolab-dev
 Architecture: any
-Version: 2.0~dev20151230-0~kolab16
+Version: 3.0~dev20151230-0~kolab16
 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
 Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
 Homepage: http://git.kolab.org/libkolab
@@ -10,15 +10,16 @@
 Build-Depends:
 	cmake,
 	debhelper,
+	libcurl4-gnutls-dev,
 	libboost-dev,
-    libboost-program-options-dev,
 	libboost-thread-dev,
 	libboost-system-dev,
-	libcalendaring-dev (>= 4.9.1),
-	libcurl4-gnutls-dev,
 	libkolabxml-dev (>= 1.0),
 	libossp-uuid-dev,
-	libqt4-dev,
+    qtbase5-dev,
+    libkf5coreaddons-dev,
+    libkf5calendarcore-dev,
+    libkf5mime-dev,
 	libxerces-c-dev,
     php-cgi | php5-cli,
 	php-dev | php5-dev,
@@ -36,5 +37,5 @@
  php-kolab deb libs optional
  python-kolab deb python optional
 Files:
- 00000000000000000000000000000000 0 libkolab-2.0.tar.gz
+ 00000000000000000000000000000000 0 libkolab-3.0.0.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

Build Results
RPM Lint

Refresh

Comments for request 2791 0

Request History

vanmeeuwen created request over 3 years ago

Update libkolab

vanmeeuwen accepted review over 3 years ago

vanmeeuwen approved review over 3 years ago

vanmeeuwen accepted request over 3 years ago