[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 362a1fed3593a0c6fe16b95703459aa5880bc850
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 12 12:54:52 2013 +0200

    Exclude libgdal-java from dh_makeshlibs, doesn't install in default paths.

diff --git a/debian/changelog b/debian/changelog
index 8a67c33..1a098c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
   * Use versioned Breaks/Replaces instead of Conflicts/Replaces.
   * Bump dephelper compatibility to 9.
   * Install java files with mode 644.
+  * Exclude libgdal-java from dh_makeshlibs, doesn't install in default paths.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/rules b/debian/rules
index 9b74fb4..db754ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -220,9 +220,9 @@ binary-common:
 	ln -f $(CURDIR)/debian/libgdal*.symbols.i386 $(CURDIR)/debian/libgdal1h.symbols.kfreebsd-i386
 	ln -f $(CURDIR)/debian/libgdal*.symbols.amd64 $(CURDIR)/debian/libgdal1h.symbols.kfreebsd-amd64
 	# Forces failure ignoring to collect new symbols on all archs
-	dh_makeshlibs -- -c0
+	dh_makeshlibs -Xlibgdal-java -- -c0
 	# Forces failure when symbols change
-	#dh_makeshlibs
+	#dh_makeshlibs -Xlibgdal-java
 	dh_installdeb
 	dh_shlibdeps -L libgdal1h -l debian/libgdal1h/usr/lib
 	dh_gencontrol

-- 
GDAL/OGR library and tools