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

[Eric Lavarde]

Author: ewl-guest
Date: 2010-05-01 16:39:23 +0000 (Sat, 01 May 2010)
New Revision: 12243

Modified:
   trunk/knopflerfish-osgi/debian/control
   trunk/knopflerfish-osgi/debian/libknopflerfish-osgi-java-doc.docs
   trunk/knopflerfish-osgi/debian/rules
Log:
Add javahelper as dependency.
Add workaround to avoid jh_manifest problems.


Modified: trunk/knopflerfish-osgi/debian/control
===================================================================
--- trunk/knopflerfish-osgi/debian/control	2010-05-01 12:47:31 UTC (rev 12242)
+++ trunk/knopflerfish-osgi/debian/control	2010-05-01 16:39:23 UTC (rev 12243)
@@ -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
+Build-Depends-Indep: libasm3-java, openjdk-6-jdk, javahelper
 Build-Depends: cdbs, debhelper (>= 7), ant
 Standards-Version: 3.8.4
 Homepage: http://www.knopflerfish.org/

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

Modified: trunk/knopflerfish-osgi/debian/rules
===================================================================
--- trunk/knopflerfish-osgi/debian/rules	2010-05-01 12:47:31 UTC (rev 12242)
+++ trunk/knopflerfish-osgi/debian/rules	2010-05-01 16:39:23 UTC (rev 12243)
@@ -5,7 +5,7 @@
 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
@@ -27,3 +27,8 @@
 # Get original sources directly using uscan
 get-orig-source:
 	uscan
+
+# we don't need jh_manifest and it has a bug:
+JH_MANIFEST_ARGS := -V
+override_jh_manifest:
+	-echo no jh_manifest