[mapserver] 02/09: Imported Debian patch 7.0.1-4~xenial2~php5.6
Bas Couwenberg
sebastic at debian.org
Mon Jan 16 22:39:59 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch osgeo/10.5
in repository mapserver.
commit eb1c144e509a89761898eaaafda10c69334a05db
Author: Angelos Tzotsos <gcpp.kalxas at gmail.com>
Date: Wed Dec 21 22:00:00 2016 +0200
Imported Debian patch 7.0.1-4~xenial2~php5.6
---
debian/changelog | 18 ++++++++--
debian/control | 42 +++++++++++-----------
debian/gbp.conf | 2 +-
debian/php-mapscript.prerm | 7 ----
.../{php-mapscript.docs => php5.6-mapscript.docs} | 0
...apscript.examples => php5.6-mapscript.examples} | 0
...-mapscript.install => php5.6-mapscript.install} | 0
debian/{php-mapscript.php => php5.6-mapscript.php} | 0
...apscript.postinst => php5.6-mapscript.postinst} | 4 +++
...hp-mapscript.postrm => php5.6-mapscript.postrm} | 0
debian/php5.6-mapscript.prerm | 11 ++++++
debian/rules | 12 +++----
12 files changed, 58 insertions(+), 38 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index da18b85..b05a296 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,20 @@
-mapserver (7.0.1-4) UNRELEASED; urgency=medium
+mapserver (7.0.1-4~xenial2~php5.6) xenial; urgency=medium
- * Update branch in gbp.conf & Vcs-Git URL.
+ * Rebuild for GDAL 2.1.2.
- -- Bas Couwenberg <sebastic at debian.org> Mon, 16 Jan 2017 20:43:54 +0100
+ -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Wed, 21 Dec 2016 22:00:00 +0200
+
+mapserver (7.0.1-4~xenial1~php5.6) xenial; urgency=medium
+
+ * Re-enabled PHP support, specifically for OSGeoLive.
+
+ -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Sun, 05 Jun 2016 16:48:00 +0200
+
+mapserver (7.0.1-4~xenial0) xenial; urgency=medium
+
+ * Rebuild for GDAL 2.1.0.
+
+ -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Mon, 10 May 2016 01:48:00 +0200
mapserver (7.0.1-3) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index aebd867..339490b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
Section: devel
Priority: optional
Build-Depends: debhelper (>= 9),
-# dh-php,
+ dh-php,
dpkg-dev (>= 1.16.1.1),
cmake (>= 2.8.12.1-1.2),
chrpath,
@@ -30,7 +30,7 @@ Build-Depends: debhelper (>= 9),
libxml2-dev,
libxslt1-dev,
zlib1g-dev (>= 1.1.4),
-# php-dev,
+ php5.6-dev,
pkg-config,
pkg-kde-tools,
python-all (>= 2.6.6-3~),
@@ -46,7 +46,7 @@ Build-Depends: debhelper (>= 9),
Build-Conflicts: libcurl3-openssl-dev
Standards-Version: 3.9.7
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mapserver.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mapserver.git -b osgeo/10.5
+Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mapserver.git
Homepage: http://www.mapserver.org
XS-Ruby-Versions: all
@@ -59,7 +59,7 @@ Suggests: cgi-mapserver,
mapserver-bin,
mapserver-doc,
libmapscript-perl,
-# php-mapscript,
+ php5.6-mapscript,
python-mapscript,
ruby-mapscript
Pre-Depends: ${misc:Pre-Depends}
@@ -96,7 +96,7 @@ Suggests: cgi-mapserver,
mapserver-bin,
mapserver-doc,
libmapscript-perl,
-# php-mapscript,
+ php5.6-mapscript,
python-mapscript,
ruby-mapscript
Breaks: libmapserver-6.2.1-dev (<< 6.4.0-1~),
@@ -119,7 +119,7 @@ Depends: ${shlibs:Depends},
Suggests: mapserver-bin,
mapserver-doc,
libmapscript-perl,
-# php-mapscript,
+ php5.6-mapscript,
python-mapscript,
ruby-mapscript
Description: CGI executable for MapServer
@@ -141,7 +141,7 @@ Suggests: cgi-mapserver,
mapserver-doc,
shapelib,
libmapscript-perl,
-# php-mapscript,
+ php5.6-mapscript,
python-mapscript,
ruby-mapscript
Description: MapServer utilities
@@ -158,7 +158,7 @@ Section: doc
Depends: ${misc:Depends}
Suggests: cgi-mapserver,
libmapscript-perl,
-# php-mapscript,
+ php5.6-mapscript,
python-mapscript,
ruby-mapscript
Description: documentation for MapServer
@@ -169,19 +169,19 @@ Description: documentation for MapServer
functionality in MapScript is provided by the suggested mapscript
library packages.
-#Package: php-mapscript
-#Architecture: any
-#Section: php
-#Depends: ${php:Depends},
-# ${shlibs:Depends},
-# ${misc:Depends}
-#Suggests: mapserver-bin,
-# mapserver-doc
-#Description: php-cgi module for MapServer
-# PHP MapScript provides MapServer functions for PHP scripts.
-# .
-# MapServer is a CGI-based framework for Internet map services which
-# supports Open Geospatial Consortium (OGC) standards.
+Package: php5.6-mapscript
+Architecture: any
+Section: php
+Depends: ${php:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Suggests: mapserver-bin,
+ mapserver-doc
+Description: php-cgi module for MapServer
+ PHP MapScript provides MapServer functions for PHP scripts.
+ .
+ MapServer is a CGI-based framework for Internet map services which
+ supports Open Geospatial Consortium (OGC) standards.
Package: libmapscript-perl
Architecture: any
diff --git a/debian/gbp.conf b/debian/gbp.conf
index b18402a..21d0417 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -6,7 +6,7 @@ upstream-branch = upstream
# The default name for the Debian branch is "master".
# Change it if the name is different (for instance, "debian/unstable").
-debian-branch = osgeo/10.5
+debian-branch = master
# git-import-orig uses the following names for the upstream tags.
# Change the value if you are not using git-import-orig
diff --git a/debian/php-mapscript.prerm b/debian/php-mapscript.prerm
deleted file mode 100644
index b7ec504..0000000
--- a/debian/php-mapscript.prerm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/php-mapscript.docs b/debian/php5.6-mapscript.docs
similarity index 100%
rename from debian/php-mapscript.docs
rename to debian/php5.6-mapscript.docs
diff --git a/debian/php-mapscript.examples b/debian/php5.6-mapscript.examples
similarity index 100%
rename from debian/php-mapscript.examples
rename to debian/php5.6-mapscript.examples
diff --git a/debian/php-mapscript.install b/debian/php5.6-mapscript.install
similarity index 100%
rename from debian/php-mapscript.install
rename to debian/php5.6-mapscript.install
diff --git a/debian/php-mapscript.php b/debian/php5.6-mapscript.php
similarity index 100%
rename from debian/php-mapscript.php
rename to debian/php5.6-mapscript.php
diff --git a/debian/php-mapscript.postinst b/debian/php5.6-mapscript.postinst
similarity index 63%
rename from debian/php-mapscript.postinst
rename to debian/php5.6-mapscript.postinst
index 786d689..7d4fbba 100644
--- a/debian/php-mapscript.postinst
+++ b/debian/php5.6-mapscript.postinst
@@ -7,4 +7,8 @@ set -e
#DEBHELPER#
+if [ "$1" = "configure" ]; then
+ phpenmod mapscript
+fi
+
exit 0
diff --git a/debian/php-mapscript.postrm b/debian/php5.6-mapscript.postrm
similarity index 100%
rename from debian/php-mapscript.postrm
rename to debian/php5.6-mapscript.postrm
diff --git a/debian/php5.6-mapscript.prerm b/debian/php5.6-mapscript.prerm
new file mode 100644
index 0000000..67b6436
--- /dev/null
+++ b/debian/php5.6-mapscript.prerm
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "remove" ]; then
+ phpdismod mapscript
+fi
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 2e886bb..fe3be32 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ CFLAGS += $(CPPFLAGS)
CFLAGS += $(LDFLAGS)
RUBYVERSIONS := $(shell dh_ruby --print-supported)
-#PHPAPI := $(shell php-config --phpapi)
+PHP5API := $(shell php-config5.6 --phpapi)
MANPAGES := $(wildcard debian/man/*.*.xml)
@@ -83,7 +83,7 @@ override_dh_auto_clean:
override_dh_auto_configure:
dh_auto_configure -- $(CMAKE_OPTS) \
-DWITH_PYTHON=1 \
- -DWITH_PHP=0 \
+ -DWITH_PHP=1 \
-DWITH_PERL=1 \
-DWITH_RUBY=0 \
-DWITH_JAVA=1 \
@@ -144,10 +144,10 @@ override_dh_auto_install:
# TODO: Use dh_php for substvars & mapscript.ini installation
# PHP mapscript
- #echo 'misc:Depends=phpapi-'$(PHPAPI) >> debian/php-mapscript.substvars
+ echo 'misc:Depends=phpapi-'$(PHP5API) >> debian/php5-mapscript.substvars
- #-mkdir -p debian/tmp/etc/php/7.0/mods-available/
- #install -m644 debian/mapscript.ini debian/tmp/etc/php/7.0/mods-available/
+ -mkdir -p debian/tmp/etc/php/5.6/mods-available/
+ install -m644 debian/mapscript.ini debian/tmp/etc/php/5.6/mods-available/
override_dh_installchangelogs:
dh_installchangelogs HISTORY.TXT
@@ -155,7 +155,7 @@ override_dh_installchangelogs:
override_dh_installexamples:
dh_installexamples
- #-chmod a-x $(CURDIR)/debian/php-mapscript/usr/share/doc/php-mapscript/examples/*.phtml
+ -chmod a-x $(CURDIR)/debian/php*-mapscript/usr/share/doc/php-mapscript/examples/*.phtml
override_dh_install:
dh_install --autodest --list-missing
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git
More information about the Pkg-grass-devel
mailing list