This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository knopflerfish-osgi.
commit bf47c99e0223feea096b87b949d1accec7ca821f Author: Emmanuel Bourg <[email protected]> Date: Mon Oct 3 16:17:17 2016 +0200 Ignore the Android part --- debian/changelog | 1 + debian/patches/40_ignore_android.patch | 27 +++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) diff --git a/debian/changelog b/debian/changelog index e70b361..b68c953 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ knopflerfish-osgi (5.2.0-1) UNRELEASED; urgency=medium * New upstream release - Refreshed the patches - Install the new 5.2.0 files/links + - Ignore the Android part * Build with the DH sequencer instead of CDBS * Depend on libasm-java (>= 5.0) instead of libasm4-java * Standards-Version updated to 3.9.8 diff --git a/debian/patches/40_ignore_android.patch b/debian/patches/40_ignore_android.patch new file mode 100644 index 0000000..e1521d8 --- /dev/null +++ b/debian/patches/40_ignore_android.patch @@ -0,0 +1,27 @@ +Description: Ignore the Android part +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/osgi/framework/build.xml ++++ b/osgi/framework/build.xml +@@ -157,21 +157,6 @@ + > + <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 54dfea6..1f214c4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 10_build_asm.patch 20_versioned_jar.patch 30_fix_jar_build.patch +40_ignore_android.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 [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
