[SCM] libkml branch, master, updated. upstream/1.3.0_r863-56-g506330e

Bas Couwenberg sebastic at xs4all.nl
Sun Nov 10 02:24:31 UTC 2013


The following commit has been merged in the master branch:
commit fa8037b70246d714be7a81375426654e101c1401
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Nov 10 01:46:33 2013 +0100

    No Multi-Arch for java package, no byte identical jar with SWIG generated code.

diff --git a/debian/changelog b/debian/changelog
index 5223c29..57cb813 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libkml (1.3.0~r864-2) UNRELEASED; urgency=low
+
+  * No Multi-Arch: same for java package, jar contains SWIG generated code.
+    (closes: #728785)
+
+ -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 10 Nov 2013 01:40:38 +0100
+
 libkml (1.3.0~r864-1) unstable; urgency=low
 
   * Merge upstream commit r864:
diff --git a/debian/control b/debian/control
index e7b358f..f6f62fd 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,6 @@ Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: libkml0 (= ${binary:Version}),
-         libkml-java (= ${binary:Version}),
          liburiparser-dev (>= 0.7.1),
          ${shlibs:Depends},
          ${misc:Depends}
@@ -56,7 +55,6 @@ Description: Library to manipulate KML 2.2 OGC standard files - development file
 
 Package: libkml-java
 Architecture: any
-Multi-Arch: same
 Section: java
 Depends: libkml0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: Library to manipulate KML 2.2 OGC standard files - Java package

-- 
A library to manipulate KML 2.2 OGC standard files



More information about the Pkg-grass-devel mailing list