[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 54523fa8026d93f1769cc7282b06899d9974857e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Oct 6 16:43:24 2013 +0200

    Move .so symlinks from java packages to libkml-dev.

diff --git a/debian/changelog b/debian/changelog
index 8d1c447..0d7a15b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low
   * Add patch to fix executable-not-elf-or-script for java run.sh example.
   * Add lintian override for no fortify functions false positive.
   * Drop needless dependency on default-jre for libkml-java.
+  * Move .so symlinks from java packages to libkml-dev.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 05 Oct 2013 21:15:09 +0200
 
diff --git a/debian/control b/debian/control
index 90195db..0207d36 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,8 @@ Description: Library to manipulate KML 2.2 OGC standard files
 Package: libkml-dev
 Architecture: any
 Section: libdevel
-Depends: libkml0 (= ${binary:Version}), liburiparser-dev (>= 0.7.1), ${shlibs:Depends}, ${misc:Depends}
+Depends: libkml0 (= ${binary:Version}), libkml-java (= ${binary:Version}), liburiparser-dev (>= 0.7.1),
+ ${shlibs:Depends}, ${misc:Depends}
 Description: Library to manipulate KML 2.2 OGC standard files - development files
  This is a library for use with applications that want to parse,        
  generate and operate on KML, a geo-data XML variant. It is an          
diff --git a/debian/libkml-dev.install b/debian/libkml-dev.install
index 793afaf..180a86d 100644
--- a/debian/libkml-dev.install
+++ b/debian/libkml-dev.install
@@ -1,3 +1,4 @@
 usr/include/
 usr/lib/lib*.so
 usr/lib/lib*.a
+usr/lib/libkml/*.so usr/lib
diff --git a/debian/libkml-java.install b/debian/libkml-java.install
index 732aca0..86e806e 100644
--- a/debian/libkml-java.install
+++ b/debian/libkml-java.install
@@ -1,2 +1,2 @@
 usr/share/java
-usr/lib/libkml/libkml*_swig_java*.so* usr/lib
+usr/lib/libkml/libkml*_swig_java*.so.* usr/lib

-- 
A library to manipulate KML 2.2 OGC standard files