[knopflerfish-osgi] 01/01: fix #895885

[Felix Natter]

This is an automated email from the git hooks/post-receive script.

fnatter-guest pushed a commit to branch master
in repository knopflerfish-osgi.

commit b18acd564dec54c7fc326e8bb7a0d8c6f10839b4
Author: Felix Natter <fnatter at gmx.net>
Date:   Sat Apr 28 14:23:01 2018 +0200

    fix #895885
---
 debian/changelog                                                    | 6 ++++++
 ...c_encoding.patch => 10_javac_encoding_source_target_level.patch} | 4 +++-
 debian/patches/series                                               | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d94da35..ec30de9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+knopflerfish-osgi (6.1.1-3) unstable; urgency=medium
+
+  * Build with source=1.7 and target=1.7 (Closes: #895885)
+
+ -- Felix Natter <fnatter at gmx.net>  Sat, 28 Apr 2018 14:19:59 +0200
+
 knopflerfish-osgi (6.1.1-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/10_javac_encoding.patch b/debian/patches/10_javac_encoding_source_target_level.patch
similarity index 83%
rename from debian/patches/10_javac_encoding.patch
rename to debian/patches/10_javac_encoding_source_target_level.patch
index 6e29618..74137c9 100644
--- a/debian/patches/10_javac_encoding.patch
+++ b/debian/patches/10_javac_encoding_source_target_level.patch
@@ -4,11 +4,13 @@ Forwarded: no
 Last-Update: 2017-08-25
 --- a/osgi/framework/build.xml
 +++ b/osgi/framework/build.xml
-@@ -88,6 +88,7 @@
+@@ -88,6 +88,9 @@
             includes          = "**/*.java"
             excludes          = "${androidSrcs},**/package-info.java"
             classpathref      = "compile.path"
 +	   encoding          = "UTF-8"
++	   source            = "1.7"
++           target            = "1.7"
             >
        <compilerarg value="-Xlint:-options"/>
      </javac>
diff --git a/debian/patches/series b/debian/patches/series
index f3880f2..2678ad2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-10_javac_encoding.patch
+10_javac_encoding_source_target_level.patch
 40_ignore_android.patch
 50_asm_compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/knopflerfish-osgi.git