[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit fdc028d3d713a86c9bf15c126d0f2f9a66585a03
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Oct 7 01:06:24 2013 +0200

    Add patch to set subdir-objects automake option for forward compatibility.

diff --git a/debian/changelog b/debian/changelog
index fddc9cc..9eb00b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low
   * Add lintian override for source-contains-prebuilt-windows-binary.
   * Use minimal dh rules, handle Multi-Arch paths.
   * Use dh-autoreconf for retooling.
+  * Add patch to set subdir-objects automake option for forward compatibility.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 05 Oct 2013 21:15:09 +0200
 
diff --git a/debian/patches/automake-subdir-objects.diff b/debian/patches/automake-subdir-objects.diff
new file mode 100644
index 0000000..cadc4b8
--- /dev/null
+++ b/debian/patches/automake-subdir-objects.diff
@@ -0,0 +1,8 @@
+--- a/third_party/Makefile.am
++++ b/third_party/Makefile.am
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = subdir-objects
++
+ AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \
+ 	      -I$(top_srcdir)/third_party/googletest-r108 \
+ 	      -I$(top_srcdir)/third_party/googletest-r108/include
diff --git a/debian/patches/series b/debian/patches/series
index 47ef8a9..f29ddde 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ geometry_test.diff
 swig.diff
 fix-ftbfs-gcc4.7.diff
 java-run-sh-shebang.diff
+automake-subdir-objects.diff

-- 
A library to manipulate KML 2.2 OGC standard files