[SCM] qgis branch, master, updated. upstream/2.0.1-13442-g4a15bef

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 4be3364ae3881e26818948858a042f36d2885b49
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Sep 28 15:57:23 2013 +0200

    Don't add ldconfig calls to qgis-plugin-grass maintainer scripts.

diff --git a/debian/qgis-plugin-grass.preinst b/debian/qgis-plugin-grass.preinst
index 2f875ba..cd8da36 100755
--- a/debian/qgis-plugin-grass.preinst
+++ b/debian/qgis-plugin-grass.preinst
@@ -10,4 +10,3 @@ fi
 #DEBHELPER#
 
 exit 0
-
diff --git a/debian/rules b/debian/rules
index 1dfc923..e916a6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -168,7 +168,7 @@ override_dh_compress:
 	dh_compress --exclude=pdf
 
 override_dh_makeshlibs:
-	dh_makeshlibs -- -c0 -v$(QGIS_VERSION)
+	dh_makeshlibs -Xqgis-plugin-grass -- -c0 -v$(QGIS_VERSION)
 
 override_dh_shlibdeps:
 	dh_shlibdeps -l/usr/lib/$(GRASS)/lib

-- 
The Quantum GIS in Debian project