[SCM] mapserver branch, master, updated. upstream/6.4.0_rc1-129-g6023962

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 6023962cd222611d32726d3804c38a74e05fed79
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Sep 16 00:23:02 2013 +0200

    Enable verbose make output.

diff --git a/debian/changelog b/debian/changelog
index ec37a4c..c4f0dfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ mapserver (6.4.0~rc1-1) UNRELEASED; urgency=low
   * Drop patch install-ruby-mapscript.patch, applied upstream.
   * Add patch to rename WITH_THREADS to WITH_THREAD_SAFETY in INSTALL.CMAKE.
   * Add patch to install ruby mapscript into vendorarchdir instead of archdir.
+  * Enable verbose make output.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 07 Sep 2013 20:56:16 +0200
 
diff --git a/debian/rules b/debian/rules
index 5d3d7b6..2334bf3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,8 @@ MANPAGES:=$(wildcard debian/man/*.*.xml)
 
 MS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -ne 's/^\(.*\)~.*/\1/p')
 
+MAKE_VERBOSE=1
+
 COMMON_CONFIG=	-DCMAKE_INSTALL_PREFIX=/usr \
 		-DWITH_PROJ=1 \
 		-DWITH_KML=1 \
@@ -100,13 +102,13 @@ override_dh_auto_build:
 	  mv `basename $$x | sed 's/.xml$$//'` `dirname $$x` ; \
 	done
 
-	cd build && $(MAKE)
+	$(MAKE) -C build VERBOSE=$(MAKE_VERBOSE)
 
 override_dh_auto_test:
 	# msautotest submodule is not used
 
 override_dh_auto_install:
-	cd build && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp VERBOSE=$(MAKE_VERBOSE)
 
 	-mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
 	-mv -v $(CURDIR)/debian/tmp/usr/lib/libmapserver*.so* $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/

-- 
Packaging for MapServer