Author: kobold Date: 2007-10-11 11:17:28 +0000 (Thu, 11 Oct 2007) New Revision: 1178
Added: packages/mapserver/trunk/debian/ruby1.8-mapscript.dirs packages/mapserver/trunk/debian/ruby1.8-mapscript.docs packages/mapserver/trunk/debian/ruby1.8-mapscript.examples packages/mapserver/trunk/debian/ruby1.9-mapscript.dirs packages/mapserver/trunk/debian/ruby1.9-mapscript.docs packages/mapserver/trunk/debian/ruby1.9-mapscript.examples Modified: packages/mapserver/trunk/debian/changelog packages/mapserver/trunk/debian/control packages/mapserver/trunk/debian/php5-mapscript.config packages/mapserver/trunk/debian/php5-mapscript.postinst packages/mapserver/trunk/debian/php5-mapscript.prerm packages/mapserver/trunk/debian/php5-mapscript.templates packages/mapserver/trunk/debian/rules Log: New upload to unstable. Modified: packages/mapserver/trunk/debian/changelog =================================================================== --- packages/mapserver/trunk/debian/changelog 2007-10-10 10:51:36 UTC (rev 1177) +++ packages/mapserver/trunk/debian/changelog 2007-10-11 11:17:28 UTC (rev 1178) @@ -1,18 +1,21 @@ -mapserver (5.0.0-1) UNRELEASED; urgency=low +mapserver (5.0.0-1) unstable; urgency=low [ Fabio Tranchitella ] * New upstream release. + * Add ruby mapscript support; thanks to Dmitry Kurochkin for the patch. + (Closes: #428247) + * Do not mangle php.ini, use the conf.d directory instead. + (Closes: #443253) [ Francesco Paolo Lovergine ] * Updated debconf templates: - debian/po/pt.po - debian/po/sv.po - (closes: #439697,#436414) + + debian/po/pt.po (Closes: #439697) + + debian/po/sv.po (Closes: #436414) [ Paul Wise ] - * Switch to the new Homepage field + * Switch to the new Homepage field. - -- Paul Wise <[EMAIL PROTECTED]> Thu, 27 Sep 2007 10:56:13 +1000 + -- Fabio Tranchitella <[EMAIL PROTECTED]> Thu, 11 Oct 2007 12:54:31 +0200 mapserver (4.10.3-1) unstable; urgency=high Modified: packages/mapserver/trunk/debian/control =================================================================== --- packages/mapserver/trunk/debian/control 2007-10-10 10:51:36 UTC (rev 1177) +++ packages/mapserver/trunk/debian/control 2007-10-11 11:17:28 UTC (rev 1178) @@ -4,10 +4,7 @@ Maintainer: Debian GIS Project <[email protected]> Uploaders: Schuyler Erle <[EMAIL PROTECTED]>, Petter Reinholdtsen <[EMAIL PROTECTED]>, Paul Wise <[EMAIL PROTECTED]>, Fabio Tranchitella <[EMAIL PROTECTED]>, Francesco Paolo Lovergine <[EMAIL PROTECTED]>, Andreas Putzo <[EMAIL PROTECTED]> Standards-Version: 3.7.2 -Build-Depends: debhelper (>= 5.0.37.2), dpatch, libcurl4-gnutls-dev, libpng12-dev, - zlib1g-dev (>= 1.1.4), libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9), - libjpeg62-dev, libgdal1-dev (>=1.4.0), proj, libwww-dev, libpq-dev, php5-dev, swig, - python-all, python-all-dev, python-central (>= 0.5), libgeos-dev (>= 2.2.3-2) +Build-Depends: debhelper (>= 5.0.37.2), dpatch, libcurl4-gnutls-dev, libpng12-dev, zlib1g-dev (>= 1.1.4), libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9), libjpeg62-dev, libgdal1-dev (>=1.4.0), proj, libwww-dev, libpq-dev, php5-dev, swig, python-all, python-all-dev, python-central (>= 0.5), libgeos-dev (>= 2.2.3-2), ruby1.8, ruby1.8-dev, ruby1.9, ruby1.9-dev Build-Depends-Indep: python-docutils Build-Conflicts: libcurl3-openssl-dev XS-Python-Version: all @@ -79,3 +76,21 @@ supports Open Geospatial Consortium (OGC) standards. Scripting functionality in MapScript is provided by the suggested mapscript library packages. + +Package: ruby1.8-mapscript +Section: devel +Architecture: any +Depends: ${shlibs:Depends} +Suggests: mapserver-bin, mapserver-doc +Provides: ruby-mapscript +Description: Ruby MapServer library + Ruby MapScript provides MapServer functions for Ruby scripts. + +Package: ruby1.9-mapscript +Section: devel +Architecture: any +Depends: ${shlibs:Depends} +Suggests: mapserver-bin, mapserver-doc +Provides: ruby-mapscript +Description: Ruby MapServer library + Ruby MapScript provides MapServer functions for Ruby scripts. Modified: packages/mapserver/trunk/debian/php5-mapscript.config =================================================================== --- packages/mapserver/trunk/debian/php5-mapscript.config 2007-10-10 10:51:36 UTC (rev 1177) +++ packages/mapserver/trunk/debian/php5-mapscript.config 2007-10-11 11:17:28 UTC (rev 1178) @@ -17,7 +17,7 @@ # installed after the module was. if [ -n "$2" ] && dpkg --compare-versions "$2" ge 4:4.3.2+rc3-2 then - if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*php_mapscript.so" "/etc/$phpver/$SAPI/php.ini" + if -f "/etc/$phpver/$SAPI/conf.d/mapscript.ini" then db_set $phpver/extension_mapscript_$SAPI true else Modified: packages/mapserver/trunk/debian/php5-mapscript.postinst =================================================================== --- packages/mapserver/trunk/debian/php5-mapscript.postinst 2007-10-10 10:51:36 UTC (rev 1177) +++ packages/mapserver/trunk/debian/php5-mapscript.postinst 2007-10-11 11:17:28 UTC (rev 1178) @@ -15,12 +15,11 @@ for SAPI in apache apache2 do - if [ -f /etc/$phpver/$SAPI/php.ini ]; then + if [ -f /etc/$phpver/$SAPI/php.ini ] && [ -e /etc/$phpver/$SAPI/conf.d]; then db_get $phpver/extension_mapscript_$SAPI - if [ "$RET" = "true" ] \ - && ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*php_mapscript.so" /etc/$phpver/$SAPI/php.ini + if [ "$RET" = "true" ] && ! -f /etc/$phpver/$SAPI/conf.d/mapscript.ini then - echo "extension=php_mapscript.so" >> /etc/$phpver/$SAPI/php.ini + echo "extension=php_mapscript.so" > /etc/$phpver/$SAPI/conf.d/mapscript.ini fi fi done Modified: packages/mapserver/trunk/debian/php5-mapscript.prerm =================================================================== --- packages/mapserver/trunk/debian/php5-mapscript.prerm 2007-10-10 10:51:36 UTC (rev 1177) +++ packages/mapserver/trunk/debian/php5-mapscript.prerm 2007-10-11 11:17:28 UTC (rev 1178) @@ -8,8 +8,6 @@ exit 0 fi -EXTENSIONRE="^[[:space:]]*extension[[:space:]]*=[[:space:]]*php_mapscript.so" - . /usr/share/debconf/confmodule phpver=php5 @@ -18,8 +16,7 @@ do # Use the same question for all extensions, because it's only # used once per package: right here. - if [ -f "/etc/$phpver/$SAPI/php.ini" ] \ - && grep -q "$EXTENSIONRE" /etc/$phpver/$SAPI/php.ini + if [ -f "/etc/$phpver/$SAPI/php.ini" ] && -f /etc/$phpver/$SAPI/conf.d/mapscript.ini then db_set $phpver-mapscript/remove_extension true db_title "PHP" @@ -30,12 +27,7 @@ db_get $phpver-mapscript/remove_extension if [ "$RET" = "true" ]; then - grep -v "$EXTENSIONRE" < /etc/$phpver/$SAPI/php.ini \ - > /etc/$phpver/$SAPI/php.ini.mapscriptremove - chmod --reference=/etc/$phpver/$SAPI/php.ini \ - /etc/$phpver/$SAPI/php.ini.mapscriptremove - mv /etc/$phpver/$SAPI/php.ini.mapscriptremove \ - /etc/$phpver/$SAPI/php.ini + rm -f /etc/$phpver/$SAPI/conf.d/mapscript.ini fi db_fset $phpver-mapscript/remove_extension seen false fi Modified: packages/mapserver/trunk/debian/php5-mapscript.templates =================================================================== --- packages/mapserver/trunk/debian/php5-mapscript.templates 2007-10-10 10:51:36 UTC (rev 1177) +++ packages/mapserver/trunk/debian/php5-mapscript.templates 2007-10-11 11:17:28 UTC (rev 1178) @@ -1,24 +1,15 @@ -# These templates have been reviewed by the debian-l10n-english -# team -# -# If modifications/additions/rewording are needed, please ask -# [EMAIL PROTECTED] for advice. -# -# Even minor modifications require translation updates and such -# changes should be coordinated with translators and reviewers. - Template: php5-mapscript/add_extension Type: boolean Default: true -_Description: Should ${extname} support be added for ${sapiconfig}? - You are installing ${extname} support for PHP5, but it is not yet - enabled in /etc/php5/${sapiconfig}/php.ini. Enabling this extension - will allow PHP5 scripts to use it. +_Description: Should ${extname} be added to /etc/php5/${sapiconfig}/php.ini? + You are installing ${extname} support for php5 and it is not yet + enabled in the configuration for the ${sapiconfig} SAPI. Enabling + this extension will allow php5 scripts to use it. Template: php5-mapscript/remove_extension Type: boolean Default: true -_Description: Should ${extname} support be removed for ${sapiconfig}? - You are removing ${extname} support for PHP5, but it is still - enabled in /etc/php5/${sapiconfig}/php.ini. Leaving this in place +_Description: Should ${extname} be removed from /etc/php5/${sapiconfig}/php.ini? + You are removing ${extname} support for php5, but it is still enabled + in the configuration for the ${sapiconfig} SAPI. Leaving this in place will probably cause problems when trying to use PHP. Added: packages/mapserver/trunk/debian/ruby1.8-mapscript.dirs =================================================================== --- packages/mapserver/trunk/debian/ruby1.8-mapscript.dirs (rev 0) +++ packages/mapserver/trunk/debian/ruby1.8-mapscript.dirs 2007-10-11 11:17:28 UTC (rev 1178) @@ -0,0 +1 @@ +usr/lib/ruby/1.8 Added: packages/mapserver/trunk/debian/ruby1.8-mapscript.docs =================================================================== --- packages/mapserver/trunk/debian/ruby1.8-mapscript.docs (rev 0) +++ packages/mapserver/trunk/debian/ruby1.8-mapscript.docs 2007-10-11 11:17:28 UTC (rev 1178) @@ -0,0 +1 @@ +mapscript/ruby/README Added: packages/mapserver/trunk/debian/ruby1.8-mapscript.examples =================================================================== --- packages/mapserver/trunk/debian/ruby1.8-mapscript.examples (rev 0) +++ packages/mapserver/trunk/debian/ruby1.8-mapscript.examples 2007-10-11 11:17:28 UTC (rev 1178) @@ -0,0 +1 @@ +mapscript/ruby/examples/* Added: packages/mapserver/trunk/debian/ruby1.9-mapscript.dirs =================================================================== --- packages/mapserver/trunk/debian/ruby1.9-mapscript.dirs (rev 0) +++ packages/mapserver/trunk/debian/ruby1.9-mapscript.dirs 2007-10-11 11:17:28 UTC (rev 1178) @@ -0,0 +1 @@ +usr/lib/ruby/1.9 Added: packages/mapserver/trunk/debian/ruby1.9-mapscript.docs =================================================================== --- packages/mapserver/trunk/debian/ruby1.9-mapscript.docs (rev 0) +++ packages/mapserver/trunk/debian/ruby1.9-mapscript.docs 2007-10-11 11:17:28 UTC (rev 1178) @@ -0,0 +1 @@ +mapscript/ruby/README Added: packages/mapserver/trunk/debian/ruby1.9-mapscript.examples =================================================================== --- packages/mapserver/trunk/debian/ruby1.9-mapscript.examples (rev 0) +++ packages/mapserver/trunk/debian/ruby1.9-mapscript.examples 2007-10-11 11:17:28 UTC (rev 1178) @@ -0,0 +1 @@ +mapscript/ruby/examples/* Modified: packages/mapserver/trunk/debian/rules =================================================================== --- packages/mapserver/trunk/debian/rules 2007-10-10 10:51:36 UTC (rev 1177) +++ packages/mapserver/trunk/debian/rules 2007-10-11 11:17:28 UTC (rev 1178) @@ -14,6 +14,7 @@ version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*') CURDIR := $(shell pwd) PYVERS=$(shell pyversions -r debian/control) +RUBYVERS=1.8 1.9 PHP5API=$(shell php-config5 --phpapi) PHP5DIR=$(shell php-config5 --extension-dir) @@ -78,14 +79,10 @@ rst2html $(rstoptions) mapscript/doc/mapscript.txt > html/mapscript.html rst2html $(rstoptions) mapscript/doc/python.txt > html/python.html rst2html $(rstoptions) mapscript/doc/querying-HOWTO.txt > html/querying-HOWTO.html - rst2html $(rstoptions) rfc/ms-rfc-1.txt > html/ms-rfc-1.html - rst2html $(rstoptions) rfc/ms-rfc-2.txt > html/ms-rfc-2.html - rst2html $(rstoptions) rfc/ms-rfc-3.txt > html/ms-rfc-3.html - rst2html $(rstoptions) rfc/ms-rfc-4.txt > html/ms-rfc-4.html - rst2html $(rstoptions) rfc/ms-rfc-5.txt > html/ms-rfc-5.html - rst2html $(rstoptions) rfc/ms-rfc-6.txt > html/ms-rfc-6.html - rst2html $(rstoptions) rfc/ms-rfc-7.txt > html/ms-rfc-7.html - rst2html $(rstoptions) rfc/ms-rfc-8.txt > html/ms-rfc-8.html + for i in rfc/ms-rfc*.txt; do \ + html=`echo $$i | sed -e 's/rfc/html/g'`; \ + rst2html $(rstoptions) $$i > $$html; \ + done cp mapscript/doc/default.css html cp mapscript/doc/mapscript.css html @@ -108,6 +105,13 @@ cd $(CURDIR)/mapscript/python && \ set -e; for python in $(PYVERS); do $$python setup.py build; done + # Build ruby + cd $(CURDIR)/mapscript/ruby && set -e ; \ + for v in $(RUBYVERS) ; do \ + ruby$$v extconf.rb && $(MAKE) && \ + mv mapscript.so ruby$$v-mapscript.so ; \ + done + touch build-arch-stamp build-php5-stamp: configure-php5-stamp @@ -132,6 +136,8 @@ -cd mapscript/python && \ for python in $(PYVERS); do $$python setup.py clean; done -$(RM) -rf mapscript/python/build + -cd mapscript/ruby && $(MAKE) distclean + -$(RM) -rf mapscript/ruby/mapscript_wrap.c -$(RM) mapscriptvars -$(RM) mapscript/perl/mapscript.i \ @@ -188,6 +194,12 @@ $$python setup.py install --root=$(CURDIR)/debian/python-mapscript ; \ done + # Ruby mapscript + for v in $(RUBYVERS) ; do \ + install -m 644 $(CURDIR)/mapscript/ruby/ruby$$v-mapscript.so \ + $(CURDIR)/debian/ruby$$v-mapscript/usr/lib/ruby/$$v/mapscript.so ; \ + done + # Mapserver Binary install -m755 legend scalebar shp2img shptree \ shptreetst shptreevis sortshp tile4ms \ _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
