[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 fafd7dc566980ce81d27e68d223043afe5d8dc19
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 5 21:37:20 2013 +0200

    Update swig.diff to also disable the SWIG version check in configure.ac.

diff --git a/debian/changelog b/debian/changelog
index 950518f..de48a97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 libkml (1.3.0~r863-5) UNRELEASED; urgency=low
 
   * Add myself to Uploaders.
+  * Update swig.diff to also disable the SWIG version check in configure.ac.
+    Thanks Ilya Barygin for the patch.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 05 Oct 2013 21:15:09 +0200
 
diff --git a/debian/patches/swig.diff b/debian/patches/swig.diff
index 06ab0c6..c8ec790 100644
--- a/debian/patches/swig.diff
+++ b/debian/patches/swig.diff
@@ -25,3 +25,28 @@ Index: git/configure
  fi
   if test "x$SWIG" != x; then
    WITH_SWIG_TRUE=
+Index: libkml-1.2.0/configure.ac
+===================================================================
+--- libkml-1.2.0.orig/configure.ac	2012-02-22 16:52:15.057284078 +0100
++++ libkml-1.2.0/configure.ac	2012-02-22 16:52:16.553284076 +0100
+@@ -86,13 +86,13 @@
+ 			[do not generate any SWIG language bindings])])
+ if test "x$enable_swig" != xno; then
+ 	AC_CHECK_PROG(SWIG, swig, swig)
+-	if test "x$SWIG" != x; then
+-		SWIG_VERSION=`swig -version 2>&1|grep Version|cut -d" " -f3`
+-		if test ${SWIG_VERSION:4} -lt 35; then
+-			AC_MSG_WARN([You have SWIG $SWIG_VERSION installed, but libkml requires at least SWIG 1.3.35. The bindings will not be built.])
+-			SWIG=
+-		fi
+-	fi
++#	if test "x$SWIG" != x; then
++#		SWIG_VERSION=`swig -version 2>&1|grep Version|cut -d" " -f3`
++#		if test ${SWIG_VERSION:4} -lt 35; then
++#			AC_MSG_WARN([You have SWIG $SWIG_VERSION installed, but libkml requires at least SWIG 1.3.35. The bindings will not be built.])
++#			SWIG=
++#		fi
++#	fi
+ fi
+ AM_CONDITIONAL(WITH_SWIG, [test "x$SWIG" != x])
+ 

-- 
A library to manipulate KML 2.2 OGC standard files