[DebianGIS-dev] r1779 - in packages/mapserver/trunk/debian: . patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2008-09-29 13:52:00 +0000 (Mon, 29 Sep 2008)
New Revision: 1779

Removed:
   packages/mapserver/trunk/debian/patches/50_clean.dpatch
   packages/mapserver/trunk/debian/patches/70_ptrreturn.dpatch
   packages/mapserver/trunk/debian/patches/80_gdal_lib.dpatch
Modified:
   packages/mapserver/trunk/debian/changelog
   packages/mapserver/trunk/debian/control
   packages/mapserver/trunk/debian/patches/00list
Log:
New upstream release.


Modified: packages/mapserver/trunk/debian/changelog
===================================================================
--- packages/mapserver/trunk/debian/changelog	2008-09-24 14:43:09 UTC (rev 1778)
+++ packages/mapserver/trunk/debian/changelog	2008-09-29 13:52:00 UTC (rev 1779)
@@ -1,3 +1,13 @@
+mapserver (5.2.0-1) experimental; urgency=low
+
+  * New upstream release. Thanks Alan Boudreault.
+    (closes: #498547)
+  * Added libxml2-dev build-dependency.
+  * Deapplied all current patches (merged upstream).
+  * Added Alan as Uploader in debian/control.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 29 Sep 2008 15:51:35 +0200
+
 mapserver (5.0.3-3) unstable; urgency=low
 
   * Updated sv.po template.

Modified: packages/mapserver/trunk/debian/control
===================================================================
--- packages/mapserver/trunk/debian/control	2008-09-24 14:43:09 UTC (rev 1778)
+++ packages/mapserver/trunk/debian/control	2008-09-29 13:52:00 UTC (rev 1779)
@@ -2,14 +2,16 @@
 Section: devel
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Uploaders: Petter Reinholdtsen <pere at debian.org>, Paul Wise <pabs at debian.org>, Fabio Tranchitella <kobold at debian.org>, Francesco Paolo Lovergine <frankie at debian.org>, Andreas Putzo <andreas at putzo.net>
+Uploaders: Petter Reinholdtsen <pere at debian.org>, Paul Wise <pabs at debian.org>, Fabio Tranchitella <kobold at debian.org>, 
+ Francesco Paolo Lovergine <frankie at debian.org>, Andreas Putzo <andreas at putzo.net>, 
+ Alan Boudreault <aboudreault at mapgears.com>
 Standards-Version: 3.7.3
 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,
  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, 
  sharutils, libsdl1.2-dev, libfreetype6-dev, libx11-dev,
- libfcgi-dev
+ libfcgi-dev, libxml2-dev
 Build-Depends-Indep: python-docutils
 Build-Conflicts: libcurl3-openssl-dev
 XS-Python-Version: all

Modified: packages/mapserver/trunk/debian/patches/00list
===================================================================
--- packages/mapserver/trunk/debian/patches/00list	2008-09-24 14:43:09 UTC (rev 1778)
+++ packages/mapserver/trunk/debian/patches/00list	2008-09-29 13:52:00 UTC (rev 1779)
@@ -1,3 +0,0 @@
-50_clean
-70_ptrreturn
-80_gdal_lib

Deleted: packages/mapserver/trunk/debian/patches/50_clean.dpatch
===================================================================
--- packages/mapserver/trunk/debian/patches/50_clean.dpatch	2008-09-24 14:43:09 UTC (rev 1778)
+++ packages/mapserver/trunk/debian/patches/50_clean.dpatch	2008-09-29 13:52:00 UTC (rev 1779)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_clean.dpatch by Petter Reinholdtsen <pere at hungry.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make sure 'make distclean' complete the job even if config.* is
-## DP: missing.  Remove generated makefiles as well.
-
-
- at DPATCH@
-diff -urNad mapserver.orig/Makefile.in mapserver/Makefile.in
---- mapserver.orig/Makefile.in	2005-07-29 16:13:03.000000000 +0200
-+++ mapserver/Makefile.in	2005-07-29 20:11:45.357687219 +0200
-@@ -342,7 +342,8 @@
- 
- distclean:
- 	$(MAKE) clean
--	rm config.*
-+	$(RM) Makefile mapscript/java/Makefile
-+	$(RM) config.log config.status
- 	if test -d autom4te.cache ; then \
- 	  rm -f -r autom4te.cache ; \
- 	fi

Deleted: packages/mapserver/trunk/debian/patches/70_ptrreturn.dpatch
===================================================================
--- packages/mapserver/trunk/debian/patches/70_ptrreturn.dpatch	2008-09-24 14:43:09 UTC (rev 1778)
+++ packages/mapserver/trunk/debian/patches/70_ptrreturn.dpatch	2008-09-29 13:52:00 UTC (rev 1779)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70_ptrreturn.dpatch by Dann Frazier
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make sure the strptime() return value have the correct type.
-## DP: Fixes bug #328030.
-
- at DPATCH@
-diff -urN mapserver-5.0.0/maptime.c mapserver-5.0.0.debian/maptime.c
---- mapserver-5.0.0/maptime.c	2007-08-31 00:46:11.000000000 +0200
-+++ mapserver-5.0.0.debian/maptime.c	2007-09-18 04:18:39.000000000 +0200
-@@ -30,6 +30,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <time.h>
-+#include <strings.h>
- 
- #include "mapserver.h"
- #include "maptime.h"

Deleted: packages/mapserver/trunk/debian/patches/80_gdal_lib.dpatch
===================================================================
--- packages/mapserver/trunk/debian/patches/80_gdal_lib.dpatch	2008-09-24 14:43:09 UTC (rev 1778)
+++ packages/mapserver/trunk/debian/patches/80_gdal_lib.dpatch	2008-09-29 13:52:00 UTC (rev 1779)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 80_gdal_lib.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad mapserver-4.10.1~/configure mapserver-4.10.1/configure
---- mapserver-4.10.1~/configure	2007-01-10 23:51:58.000000000 +0100
-+++ mapserver-4.10.1/configure	2007-04-26 16:22:59.000000000 +0200
-@@ -9029,7 +9029,7 @@
- 
- if test -n "$GDAL_ENABLED" -o "$OGR_ENABLED"; then
- 
--  GDAL_LIB=`$GDAL_CONFIG --libs`' '`$GDAL_CONFIG --dep-libs`
-+  GDAL_LIB=`$GDAL_CONFIG --libs`
-   GDAL_INC=`$GDAL_CONFIG --cflags`
- 
- fi