[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89

Bas Couwenberg sebastic at xs4all.nl
Tue Oct 8 22:34:43 UTC 2013


The following commit has been merged in the master branch:
commit a9916c20c97496735488f294cfdc456beb852d40
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Oct 6 04:43:14 2013 +0200

    Add patch to fix executable-not-elf-or-script for java run.sh example.

diff --git a/debian/changelog b/debian/changelog
index 454d49c..d09ab5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ libkml (1.3.0~r864-1) UNRELEASED; urgency=low
   * Don't start short description with an article.
   * Drop XB-Python-Version from control file.
   * Add a watch file.
+  * Add patch to fix executable-not-elf-or-script for java run.sh example.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 05 Oct 2013 21:15:09 +0200
 
diff --git a/debian/patches/java-run-sh-shebang.diff b/debian/patches/java-run-sh-shebang.diff
new file mode 100644
index 0000000..57c2e77
--- /dev/null
+++ b/debian/patches/java-run-sh-shebang.diff
@@ -0,0 +1,8 @@
+--- a/examples/java/run.sh
++++ b/examples/java/run.sh
+@@ -1,3 +1,5 @@
++#!/bin/sh
++
+ # The relative path to the directory that holds the build shared libraries.
+ BUILT_LIB_DIR=../../build/src/swig/.libs
+ echo "=== setting shared library path to built libraries dir: $BUILT_LIB_DIR"
diff --git a/debian/patches/series b/debian/patches/series
index f6451b4..67efa04 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ feature_view_test.diff
 geometry_test.diff
 swig.diff
 fix-ftbfs-gcc4.7.diff
+java-run-sh-shebang.diff

-- 
A library to manipulate KML 2.2 OGC standard files



More information about the Pkg-grass-devel mailing list