This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository geos.
commit 4d2e21f9eeee0e3aad8cb4fcad571b70858b6f45 Author: Bas Couwenberg <[email protected]> Date: Sun Mar 20 19:20:22 2016 +0100 Disable PHP support, SWIG doesn't support PHP 7 yet. --- debian/changelog | 6 ++++++ debian/control | 27 ++++++++++++------------ debian/php-geos.install | 2 ++ debian/{php5-geos.postinst => php-geos.postinst} | 2 +- debian/{php5-geos.prerm => php-geos.prerm} | 2 +- debian/php5-geos.install | 2 -- debian/rules | 13 ++++++------ 7 files changed, 31 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index a9643b7..f40bc10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +geos (3.5.0-3) UNRELEASED; urgency=medium + + * Disable PHP support, SWIG doesn't support PHP 7 yet. + + -- Bas Couwenberg <[email protected]> Sun, 20 Mar 2016 19:17:07 +0100 + geos (3.5.0-2) unstable; urgency=medium * Update Vcs-Git URL to use HTTPS. diff --git a/debian/control b/debian/control index 8421f3e..a50719d 100644 --- a/debian/control +++ b/debian/control @@ -5,12 +5,13 @@ Uploaders: Francesco Paolo Lovergine <[email protected]>, Section: science Priority: optional Build-Depends: debhelper (>= 9), +# dh-php, doxygen, swig, ruby, ruby-all-dev, - php5-dev, - phpunit, +# php-dev, +# phpunit, chrpath, dh-autoreconf, pkg-kde-tools @@ -127,17 +128,17 @@ Description: GEOS bindings for Ruby . This package contains the Ruby bindings for GEOS. -Package: php5-geos -Architecture: any -Section: web -Depends: ${shlibs:Depends}, - ${misc:Depends} -Description: GEOS bindings for PHP - GEOS provides a spatial object model and fundamental geometric - functions. It implements the geometry model defined in the - OpenGIS Consortium Simple Features Specification for SQL. - . - This package contains the PHP bindings for GEOS. +#Package: php-geos +#Architecture: any +#Section: web +#Depends: ${shlibs:Depends}, +# ${misc:Depends} +#Description: GEOS bindings for PHP +# GEOS provides a spatial object model and fundamental geometric +# functions. It implements the geometry model defined in the +# OpenGIS Consortium Simple Features Specification for SQL. +# . +# This package contains the PHP bindings for GEOS. Package: libgeos-dbg Architecture: any diff --git a/debian/php-geos.install b/debian/php-geos.install new file mode 100644 index 0000000..934e0b0 --- /dev/null +++ b/debian/php-geos.install @@ -0,0 +1,2 @@ +usr/lib/php/ +etc/php/*/mods-available/ diff --git a/debian/php5-geos.postinst b/debian/php-geos.postinst similarity index 89% rename from debian/php5-geos.postinst rename to debian/php-geos.postinst index 9c9526b..cf59ce3 100644 --- a/debian/php5-geos.postinst +++ b/debian/php-geos.postinst @@ -8,7 +8,7 @@ set -e #DEBHELPER# if [ "$1" = "configure" ]; then - php5enmod geos + phpenmod geos fi exit 0 diff --git a/debian/php5-geos.prerm b/debian/php-geos.prerm similarity index 80% rename from debian/php5-geos.prerm rename to debian/php-geos.prerm index 729b75b..07953ac 100644 --- a/debian/php5-geos.prerm +++ b/debian/php-geos.prerm @@ -5,7 +5,7 @@ set -e #DEBHELPER# if [ "$1" = "remove" ]; then - php5dismod geos + phpdismod geos fi exit 0 diff --git a/debian/php5-geos.install b/debian/php5-geos.install deleted file mode 100644 index 69987d2..0000000 --- a/debian/php5-geos.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/php5/ -etc/php5/mods-available/ diff --git a/debian/rules b/debian/rules index d9c9ccb..9f13952 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) # testrunner fails on some architectures DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) -PHP5API=$(shell php-config5 --phpapi) +#PHPAPI=$(shell php-config --phpapi) # Guessing geos version, which is required for C++ binding support VER_MAJOR=$(shell grep ^VERSION_MAJOR configure.*|cut -d= -f2) @@ -50,7 +50,7 @@ override_dh_auto_configure: debian/control --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --enable-ruby \ - --enable-php \ + --disable-php \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ $(CONFFLAGS) \ @@ -76,13 +76,14 @@ override_dh_install-arch: find debian/tmp/usr/include/geos -name "*.inl" -delete # install PHP module to version specific directory - echo 'misc:Depends=phpapi-'$(PHP5API) >> debian/php5-geos.substvars + #echo 'misc:Depends=phpapi-'$(PHPAPI) >> debian/php-geos.substvars - -mkdir -p debian/tmp/etc/php5/mods-available/ - install -m644 debian/geos.ini debian/tmp/etc/php5/mods-available/ + # TODO: Use dh_php to install geos.ini + #-mkdir -p debian/tmp/etc/php/7.0/mods-available/ + #install -m644 debian/geos.ini debian/tmp/etc/php/7.0/mods-available/ # Strip RPATH - chrpath --delete debian/tmp/usr/lib/php5/*/geos.so + #chrpath --delete debian/tmp/usr/lib/php/*/geos.so # Remove .la files find debian/tmp/usr/lib -name '*.la' -delete -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/geos.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
