Request 2016 (accepted)

Overview

Request 2016 (accepted)

No description set

Created by vanmeeuwen over 7 years ago
In state accepted
Open review for Admin

Submit libkolab

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

libkolab.spec Changed

debian.changelog Changed

debian.control Changed

@@ -16,18 +16,17 @@
 	libossp-uuid-dev,
 	libqt4-dev,
 	libxerces-c-dev,
-    php5-cli,
-	php5-dev,
+    php-cgi | php5-cli,
+	php-dev | php5-dev,
 	python-dev,
 	swig (>= 2.0)
 X-Python-Version: >= 2.7
 Standards-Version: 3.9.3
 Homepage: http://git.kolab.org/libkolab
 
-Package: libkolab0
+Package: libkolab2
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libkolabxml1 (>= 1.0)
-Conflicts: libkolab-kde0
+Depends: ${misc:Depends}, ${shlibs:Depends}, libkolabxml1v5 (>= 1.0)
 Description: Maps KDE containers to Kolab formats
  libkolab provides conversions from/to KDE containers, mime message
  handling and facilities to read and write kolabv2 and kolabv3.
@@ -46,7 +45,7 @@
 
 Package: php-kolab
 Architecture: any
-Depends: libkolab0 (= ${binary:Version}),
+Depends: libkolab2 (>= ${binary:Version}),
 	php-kolabformat,
 	ucf,
 	libcalendaring (>= 4.9.1),
@@ -64,7 +63,7 @@
 Package: python-kolab
 Architecture: any
 Section: python
-Depends: libkolab0 (= ${binary:Version}),
+Depends: libkolab2 (= ${binary:Version}),
 	python,
 	${misc:Depends},
 	${shlibs:Depends}
@@ -79,7 +78,7 @@
 Package: libkolab-dev
 Section: libdevel
 Architecture: any
-Depends: libkolab0 (= ${binary:Version}),
+Depends: libkolab2 (= ${binary:Version}),
          libcalendaring-dev (>= 4.9.1),
          ${misc:Depends}
 Conflicts: libkolab-kde-dev

debian.rules Changed

@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 
 PHPAPI := $(shell php-config --phpapi)
+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)')
 
 export DH_VERBOSE=1
@@ -12,12 +15,18 @@
 	dh $@ --parallel --with python2
 
 override_dh_auto_configure:
+	if [ $$(php-config --vernum) -gt 70000 ]; then \
+		sed -i \
+			-e 's/-c++ -php/-c++ -php7/g' \
+			-e 's|php php5|php php5 php/$(PHPAPI)|g' cmake/modules/SWIGUtils.cmake ; \
+	fi
+
 	dh_auto_configure -- \
 		-DLIB_INSTALL_DIR=/usr/lib \
 		-DPHP_BINDINGS=ON \
-		-DPHP_INSTALL_DIR=/usr/lib/php5/$(PHPAPI)/ \
-		-DPHP4_EXECUTABLE=/usr/bin/php5 \
-		-DPHP4_INCLUDE_PATH=/usr/include/php5/ \
+		-DPHP_INSTALL_DIR=$(PHPEXT) \
+		-DPHP4_EXECUTABLE=$(PHPBIN) \
+		-DPHP4_INCLUDE_PATH=$(PHPINC) \
 		-DPYTHON_BINDINGS=ON \
 		-DPYTHON_INSTALL_DIR=$(PYTHON_SITEARCH) \
 		-DUSE_LIBCALENDARING=ON
@@ -30,19 +39,23 @@
 	# Install the PHP modules manually, because they depend on PHP the API version,
 	# which has to be determined dynamically, so we can't put it into an .install file.
 	mkdir -p debian/tmp/usr/share/php
-	mv debian/tmp/usr/lib/php5/$(PHPAPI)/kolabcalendaring.php debian/tmp/usr/share/php/kolabcalendaring.php
-	mv debian/tmp/usr/lib/php5/$(PHPAPI)/kolabicalendar.php debian/tmp/usr/share/php/kolabicalendar.php
-	mv debian/tmp/usr/lib/php5/$(PHPAPI)/kolabobject.php debian/tmp/usr/share/php/kolabobject.php
-	mv debian/tmp/usr/lib/php5/$(PHPAPI)/kolabshared.php debian/tmp/usr/share/php/kolabshared.php
+	mv debian/tmp/$(PHPEXT)/dummy.php debian/tmp/usr/share/php/dummy.php
+	mv debian/tmp/$(PHPEXT)/kolabcalendaring.php debian/tmp/usr/share/php/kolabcalendaring.php
+	mv debian/tmp/$(PHPEXT)/kolabicalendar.php debian/tmp/usr/share/php/kolabicalendar.php
+	mv debian/tmp/$(PHPEXT)/kolabobject.php debian/tmp/usr/share/php/kolabobject.php
+	mv debian/tmp/$(PHPEXT)/kolabshared.php debian/tmp/usr/share/php/kolabshared.php
+	echo "$(PHPEXT)" >> debian/php-kolab.install
 	# Put kolab.ini into place
-	mkdir -p debian/tmp/usr/share/php5/kolab
-	cp debian/usr/share/php5/kolab/kolab.ini debian/tmp/usr/share/php5/kolab/
-	# Dummy plugin (workaround for #2050)
-	mkdir -p debian/tmp/usr/share/php5/kolabdummy
-	cp debian/usr/share/php5/kolabdummy/kolabdummy.ini debian/tmp/usr/share/php5/kolabdummy/
-	# End dummy plugin
+	if [ -d "/etc/php/mods-available" ]; then \
+		echo "debian/kolab.ini etc/php/mods-available" >> debian/php-kolab.install ; \
+		echo "debian/kolabdummy.ini etc/php/mods-available" >> debian/php-kolab.install ; \
+	else \
+		echo "debian/kolab.ini etc/php5/mods-available" >> debian/php-kolab.install ; \
+		echo "debian/kolabdummy.ini etc/php5/mods-available" >> debian/php-kolab.install ; \
+	fi
+
 	touch debian/tmp/$(PYTHON_SITEARCH)/kolab/__init__.py
-	# Install the packages 
+	# Install the packages
 	dh_install --list-missing
 
 override_dh_auto_test:

debian.tar.gz/kolab.ini Changed

debian.tar.gz/kolabdummy.ini Changed

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

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

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

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

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

debian.tar.gz/libkolab0.shlibs Deleted

debian.tar.gz/libkolab2.install Changed

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

debian.tar.gz/libkolab2.shlibs Added

debian.tar.gz/php-kolab.install Changed

debian.tar.gz/php-kolab.postinst Changed

@@ -7,6 +7,8 @@
 
 if [ -d "/etc/php5/mods-available" ]; then
     inidir=/etc/php5/mods-available
+elif [ -d "/etc/php/mods-available" ]; then
+    inidir=/etc/php/mods-available
 else
     inidir=/etc/php5/conf.d
 fi
@@ -35,9 +37,11 @@
 	fi
 
 	# Enable the module
-    if [ -x "$(which php5enmod 2>/dev/null)" ]; then
-    	php5enmod ${module}/${priority:-19}
-    fi
+	if [ -x "$(which $php5enmod 2>/dev/null)" ]; then
+	    php5enmod ${module}/${priority:-19}
+	elif [ -x "$(which $phpenmod 2>/dev/null)" ]; then
+	    phpenmod ${module}/${priority:-19}
+	fi
 fi
 # End dummy plugin
 
@@ -64,16 +68,18 @@
 	fi
 
 	# Enable the module
-    if [ -x "$(which php5enmod 2>/dev/null)" ]; then
-    	php5enmod ${module}/${priority:-21}
-    fi
+	if [ -x "$(which $php5enmod 2>/dev/null)" ]; then
+	    php5enmod ${module}/${priority:-21}
+	elif [ -x "$(which $phpenmod 2>/dev/null)" ]; then
+	    phpenmod ${module}/${priority:-21}
+	fi
 fi
 
 if [ "$1" = "configure" ]; then
 
 	# make sure that kolabformat.so is loaded after dummy.so, see #2050
-	sed -i "s/extension=dummy.so/extension=dummy.so\nextension=kolabformat.so/" /usr/share/php5/kolab/kolab.ini
-	sed -i "s/extension=kolabformat.so/;extension=kolabformat.so/" /usr/share/php5/kolab/kolabformat.ini
+	sed -i "s/extension=dummy.so/extension=dummy.so\nextension=kolabformat.so/" $inidir/kolab.ini || echo "cannot find $inidir/kolab.ini"
+	sed -i "s/extension=kolabformat.so/;extension=kolabformat.so/" $inidir/kolabformat.ini || echo "cannot find $inidir/kolabformat.ini"
 
 fi

debian.tar.gz/usr Deleted

debian.tar.gz/usr/share Deleted

debian.tar.gz/usr/share/php5 Deleted

debian.tar.gz/usr/share/php5/kolab Deleted

debian.tar.gz/usr/share/php5/kolabdummy Deleted

libkolab.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2016 0

Request History

vanmeeuwen created request over 7 years ago

vanmeeuwen accepted review over 7 years ago

vanmeeuwen accepted request over 7 years ago

Please add a comment