[pkg-java] r16321 - trunk/libjcommon-java/debian

[Jakub Adam]

Author: xhaakon-guest
Date: 2012-10-13 20:37:29 +0000 (Sat, 13 Oct 2012)
New Revision: 16321

Added:
   trunk/libjcommon-java/debian/jcommon.bnd
Modified:
   trunk/libjcommon-java/debian/changelog
   trunk/libjcommon-java/debian/control
   trunk/libjcommon-java/debian/rules
Log:


Modified: trunk/libjcommon-java/debian/changelog
===================================================================
--- trunk/libjcommon-java/debian/changelog	2012-10-13 20:16:36 UTC (rev 16320)
+++ trunk/libjcommon-java/debian/changelog	2012-10-13 20:37:29 UTC (rev 16321)
@@ -2,6 +2,7 @@
 
   * Remove Michael Koch from Uploaders (Closes: #654075).
   * Add Jakub Adam to Uploaders.
+  * Generate OSGi metadata into jcommon.jar manifest.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 13 Oct 2012 22:06:45 +0200
 

Modified: trunk/libjcommon-java/debian/control
===================================================================
--- trunk/libjcommon-java/debian/control	2012-10-13 20:16:36 UTC (rev 16320)
+++ trunk/libjcommon-java/debian/control	2012-10-13 20:37:29 UTC (rev 16321)
@@ -5,7 +5,7 @@
 Uploaders: Christian Bayle <bayle at debian.org>, Rene Engelhard <rene at debian.org>,
  Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends: debhelper (>= 5), cdbs, maven-repo-helper
-Build-Depends-Indep: default-jdk, ant, libservlet2.5-java, junit
+Build-Depends-Indep: default-jdk, ant, libservlet2.5-java, junit, bnd
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjcommon-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjcommon-java/

Added: trunk/libjcommon-java/debian/jcommon.bnd
===================================================================
--- trunk/libjcommon-java/debian/jcommon.bnd	                        (rev 0)
+++ trunk/libjcommon-java/debian/jcommon.bnd	2012-10-13 20:37:29 UTC (rev 16321)
@@ -0,0 +1,5 @@
+Bundle-Name: General Purpose library for Java
+Bundle-SymbolicName: org.jfree
+Bundle-Version: 1.0.0
+Bundle-Vendor: Debian.org
+Import-Package: *

Modified: trunk/libjcommon-java/debian/rules
===================================================================
--- trunk/libjcommon-java/debian/rules	2012-10-13 20:16:36 UTC (rev 16320)
+++ trunk/libjcommon-java/debian/rules	2012-10-13 20:37:29 UTC (rev 16321)
@@ -27,6 +27,8 @@
 	rm -f lib/junit.jar lib/jcommon-$(API_VERSION)-junit.jar
 
 install/lib$(LIBRARY_PACKAGE)-java:: 
+	bnd wrap -properties debian/jcommon.bnd -output $(LIBRARY_PACKAGE)-$(API_VERSION).jar \
+		$(LIBRARY_PACKAGE)-$(API_VERSION).jar
 	dh_install -plib$(LIBRARY_PACKAGE)-java $(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar /usr/share/java/
 	dh_link -plib$(LIBRARY_PACKAGE)-java /usr/share/java/$(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar /usr/share/java/$(LIBRARY_PACKAGE)-xml.jar
 	mh_installpoms -plib$(LIBRARY_PACKAGE)-java