[SCM] mapserver branch, wheezy, updated. upstream/6.0.1-38-ga7b2421

Bas Couwenberg sebastic at xs4all.nl
Thu Sep 5 00:26:00 UTC 2013


The following commit has been merged in the wheezy branch:
commit 3eff63daaf4e7fcf83d932b7112a7d58bc98d1fe
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Sep 5 01:14:29 2013 +0200

    Drop -ldl patch for proposed-update.

diff --git a/debian/changelog b/debian/changelog
index 3cb88cc..c2bf124 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,6 @@ mapserver (6.0.1-4) stable-proposed-updates; urgency=low
     (closes: #663875)
 
   [ Bas Couwenberg ]
-  * Link executables with -ldl. Thanks Colin Watson for the patch.
-    (closes: #709186)
   * Cherry pick fix for strict Content-Type matching from v6.2.1:
     https://github.com/faegi/mapserver/commit/426193cf5f6b34c97cceef2aca4649c604756cd0
 
diff --git a/debian/rules b/debian/rules
index 640079f..f0aeb5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,7 +59,7 @@ MS_CXXFLAGS=$(MS_CFLAGS)
 
 configure-stamp:
 	dh_testdir
-	./configure $(COMMON_CONFIG) CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)" XTRALIBS=-ldl
+	./configure $(COMMON_CONFIG) CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)"
 
 
 	touch configure-stamp
@@ -67,7 +67,7 @@ configure-stamp:
 configure-php5-stamp: clean-first-build
 	dh_testdir
 	./configure $(COMMON_CONFIG) \
-		--with-php=/usr/include/php5  CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)" XTRALIBS=-ldl
+		--with-php=/usr/include/php5  CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)"
 
 	touch configure-php5-stamp
 

-- 
Packaging for MapServer



More information about the Pkg-grass-devel mailing list