[pkg-java] r16390 - in trunk/libgnumail-java/debian: . patches

[Jakub Adam]

Author: xhaakon-guest
Date: 2013-01-23 21:12:32 +0000 (Wed, 23 Jan 2013)
New Revision: 16390

Added:
   trunk/libgnumail-java/debian/gnumail.bnd
Removed:
   trunk/libgnumail-java/debian/patches/add-osgi-metadata.patch
Modified:
   trunk/libgnumail-java/debian/changelog
   trunk/libgnumail-java/debian/control
   trunk/libgnumail-java/debian/patches/series
   trunk/libgnumail-java/debian/rules
Log:
Use bnd to generate OSGi metadata

Modified: trunk/libgnumail-java/debian/changelog
===================================================================
--- trunk/libgnumail-java/debian/changelog	2013-01-23 21:05:44 UTC (rev 16389)
+++ trunk/libgnumail-java/debian/changelog	2013-01-23 21:12:32 UTC (rev 16390)
@@ -1,3 +1,9 @@
+libgnumail-java (1.1.2-8) UNRELEASED; urgency=low
+
+  * Use bnd to generate OSGi metadata.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Wed, 23 Jan 2013 21:00:00 +0100
+
 libgnumail-java (1.1.2-7) unstable; urgency=low
 
   * Removed Michael Koch from Uploaders (Closes: #654066).

Modified: trunk/libgnumail-java/debian/control
===================================================================
--- trunk/libgnumail-java/debian/control	2013-01-23 21:05:44 UTC (rev 16389)
+++ trunk/libgnumail-java/debian/control	2013-01-23 21:12:32 UTC (rev 16390)
@@ -5,7 +5,7 @@
 Uploaders: Torsten Werner <twerner at debian.org>,
            Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends: debhelper (>= 8), cdbs (>= 0.4.5.3), ant, maven-repo-helper
-Build-Depends-Indep: default-jdk, libgnujaf-java, libgnuinet-java,
+Build-Depends-Indep: default-jdk, libgnujaf-java, libgnuinet-java, bnd,
  default-jdk-doc, libgnujaf-java-doc
 Standards-Version: 3.9.3
 Homepage: http://savannah.gnu.org/projects/classpathx

Added: trunk/libgnumail-java/debian/gnumail.bnd
===================================================================
--- trunk/libgnumail-java/debian/gnumail.bnd	                        (rev 0)
+++ trunk/libgnumail-java/debian/gnumail.bnd	2013-01-23 21:12:32 UTC (rev 16390)
@@ -0,0 +1,6 @@
+Bundle-Name: GNU JavaMail
+Bundle-SymbolicName: javax.mail
+Bundle-Version: 1.1.2
+Bundle-Vendor: Debian.org
+Import-Package: !gnu.inet.util, *
+-nouses: true

Deleted: trunk/libgnumail-java/debian/patches/add-osgi-metadata.patch
===================================================================
--- trunk/libgnumail-java/debian/patches/add-osgi-metadata.patch	2013-01-23 21:05:44 UTC (rev 16389)
+++ trunk/libgnumail-java/debian/patches/add-osgi-metadata.patch	2013-01-23 21:12:32 UTC (rev 16390)
@@ -1,29 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Sun, 16 Oct 2011 11:57:21 +0200
-Subject: add-osgi-metadata
-
----
- build.xml |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index cd1e8b4..f821d3c 100644
---- a/build.xml
-+++ b/build.xml
-@@ -168,6 +168,15 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-         <include name='mime.types'/>
-         <include name='javamail.charset.map'/>
-       </metainf>
-+      <manifest>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="GNU JavaMail"/>
-+        <attribute name="Bundle-Vendor" value="gnu.org"/>
-+        <attribute name="Bundle-SymbolicName" value="javax.mail"/>
-+        <attribute name="Bundle-Version" value="1.1.2"/>
-+        <attribute name="Export-Package" value="javax.mail,javax.mail.event,javax.mail.internet,javax.mail.search,javax.mail.util"/>
-+        <attribute name="Require-Bundle" value="javax.activation"/>
-+      </manifest>
-       <include name='javax/mail/**/*.class'/>
-       <include name='gnu/mail/util/*.class'/>
-       <include name='gnu/mail/handler/*.class'/>
--- 

Modified: trunk/libgnumail-java/debian/patches/series
===================================================================
--- trunk/libgnumail-java/debian/patches/series	2013-01-23 21:05:44 UTC (rev 16389)
+++ trunk/libgnumail-java/debian/patches/series	2013-01-23 21:12:32 UTC (rev 16390)
@@ -1,4 +1,3 @@
 01_fix_classpath.patch
 gnumail-imaps.patch
 javadoc-link.patch
-add-osgi-metadata.patch

Modified: trunk/libgnumail-java/debian/rules
===================================================================
--- trunk/libgnumail-java/debian/rules	2013-01-23 21:05:44 UTC (rev 16389)
+++ trunk/libgnumail-java/debian/rules	2013-01-23 21:12:32 UTC (rev 16390)
@@ -13,6 +13,9 @@
 			-Ddoc=api -Dant.build.javac.source=1.4
 API_DOCS             := api
 
+common-post-build-indep::
+	bnd wrap -properties debian/gnumail.bnd -output ./gnumail-$(VERSION).jar ./gnumail-$(VERSION).jar
+
 install/$(PACKAGE)::
 	mh_installpom -p$(PACKAGE) debian/gnumail.pom
 	mh_installjar -p$(PACKAGE) --java-lib debian/gnumail.pom ./gnumail-$(VERSION).jar