[SCM] mapserver branch, master, updated. upstream/6.0.1-25-g98327ed

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 7ff73a4c7380d1c22ff838be251ae00f7210f3ba
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Mar 5 11:55:00 2012 +0100

    Let multiarch jpeg library be compatible.

diff --git a/debian/changelog b/debian/changelog
index 81af6d1..5b4af4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mapserver (6.0.1-3) unstable; urgency=low
+
+  * Let the configure script search in the system directory for jpeg stuff.
+    (closes: #661914)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 05 Mar 2012 11:53:32 +0100
+
 mapserver (6.0.1-2) unstable; urgency=low
 
   * Added missed stuff for libmapscript-perl.
diff --git a/debian/patches/series b/debian/patches/series
index 8b13789..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-
diff --git a/debian/rules b/debian/rules
index a04fff0..76eeb08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,6 @@ COMMON_CONFIG=	--prefix=/usr \
 		--with-fribidi-config \
 		--with-zlib=/usr \
 		--with-xpm=/usr \
-		--with-jpeg=/usr \
 		--with-gdal \
 		--with-ogr \
 		--with-proj \

-- 
Mapserver