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 c8409f9929f7077156ac3b1fd5e7fc90df9525a1
Author: Felix Natter <fnat...@gmx.net>
Date: Sat Sep 16 10:20:15 2017 +0200
update patches for 6.1.1
---
debian/patches/10_javac_encoding.patch | 14 ++++++++++++++
debian/patches/20_versioned_jar.patch | 15 ---------------
debian/patches/40_ignore_android.patch | 35 ++++++++++++++++++----------------
debian/patches/series | 2 +-
4 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/debian/patches/10_javac_encoding.patch
b/debian/patches/10_javac_encoding.patch
new file mode 100644
index 0000000..6e29618
--- /dev/null
+++ b/debian/patches/10_javac_encoding.patch
@@ -0,0 +1,14 @@
+Description: Set encoding for javac run
+Author: Felix Natter
+Forwarded: no
+Last-Update: 2017-08-25
+--- a/osgi/framework/build.xml
++++ b/osgi/framework/build.xml
+@@ -88,6 +88,7 @@
+ includes = "**/*.java"
+ excludes = "${androidSrcs},**/package-info.java"
+ classpathref = "compile.path"
++ encoding = "UTF-8"
+ >
+ <compilerarg value="-Xlint:-options"/>
+ </javac>
diff --git a/debian/patches/20_versioned_jar.patch
b/debian/patches/20_versioned_jar.patch
deleted file mode 100644
index f3cf337..0000000
--- a/debian/patches/20_versioned_jar.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Generate a versioned jar
-Author: Felix Natter <fnat...@gmx.net>
-Forwarded: not-needed
-Last-Update: 2015-02-21
---- a/osgi/framework/build.xml
-+++ b/osgi/framework/build.xml
-@@ -21,7 +21,7 @@
- <property name="fw.impl.version" value="7.2.0"/>
-
- <property name="jarfile"
-- location="${topdir}/${ant.project.name}.jar"/>
-+ location="${topdir}/${ant.project.name}-5.2.0.jar"/>
- <property name="jarfile_compact"
- location="${topdir}/${ant.project.name}_compact.jar"/>
- <property name="source.jarfile"
diff --git a/debian/patches/40_ignore_android.patch
b/debian/patches/40_ignore_android.patch
index e1521d8..7a00167 100644
--- a/debian/patches/40_ignore_android.patch
+++ b/debian/patches/40_ignore_android.patch
@@ -3,25 +3,28 @@ Author: Emmanuel Bourg <ebo...@pache.org>
Forwarded: not-needed
--- a/osgi/framework/build.xml
+++ b/osgi/framework/build.xml
-@@ -157,21 +157,6 @@
+@@ -38,7 +38,7 @@
+ <property name="jarfile_version"
+
location="${jars.dir}/${ant.project.name}-${fw.impl.version}.jar"/>
+
+- <import file="${ant.dir}/android.xml"/>
++ <!--<import file="${ant.dir}/android.xml"/>-->
+
+ <property name="proguard.libraryjar" value="${java.home}/lib/rt.jar"/>
+
+@@ -93,6 +93,7 @@
+ <compilerarg value="-Xlint:-options"/>
+ </javac>
+ <!-- Android parts (uses dalvik.*) -->
++ <!--
+ <javac destdir = "${classout}"
+ srcdir = "${src.dir}"
+ debug = "on"
+@@ -107,6 +108,7 @@
>
<compilerarg value="-Xlint:-options"/>
</javac>
-- <!-- Android parts (uses dalvik.*) -->
-- <javac destdir = "${classout}"
-- srcdir = "${src.dir}"
-- debug = "on"
-- includeantruntime = "false"
-- includejavaruntime= "${javac.includeJavaRuntime}"
-- includes = "${androidSrcs}"
-- excludes = "**/package-info.java"
-- target = "${javac.target}"
-- source = "${javac.source}"
-- bootclasspathref = "${android.class.path.name}"
-- classpathref = "compile.path"
-- >
-- <compilerarg value="-Xlint:-options"/>
-- </javac>
++ -->
</target>
<target name="compile_compact"
diff --git a/debian/patches/series b/debian/patches/series
index aa31260..f3880f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-20_versioned_jar.patch
+10_javac_encoding.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
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
