[knopflerfish-osgi] 01/01: Restored the exports file in the jar (Closes: #840130)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Oct 10 10:10:25 UTC 2016
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 d38620c14161d302ec92c9319835c498b011efb7
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Oct 10 12:08:45 2016 +0200
Restored the exports file in the jar (Closes: #840130)
---
debian/changelog | 7 +++++++
debian/control | 2 +-
debian/patches/30_fix_jar_build.patch | 15 ---------------
debian/patches/series | 1 -
debian/rules | 8 ++++++++
5 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index faaeaa7..0d37633 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+knopflerfish-osgi (5.2.0-2) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Restored the exports file in the jar (Closes: #840130)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 10 Oct 2016 12:07:59 +0200
+
knopflerfish-osgi (5.2.0-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 5a62f44..80f90dd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
Priority: extra
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Felix Natter <fnatter at gmx.net>
-Build-Depends-Indep: libasm-java (>= 5.0), default-jdk
+Build-Depends-Indep: libasm-java (>= 5.0), libasm3-java, default-jdk
Build-Depends: debhelper (>= 9), ant
Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-java/knopflerfish-osgi.git
diff --git a/debian/patches/30_fix_jar_build.patch b/debian/patches/30_fix_jar_build.patch
deleted file mode 100644
index c2c6274..0000000
--- a/debian/patches/30_fix_jar_build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Remove dependency on genexports in jar ant task
-Author: Felix Natter <fnatter at gmx.net>
-Forwarded: not-needed
-Last-Update: 2015-02-21
---- a/osgi/framework/build.xml
-+++ b/osgi/framework/build.xml
-@@ -194,7 +194,7 @@
- </javac>
- </target>
-
-- <target name="jar" depends="compile,genexports" description="build jar">
-+ <target name="jar" depends="compile" description="build jar">
- <tstamp>
- <format property="framework.tstamp"
- pattern="'Build' EE MMMM d yyyy, HH:mm:ss"
diff --git a/debian/patches/series b/debian/patches/series
index 1f214c4..cdad66d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
10_build_asm.patch
20_versioned_jar.patch
-30_fix_jar_build.patch
40_ignore_android.patch
diff --git a/debian/rules b/debian/rules
index 95cc270..fa0396e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,22 @@
dh $@ --buildsystem=ant
override_dh_auto_build:
+ mkdir -p osgi/framework/libs
+ ln -s /usr/share/java/asm3-all.jar osgi/framework/libs/asm-3.2.jar
+
+ dh_auto_build -- -f ant/bundletasks.xml build_bundle_tasks -Dasm.jar=/usr/share/java/asm3-all.jar
dh_auto_build -- -f osgi/framework/build.xml jar
javadoc -locale en -encoding "UTF-8" -sourcepath osgi/framework/src -d api -subpackages org.knopflerfish:org.osgi
cp osgi/framework/doc/index.html framework.html
override_dh_auto_clean:
+ -rm -Rf ant/classes
+ -rm -Rf ant/lib
+ -rm -Rf osgi/framework/libs/*.jar
-rm -f osgi/framework/resources/tstamp
-rm -f osgi/framework/resources/version
+ -rm -f osgi/framework/resources/exports
-rm -fr api/ osgi/out
-rm -f osgi/framework-*.jar
-rm -f framework.html
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/knopflerfish-osgi.git
More information about the pkg-java-commits
mailing list