[geos] 01/03: Remove disabled PHP support, has split off into separate upstream project.

Bas Couwenberg sebastic at debian.org
Tue Aug 30 12:40:48 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository geos.

commit 5a3fba437b22d4c0f523cdf19d870706591bb471
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Aug 30 14:25:59 2016 +0200

    Remove disabled PHP support, has split off into separate upstream project.
---
 debian/changelog         |  6 ++++++
 debian/control           | 16 ----------------
 debian/control.in        | 16 ----------------
 debian/geos.ini          |  1 -
 debian/php-geos.install  |  2 --
 debian/php-geos.postinst | 14 --------------
 debian/php-geos.prerm    | 11 -----------
 debian/rules             | 13 -------------
 8 files changed, 6 insertions(+), 73 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2a848da..0ff19b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+geos (3.5.0-5) UNRELEASED; urgency=medium
+
+  * Remove disabled PHP support, has split off into separate upstream project.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 30 Aug 2016 14:23:03 +0200
+
 geos (3.5.0-4) unstable; urgency=medium
 
   * Bump Standards-Version to 3.9.8, no changes.
diff --git a/debian/control b/debian/control
index f24ffd1..c28164e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,14 +5,10 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
-#               dh-php,
                doxygen,
                swig,
                ruby,
                ruby-all-dev,
-#               php-dev,
-#               phpunit,
-               chrpath,
                dh-autoreconf,
                pkg-kde-tools
 Standards-Version: 3.9.8
@@ -128,18 +124,6 @@ Description: GEOS bindings for Ruby
  .
  This package contains the Ruby 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
 Section: debug
diff --git a/debian/control.in b/debian/control.in
index 9587dad..fa0afd2 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,9 +9,6 @@ Build-Depends: debhelper (>= 9),
                swig,
                ruby,
                ruby-all-dev,
-               php5-dev,
-               phpunit,
-               chrpath,
                dh-autoreconf,
                pkg-kde-tools
 Standards-Version: 3.9.8
@@ -127,19 +124,6 @@ Description: GEOS bindings for Ruby
  .
  This package contains the Ruby bindings for GEOS.
 
-Package: php5-geos
-Architecture: any
-Section: web
-Depends: php5-common,
-         ${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
 Section: debug
diff --git a/debian/geos.ini b/debian/geos.ini
deleted file mode 100644
index e896942..0000000
--- a/debian/geos.ini
+++ /dev/null
@@ -1 +0,0 @@
-extension=geos.so
diff --git a/debian/php-geos.install b/debian/php-geos.install
deleted file mode 100644
index 934e0b0..0000000
--- a/debian/php-geos.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/php/
-etc/php/*/mods-available/
diff --git a/debian/php-geos.postinst b/debian/php-geos.postinst
deleted file mode 100644
index cf59ce3..0000000
--- a/debian/php-geos.postinst
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-#DEBHELPER#
-
-if [ "$1" = "configure" ]; then
-	phpenmod geos
-fi
-
-exit 0
diff --git a/debian/php-geos.prerm b/debian/php-geos.prerm
deleted file mode 100644
index 07953ac..0000000
--- a/debian/php-geos.prerm
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-if [ "$1" = "remove" ]; then
-	phpdismod geos
-fi
-
-exit 0
diff --git a/debian/rules b/debian/rules
index bb4ad5b..8ea15be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,6 @@ 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)
 
-#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)
 VER_MINOR=$(shell grep ^VERSION_MINOR configure.*|cut -d= -f2)
@@ -53,7 +51,6 @@ override_dh_auto_configure: debian/control
 		--host=$(DEB_HOST_GNU_TYPE) \
         	--build=$(DEB_BUILD_GNU_TYPE) \
         	--enable-ruby \
-        	--disable-php \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		$(CONFFLAGS) \
@@ -78,16 +75,6 @@ override_dh_install-arch:
 	rm -f debian/tmp/usr/include/geos.h
 	find debian/tmp/usr/include/geos -name "*.inl" -delete
 
-	# install PHP module to version specific directory
-	#echo 'misc:Depends=phpapi-'$(PHPAPI) >> debian/php-geos.substvars
-
-	# 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/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



More information about the Pkg-grass-devel mailing list