[SCM] libkml branch, master, updated. 9c9ee2af58467c3a8eeda82a459d5c96c501be08

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 4907362eabe3bd7f96578bc2403ee166f14bbd93
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Mar 29 14:50:24 2011 +0200

    Updated ld-as-needed to apply clean.

diff --git a/debian/patches/ld-as-needed.diff b/debian/patches/ld-as-needed.diff
index a187695..df065d2 100644
--- a/debian/patches/ld-as-needed.diff
+++ b/debian/patches/ld-as-needed.diff
@@ -1,7 +1,7 @@
-Index: libkml-1.2.0/examples/helloworld/Makefile.am
+Index: git/examples/helloworld/Makefile.am
 ===================================================================
---- libkml-1.2.0.orig/examples/helloworld/Makefile.am	2010-12-19 20:11:54.188229000 +0000
-+++ libkml-1.2.0/examples/helloworld/Makefile.am	2010-12-19 20:11:54.698229001 +0000
+--- git.orig/examples/helloworld/Makefile.am	2011-03-29 14:49:48.000000000 +0200
++++ git/examples/helloworld/Makefile.am	2011-03-29 14:49:48.000000000 +0200
 @@ -26,8 +26,8 @@
  circlegen_LDADD = \
  	$(top_builddir)/src/kml/base/libkmlbase.la \
@@ -33,12 +33,12 @@ Index: libkml-1.2.0/examples/helloworld/Makefile.am
  	$(top_builddir)/src/kml/base/libkmlbase.la
  
  printgeometry_SOURCES = printgeometry.cc
-Index: libkml-1.2.0/examples/regionator/Makefile.in
+Index: git/examples/regionator/Makefile.in
 ===================================================================
---- libkml-1.2.0.orig/examples/regionator/Makefile.in	2010-12-19 20:11:54.388229001 +0000
-+++ libkml-1.2.0/examples/regionator/Makefile.in	2010-12-19 20:11:54.698229001 +0000
-@@ -216,9 +216,9 @@
- csvregionator_LDADD = \
+--- git.orig/examples/regionator/Makefile.in	2011-03-29 14:49:48.000000000 +0200
++++ git/examples/regionator/Makefile.in	2011-03-29 14:49:48.000000000 +0200
+@@ -232,9 +232,9 @@
+ kmlregionator_LDADD = \
  	$(top_builddir)/src/kml/base/libkmlbase.la \
  	$(top_builddir)/src/kml/dom/libkmldom.la \
 -	$(top_builddir)/src/kml/engine/libkmlengine.la \
@@ -49,12 +49,12 @@ Index: libkml-1.2.0/examples/regionator/Makefile.in
  
  all: all-am
  
-Index: libkml-1.2.0/examples/regionator/Makefile.am
+Index: git/examples/regionator/Makefile.am
 ===================================================================
---- libkml-1.2.0.orig/examples/regionator/Makefile.am	2010-12-19 20:11:54.188229000 +0000
-+++ libkml-1.2.0/examples/regionator/Makefile.am	2010-12-19 20:11:54.698229001 +0000
-@@ -12,7 +12,7 @@
- csvregionator_LDADD = \
+--- git.orig/examples/regionator/Makefile.am	2011-03-29 14:49:48.000000000 +0200
++++ git/examples/regionator/Makefile.am	2011-03-29 14:49:48.000000000 +0200
+@@ -20,7 +20,7 @@
+ kmlregionator_LDADD = \
  	$(top_builddir)/src/kml/base/libkmlbase.la \
  	$(top_builddir)/src/kml/dom/libkmldom.la \
 -	$(top_builddir)/src/kml/engine/libkmlengine.la \
@@ -63,10 +63,10 @@ Index: libkml-1.2.0/examples/regionator/Makefile.am
 +	$(top_builddir)/src/kml/convenience/libkmlconvenience.la \
 +	$(top_builddir)/src/kml/engine/libkmlengine.la
  
-Index: libkml-1.2.0/examples/helloworld/Makefile.in
+Index: git/examples/helloworld/Makefile.in
 ===================================================================
---- libkml-1.2.0.orig/examples/helloworld/Makefile.in	2010-12-19 20:12:36.748229196 +0000
-+++ libkml-1.2.0/examples/helloworld/Makefile.in	2010-12-19 20:13:53.708229021 +0000
+--- git.orig/examples/helloworld/Makefile.in	2011-03-29 14:49:48.000000000 +0200
++++ git/examples/helloworld/Makefile.in	2011-03-29 14:49:48.000000000 +0200
 @@ -345,8 +345,8 @@
  circlegen_LDADD = \
  	$(top_builddir)/src/kml/base/libkmlbase.la \

-- 
A library to manipulate KML 2.2 OGC standard files