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

Tue Oct 8 22:34:58 UTC 2013

The following commit has been merged in the master branch:
commit 59528dc8e66cb636f738fe0c46ce997c22674ec9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Oct 7 20:17:10 2013 +0200

    Add patch headers for all patches.

diff --git a/debian/changelog b/debian/changelog
index 4693dd4..44b8046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low
   * Add patch to fix linking libtool libraries using a non-POSIX archiver.
   * Add patch to not build examples, msvc and xcode subprojects.
   * Add lintian override for incompatible-java-bytecode-format.
+  * Add patch headers for all patches.
 
  -- 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
index cadc4b8..518551d 100644
--- a/debian/patches/automake-subdir-objects.diff
+++ b/debian/patches/automake-subdir-objects.diff
@@ -1,3 +1,6 @@
+Description: Remain forward compatible with automake using subdir-objects.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-07
 --- a/third_party/Makefile.am
 +++ b/third_party/Makefile.am
 @@ -1,3 +1,5 @@
diff --git a/debian/patches/automake.diff b/debian/patches/automake.diff
index d02510e..9e5c59b 100644
--- a/debian/patches/automake.diff
+++ b/debian/patches/automake.diff
@@ -1,3 +1,6 @@
+Description: Don't fail build on warnings, don't use embedded liburiparser.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2013-10-07
 --- a/examples/engine/Makefile.am
 +++ b/examples/engine/Makefile.am
 @@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
diff --git a/debian/patches/clone.diff b/debian/patches/clone.diff
index 4916bf7..168a602 100644
--- a/debian/patches/clone.diff
+++ b/debian/patches/clone.diff
@@ -1,3 +1,6 @@
+Description: Support ia64 __clone2().
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2013-10-07
 --- a/third_party/googletest-r108/src/gtest-death-test.cc
 +++ b/third_party/googletest-r108/src/gtest-death-test.cc
 @@ -594,6 +594,13 @@ static bool StackGrowsDown() {
diff --git a/debian/patches/dont-build-all.diff b/debian/patches/dont-build-all.diff
index cfe2d81..21d9640 100644
--- a/debian/patches/dont-build-all.diff
+++ b/debian/patches/dont-build-all.diff
@@ -1,3 +1,6 @@
+Description: Don't build unneeded subprojects
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-07
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,7 +1,7 @@
diff --git a/debian/patches/feature_view_test.diff b/debian/patches/feature_view_test.diff
index 4f6c932..81a6fd0 100644
--- a/debian/patches/feature_view_test.diff
+++ b/debian/patches/feature_view_test.diff
@@ -1,3 +1,6 @@
+Description: Remove failing test.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2013-10-07
 --- a/src/kml/engine/feature_view_test.cc
 +++ b/src/kml/engine/feature_view_test.cc
 @@ -27,7 +27,6 @@
diff --git a/debian/patches/fix-ftbfs-gcc4.7.diff b/debian/patches/fix-ftbfs-gcc4.7.diff
index 480ff90..935e3aa 100644
--- a/debian/patches/fix-ftbfs-gcc4.7.diff
+++ b/debian/patches/fix-ftbfs-gcc4.7.diff
@@ -1,3 +1,7 @@
+Description: Fix building with GCC 4.7
+Author: Matthias Klose <doko at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667247
+Last-Update: 2013-10-07
 --- a/src/kml/base/file_posix.cc
 +++ b/src/kml/base/file_posix.cc
 @@ -29,6 +29,7 @@
diff --git a/debian/patches/geometry_test.diff b/debian/patches/geometry_test.diff
index d4aaaf7..5c82eee 100644
--- a/debian/patches/geometry_test.diff
+++ b/debian/patches/geometry_test.diff
@@ -1,3 +1,7 @@
+Description: Remove failing test.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626259
+Last-Update: 2013-10-07
 --- a/src/kml/dom/geometry_test.cc
 +++ b/src/kml/dom/geometry_test.cc
 @@ -356,30 +356,6 @@ TEST_F(CoordinatesTest, TestSerializeOne
diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff
index 933c8b1..0ad18d3 100644
--- a/debian/patches/hurd.diff
+++ b/debian/patches/hurd.diff
@@ -1,3 +1,7 @@
+Description: Support building on hurd-i386
+Author: Pino Toscano <pino at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=671894
+Last-Update: 2013-10-07
 --- a/third_party/googletest-r108/src/gtest-filepath.cc
 +++ b/third_party/googletest-r108/src/gtest-filepath.cc
 @@ -52,6 +52,10 @@
diff --git a/debian/patches/java-run-sh-shebang.diff b/debian/patches/java-run-sh-shebang.diff
index 57c2e77..4a226e0 100644
--- a/debian/patches/java-run-sh-shebang.diff
+++ b/debian/patches/java-run-sh-shebang.diff
@@ -1,3 +1,6 @@
+Description: Add shebang to java run example to fix lintian issue.
+Author: Bas Couwenberg <sebastic at xs4al.nl>
+Last-Update: 2013-10-07
 --- a/examples/java/run.sh
 +++ b/examples/java/run.sh
 @@ -1,3 +1,5 @@
diff --git a/debian/patches/kfreebsd.diff b/debian/patches/kfreebsd.diff
index 8f1381c..08a6971 100644
--- a/debian/patches/kfreebsd.diff
+++ b/debian/patches/kfreebsd.diff
@@ -1,3 +1,7 @@
+Description: Support building on Debian GNU/kFreeBSD.
+Author: Cyril Brulebois <kibi at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=558208
+Last-Update: 2013-10-07
 --- a/configure.ac
 +++ b/configure.ac
 @@ -27,7 +27,7 @@ dnl Which platform are we building on?
diff --git a/debian/patches/ld-as-needed.diff b/debian/patches/ld-as-needed.diff
index f6a726c..ed029da 100644
--- a/debian/patches/ld-as-needed.diff
+++ b/debian/patches/ld-as-needed.diff
@@ -1,3 +1,10 @@
+Description: Fix build with --as-needed.
+Author: Matthias Klose <doko at ubuntu.com>, Ilya Barygin <randomaction at ubuntu.com>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=605889
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=641681
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=650525
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=692055
+Last-Update: 2013-10-07
 --- a/examples/helloworld/Makefile.am
 +++ b/examples/helloworld/Makefile.am
 @@ -26,8 +26,8 @@ circlegen_SOURCES = circlegen.cc
diff --git a/debian/patches/libtool-archiver.diff b/debian/patches/libtool-archiver.diff
index 9847b2b..b90fc46 100644
--- a/debian/patches/libtool-archiver.diff
+++ b/debian/patches/libtool-archiver.diff
@@ -1,3 +1,6 @@
+Description: Fix build failure after autoreconf
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-10-07
 --- a/configure.ac
 +++ b/configure.ac
 @@ -7,6 +7,7 @@ AC_INIT(libkml, 1.3.0, http://code.googl
diff --git a/debian/patches/swig.diff b/debian/patches/swig.diff
index 9631f68..540cb94 100644
--- a/debian/patches/swig.diff
+++ b/debian/patches/swig.diff
@@ -1,3 +1,6 @@
+Description: Support swig 2.0 by disabling 1.x specific version check.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2013-10-07
 --- a/configure.ac
 +++ b/configure.ac
 @@ -86,13 +86,13 @@ AC_ARG_ENABLE(swig,

-- 
A library to manipulate KML 2.2 OGC standard files

