[SCM] libkml branch, master, updated. upstream/1.3.0_r863-50-g521138c

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 26d5f27e647bfe17fe21eae8401b344381f77b5c
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Mar 14 13:30:25 2012 +0100

    Closing residual reports.

diff --git a/debian/changelog b/debian/changelog
index 7ea1833..14b88f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,12 @@ libkml (1.3.0~r863-4) unstable; urgency=low
   * Moved to dh_python2 instead of python-central.
   * Policy bumped to 3.9.3, no changes required.
   * Debhelper level set to 9.
+  * Refreshed reautoconfiscated.diff to remove a backup file. Thanks doko.
+    (closes: #650525)
+  * The ld-as-needed case has been already managed.
+    (closes: #641681)
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 14 Mar 2012 13:15:52 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 14 Mar 2012 13:29:51 +0100
 
 libkml (1.3.0~r863-3) unstable; urgency=low
 
diff --git a/debian/patches/reautoconfiscated.diff b/debian/patches/reautoconfiscated.diff
index 7722b8c..ae03793 100644
--- a/debian/patches/reautoconfiscated.diff
+++ b/debian/patches/reautoconfiscated.diff
@@ -1,116 +1,3 @@
-Index: git/config.h.in~
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ git/config.h.in~	2011-03-29 14:52:31.000000000 +0200
-@@ -0,0 +1,108 @@
-+/* config.h.in.  Generated from configure.ac by autoheader.  */
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#undef HAVE_DLFCN_H
-+
-+/* Define to 1 if you have the <expat.h> header file. */
-+#undef HAVE_EXPAT_H
-+
-+/* Define to 1 if you have the <float.h> header file. */
-+#undef HAVE_FLOAT_H
-+
-+/* Define to 1 if you have the `floor' function. */
-+#undef HAVE_FLOOR
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H
-+
-+/* Define to 1 if you have the `expat' library (-lexpat). */
-+#undef HAVE_LIBEXPAT
-+
-+/* Define to 1 if you have the <limits.h> header file. */
-+#undef HAVE_LIMITS_H
-+
-+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
-+   to 0 otherwise. */
-+#undef HAVE_MALLOC
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* Define to 1 if you have the `memset' function. */
-+#undef HAVE_MEMSET
-+
-+/* Define to 1 if stdbool.h conforms to C99. */
-+#undef HAVE_STDBOOL_H
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
-+/* Define to 1 if you have the `strstr' function. */
-+#undef HAVE_STRSTR
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H
-+
-+/* Define to 1 if the system has the type `_Bool'. */
-+#undef HAVE__BOOL
-+
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+   */
-+#undef LT_OBJDIR
-+
-+/* Name of package */
-+#undef PACKAGE
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT
-+
-+/* Define to the full name of this package. */
-+#undef PACKAGE_NAME
-+
-+/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING
-+
-+/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME
-+
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
-+/* Define to the version of this package. */
-+#undef PACKAGE_VERSION
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS
-+
-+/* Version number of package */
-+#undef VERSION
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+#undef const
-+
-+/* Define to `__inline__' or `__inline' if that's what the C compiler
-+   calls it, or to nothing if 'inline' is not supported under any name.  */
-+#ifndef __cplusplus
-+#undef inline
-+#endif
-+
-+/* Define to rpl_malloc if the replacement function should be used. */
-+#undef malloc
-+
-+/* Define to `unsigned int' if <sys/types.h> does not define. */
-+#undef size_t
 Index: git/configure
 ===================================================================
 --- git.orig/configure	2011-03-29 14:50:08.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 8033dd2..9c7fd47 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,5 @@ ld-as-needed.diff
 feature_view_test.diff
 geometry_test.diff
 swig
+ldasneeded.diff
+ldasneeded

-- 
A library to manipulate KML 2.2 OGC standard files