[pkg-java] r12244 - trunk/knopflerfish-osgi/debian

[Eric Lavarde]

Author: ewl-guest
Date: 2010-05-01 17:11:44 +0000 (Sat, 01 May 2010)
New Revision: 12244

Added:
   trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.doc-base.api
   trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.doc-base.docs
   trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.links
Modified:
   trunk/knopflerfish-osgi/debian/control
   trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.docs
   trunk/knopflerfish-osgi/debian/rules
Log:
Remove again dependency on javahelp
Do manually doc-base files


Modified: trunk/knopflerfish-osgi/debian/control
===================================================================
--- trunk/knopflerfish-osgi/debian/control	2010-05-01 16:39:23 UTC (rev 12243)
+++ trunk/knopflerfish-osgi/debian/control	2010-05-01 17:11:44 UTC (rev 12244)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>
-Build-Depends-Indep: libasm3-java, openjdk-6-jdk, javahelper
+Build-Depends-Indep: libasm3-java, openjdk-6-jdk
 Build-Depends: cdbs, debhelper (>= 7), ant
 Standards-Version: 3.8.4
 Homepage: http://www.knopflerfish.org/

Added: trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.doc-base.api
===================================================================
--- trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.doc-base.api	                        (rev 0)
+++ trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.doc-base.api	2010-05-01 17:11:44 UTC (rev 12244)
@@ -0,0 +1,10 @@
+Document: knopflerfish-osgi-javadoc
+Title: API JavaDoc for Knopflerfish's OSGi implementation
+Author: The Knopflerfish Project
+Abstract: This the API JavaDoc for Knopflerfish's OSGi framework
+ and the OSGi interface.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libknopflerfish-osgi-java-doc/api/index.html
+Files: /usr/share/doc/libknopflerfish-osgi-java-doc/api/*.html

Added: trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.doc-base.docs
===================================================================
--- trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.doc-base.docs	                        (rev 0)
+++ trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.doc-base.docs	2010-05-01 17:11:44 UTC (rev 12244)
@@ -0,0 +1,11 @@
+Document: knopflerfish-osgi-docs
+Title: Documentation for Knopflerfish's OSGi implementation
+Author: The Knopflerfish Project
+Abstract: All kind of documentation regarding Knopflerfish's
+ implementation of the OSGi standard, like introduction,
+ tutorials, and further links.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libknopflerfish-osgi-java-doc/docs/index.html
+Files: /usr/share/doc/libknopflerfish-osgi-java-doc/api/*.html

Modified: trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.docs
===================================================================
--- trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.docs	2010-05-01 16:39:23 UTC (rev 12243)
+++ trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.docs	2010-05-01 17:11:44 UTC (rev 12244)
@@ -1,3 +1,3 @@
 knopflerfish.org/osgi/framework/readme.txt
 knopflerfish.org/docs/
-# api/
+api/

Added: trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.links
===================================================================
--- trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.links	                        (rev 0)
+++ trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.links	2010-05-01 17:11:44 UTC (rev 12244)
@@ -0,0 +1 @@
+/usr/share/doc/libknopflerfish-osgi-java-doc/api /usr/share/doc/libknopflerfish-osgi-java-doc/docs/javadoc

Modified: trunk/knopflerfish-osgi/debian/rules
===================================================================
--- trunk/knopflerfish-osgi/debian/rules	2010-05-01 16:39:23 UTC (rev 12243)
+++ trunk/knopflerfish-osgi/debian/rules	2010-05-01 17:11:44 UTC (rev 12244)
@@ -1,11 +1,8 @@
 #!/usr/bin/make -f
 # debian/rules for Commons Fileupload (uses CDBS)
 
-clean:: buildxml-clean
-build/libknopflerfish-osgi-java-doc:: build-javadoc
-
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.mk
+#include /usr/share/cdbs/1/class/javahelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk
@@ -16,12 +13,12 @@
 # DEB_INSTALL_DOCS_ALL = -Xlicense
 # DEB_DH_INSTALL_ARGS := -XLICENSE.txt
 
-buildxml-clean::
+clean::
 	-$(DEB_ANT_INVOKE) $(DEB_ANT_CLEAN_TARGET)
 	-rm -f knopflerfish.org/osgi/framework/resources/tstamp
 	-rm -fr api/
 
-build-javadoc::
+build/libknopflerfish-osgi-java-doc::
 	javadoc -sourcepath knopflerfish.org/osgi/framework/src -d api -subpackages org.knopflerfish:org.osgi
 
 # Get original sources directly using uscan
@@ -29,6 +26,6 @@
 	uscan
 
 # we don't need jh_manifest and it has a bug:
-JH_MANIFEST_ARGS := -V
-override_jh_manifest:
-	-echo no jh_manifest
+#JH_MANIFEST_ARGS := -V
+#override_jh_manifest:
+#	-echo no jh_manifest