[knopflerfish-osgi] 10/12: Adjusted the doc files installed

[Emmanuel Bourg]

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 5b74d85b8727c7884df53e3ed94dfdaaa00e55e9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 3 16:25:58 2016 +0200

    Adjusted the doc files installed
---
 debian/libknopflerfish-osgi-java-doc.docs | 1 -
 debian/rules                              | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/libknopflerfish-osgi-java-doc.docs b/debian/libknopflerfish-osgi-java-doc.docs
index 06d0f16..af7de37 100644
--- a/debian/libknopflerfish-osgi-java-doc.docs
+++ b/debian/libknopflerfish-osgi-java-doc.docs
@@ -1,3 +1,2 @@
 api/
 framework.html
-frameworkcommands.html
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index b00a9cb..6b848d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,14 +7,13 @@ override_dh_auto_build:
 	dh_auto_build -- -f osgi/framework/build.xml jar
 
 	javadoc -encoding "UTF-8" -sourcepath osgi/framework/src -d api -subpackages org.knopflerfish:org.osgi
-	cp docs/bundledoc/framework/index.html framework.html
-	cp docs/bundledoc/frameworkcommands/index.html frameworkcommands.html
+	cp osgi/framework/doc/index.html framework.html
 
 override_dh_auto_clean:
 	-rm -f osgi/framework/resources/tstamp
 	-rm -fr api/ osgi/out
 	-rm -f osgi/framework-*.jar
-	-rm -f framework.html frameworkcommands.html
+	-rm -f framework.html
 
 get-orig-source:
 	uscan --force-download --download-current-version --rename --repack --compression xz

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