[knopflerfish-osgi] 04/05: build 6.1.1-1

[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 8f39ad3b0af17e97fbb133e0e7abf2e43429a440
Author: Felix Natter <fnatter at gmx.net>
Date:   Sat Sep 16 10:21:55 2017 +0200

    build 6.1.1-1
---
 debian/control                                     | 4 ++--
 debian/libknopflerfish-osgi-framework-java.install | 2 +-
 debian/libknopflerfish-osgi-framework-java.links   | 6 +++---
 debian/rules                                       | 8 ++++++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 5a62f44..fe4f272 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ 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), default-jdk, libosgi-annotation-java
 Build-Depends: debhelper (>= 9), ant
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/knopflerfish-osgi.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/knopflerfish-osgi.git
 Homepage: http://www.knopflerfish.org/
diff --git a/debian/libknopflerfish-osgi-framework-java.install b/debian/libknopflerfish-osgi-framework-java.install
index 050647c..742316e 100644
--- a/debian/libknopflerfish-osgi-framework-java.install
+++ b/debian/libknopflerfish-osgi-framework-java.install
@@ -1 +1 @@
-osgi/framework-5.2.0.jar usr/share/knopflerfish/
+osgi/jars/framework-8.0.5.jar usr/share/knopflerfish/
diff --git a/debian/libknopflerfish-osgi-framework-java.links b/debian/libknopflerfish-osgi-framework-java.links
index 64ec5f6..805ff98 100644
--- a/debian/libknopflerfish-osgi-framework-java.links
+++ b/debian/libknopflerfish-osgi-framework-java.links
@@ -1,3 +1,3 @@
-usr/share/knopflerfish/framework-5.2.0.jar usr/share/knopflerfish/framework.jar
-usr/share/knopflerfish/framework-5.2.0.jar usr/share/java/knopflerfish-framework.jar
-usr/share/knopflerfish/framework-5.2.0.jar usr/share/java/knopflerfish-framework-5.2.0.jar
+usr/share/knopflerfish/framework-8.0.5.jar usr/share/knopflerfish/framework.jar
+usr/share/knopflerfish/framework-8.0.5.jar usr/share/java/knopflerfish-framework.jar
+usr/share/knopflerfish/framework-8.0.5.jar usr/share/java/knopflerfish-framework-8.0.5.jar
diff --git a/debian/rules b/debian/rules
index cd824f8..63e26fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@
 override_dh_auto_build:
 	mkdir -p osgi/framework/libs
 	ln -s /usr/share/java/asm-all.jar osgi/framework/libs/asm-3.2.jar
+	mkdir -p osgi/annotations
+	ln -s /usr/share/java/osgi.annotation.jar osgi/annotations/osgi.annotation-6.0.1.jar
 
 	dh_auto_build -- -f ant/bundletasks.xml build_bundle_tasks -Dasm.jar=/usr/share/java/asm-all.jar
 	dh_auto_build -- -f osgi/framework/build.xml jar
@@ -17,12 +19,14 @@ override_dh_auto_clean:
 	-rm -Rf ant/classes
 	-rm -Rf ant/lib
 	-rm -Rf osgi/framework/libs/*.jar
+	-rm -Rf osgi/annotations/*.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 osgi/jars/framework-*.jar
+	-rm -f osgi/framework.jar
 	-rm -f framework.html
 
 get-orig-source:
-	uscan --force-download --download-current-version --rename --repack --compression xz
+	uscan --force-download --rename --repack --compression xz

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