Author: frankie
Date: 2007-05-20 21:50:29 +0000 (Sun, 20 May 2007)
New Revision: 846

Added:
   packages/mapserver/trunk/debian/compat
Modified:
   packages/mapserver/trunk/debian/changelog
   packages/mapserver/trunk/debian/control
   packages/mapserver/trunk/debian/rules
Log:
Merging from BSP NMU


Modified: packages/mapserver/trunk/debian/changelog
===================================================================
--- packages/mapserver/trunk/debian/changelog   2007-05-19 08:42:33 UTC (rev 
845)
+++ packages/mapserver/trunk/debian/changelog   2007-05-20 21:50:29 UTC (rev 
846)
@@ -8,8 +8,13 @@
   * Removed Thomas Sondag among Uploaders (last contribute dated more than 2 
years ago).
   * Moved to libcurl4 build-deps.
   * Added a debian/README.etch for notes on backporting.
+  * Moved to debhelper compatibility level 5.
   * A new debian/control.etch file has been introduced to retain etch 
compatibility.
     All php4 related files have been maintained for the same reason. Please, 
don't remove them!
+  * Merging other relevant patches from BSP NMU 4.10.0-6.1. Thanks Luk Claes.
+       - Fixed package priority to meet overrides
+       - Fix language in description (closes: #416449)                         
                                                                  
+       - Add Dutch debconf translation (closes: #415504)                       
                                                                   
 
   [ Fabio Tranchitella ]
   * New upstream release.

Added: packages/mapserver/trunk/debian/compat
===================================================================
--- packages/mapserver/trunk/debian/compat                              (rev 0)
+++ packages/mapserver/trunk/debian/compat      2007-05-20 21:50:29 UTC (rev 
846)
@@ -0,0 +1 @@
+5

Modified: packages/mapserver/trunk/debian/control
===================================================================
--- packages/mapserver/trunk/debian/control     2007-05-19 08:42:33 UTC (rev 
845)
+++ packages/mapserver/trunk/debian/control     2007-05-20 21:50:29 UTC (rev 
846)
@@ -1,10 +1,10 @@
 Source: mapserver
 Section: devel
-Priority: extra
+Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Schuyler Erle <[EMAIL PROTECTED]>, Petter Reinholdtsen <[EMAIL 
PROTECTED]>, Paul Wise <[EMAIL PROTECTED]>, Fabio Tranchitella <[EMAIL 
PROTECTED]>, Francesco Paolo Lovergine <[EMAIL PROTECTED]>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5.0.37.2), dpatch, libcurl4-gnutls-dev | 
libcurl4-dev, libpng12-dev,
+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)
@@ -21,7 +21,7 @@
  PHP MapScript allows you to use the MapServer functionalities with php web
  scripting language.
  .
- Currently work only with php as an Apache DSO.
+ This module currently works only with php as an Apache DSO.
 
 Package: perl-mapscript
 Section: perl

Modified: packages/mapserver/trunk/debian/rules
===================================================================
--- packages/mapserver/trunk/debian/rules       2007-05-19 08:42:33 UTC (rev 
845)
+++ packages/mapserver/trunk/debian/rules       2007-05-20 21:50:29 UTC (rev 
846)
@@ -17,8 +17,8 @@
 version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
 CURDIR := $(shell pwd)
 PYVERS=$(shell pyversions -r debian/control)
-PHP4API=$(shell php-config4 --phpapi)
-PHP4DIR=$(shell php-config4 --extension-dir)
+#PHP4API=$(shell php-config4 --phpapi)
+#PHP4DIR=$(shell php-config4 --extension-dir)
 PHP5API=$(shell php-config5 --phpapi)
 PHP5DIR=$(shell php-config5 --extension-dir)
 
@@ -59,14 +59,14 @@
 
        touch configure-stamp
 
-configure-php4-stamp: patch clean-first-build
-       dh_testdir
-       ./configure $(COMMON_CONFIG) \
-               --with-php=/usr/include/php4 \
-               --with-php-regex-dir=/usr/include/php4/regex
+#configure-php4-stamp: patch clean-first-build
+#      dh_testdir
+#      ./configure $(COMMON_CONFIG) \
+#              --with-php=/usr/include/php4 \
+#              --with-php-regex-dir=/usr/include/php4/regex
+#
+#      touch configure-php4-stamp
 
-       touch configure-php4-stamp
-
 configure-php5-stamp: patch clean-first-build
        dh_testdir
        ./configure $(COMMON_CONFIG) \
@@ -123,12 +123,12 @@
 
        touch build-arch-stamp
 
-build-php4-stamp: configure-php4-stamp
-       dh_testdir
+#build-php4-stamp: configure-php4-stamp
+#      dh_testdir
+#
+#      # Build php_mapscript
+#      $(MAKE)
 
-       # Build php_mapscript
-       $(MAKE)
-
 build-php5-stamp: configure-php5-stamp
        dh_testdir
        -cd mapscript/php3 && \
@@ -172,7 +172,8 @@
 clean: unpatch clean-first-build
        dh_testdir
        dh_clean
-       -$(RM) configure-php4-stamp configure-php5-stamp build-php4-stamp 
build-php5-stamp install-arch-stamp install-indep-stamp install-php4-stamp 
install-php5-stamp
+#      -$(RM) configure-php4-stamp configure-php5-stamp build-php4-stamp 
build-php5-stamp install-arch-stamp install-indep-stamp install-php4-stamp 
install-php5-stamp
+       -$(RM) configure-php5-stamp build-php5-stamp install-arch-stamp 
install-indep-stamp install-php4-stamp install-php5-stamp
        -$(MAKE) distclean
 
 install-indep: install-indep-stamp
@@ -183,7 +184,8 @@
        dh_install -i
        touch install-indep-stamp
 
-install-arch: install-arch-stamp install-php4-stamp install-php5-stamp
+#install-arch: install-arch-stamp install-php4-stamp install-php5-stamp
+install-arch: install-arch-stamp install-php5-stamp
 install-arch-stamp: build-arch
        dh_testdir -a
        dh_testroot -a
@@ -215,20 +217,20 @@
        touch install-arch-stamp
 
 
-install-php4-stamp: build-php4-stamp
-       dh_testdir
-       dh_testroot
+#install-php4-stamp: build-php4-stamp
+#      dh_testdir
+#      dh_testroot
+#
+#      -mkdir -p debian/tmp$(PHP4DIR)
+#
+#      # php4-mapscript
+#      install -m644 mapscript/php3/php_mapscript.so \
+#              debian/tmp$(PHP4DIR)
+#
+#      echo 'misc:Depends=phpapi-'$(PHP4API) >> debian/php4-mapscript.substvars
+#                      
+#      touch install-php4-stamp
 
-       -mkdir -p debian/tmp$(PHP4DIR)
-
-       # php4-mapscript
-       install -m644 mapscript/php3/php_mapscript.so \
-               debian/tmp$(PHP4DIR)
-
-       echo 'misc:Depends=phpapi-'$(PHP4API) >> debian/php4-mapscript.substvars
-                      
-       touch install-php4-stamp
-
 install-php5-stamp: build-php5-stamp
        dh_testdir
        dh_testroot


_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to