[SCM] Java Foreign Function Interface branch, master, updated. debian/1.0.2-10-1-gaceaf2d

Jakub Adam jakub.adam at ktknet.cz
Sat Jun 15 18:47:29 UTC 2013


The following commit has been merged in the master branch:
commit aceaf2ddb27f2c3a6ff9a2a235aa3feeacf5d12f
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Jun 15 20:30:59 2013 +0200

    Re-enable OSGi metadata generation.
    
    Request from Ubuntu only applies to their 'main' components,
    this package is in 'universe'.

diff --git a/debian/changelog b/debian/changelog
index a8e608c..eff3faa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jffi (1.0.2-11) UNRELEASED; urgency=low
+
+  * Re-enable OSGi metadata generation.
+    - Request from Ubuntu only applies to their 'main' components,
+      this package is in 'universe'.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 15 Jun 2013 20:23:54 +0200
+
 jffi (1.0.2-10) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 3eddbc0..c949dd4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends: debhelper (>= 7), cdbs, maven-repo-helper, libffi-dev, pkg-config,
- ant-optional, default-jdk, junit4
+ ant-optional, default-jdk, junit4, bnd
 Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/pkg-java/jffi.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/jffi.git
diff --git a/debian/rules b/debian/rules
index d91e743..5db2f5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,9 @@ JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET := -Duse.system.libffi=1 jar test
 DEB_JARS             := ant-nodeps ant-junit junit4
 
-#common-post-build-indep::
-#	# Generate OSGi metadata for jffi.jar
-#	bnd wrap -properties debian/jffi.bnd -output dist/jffi.jar dist/jffi.jar
+common-post-build-indep::
+	# Generate OSGi metadata for jffi.jar
+	bnd wrap -properties debian/jffi.bnd -output dist/jffi.jar dist/jffi.jar
 
 install/libjffi-java::
 	mh_installpom -plibjffi-java pom.xml

-- 
Java Foreign Function Interface



More information about the pkg-java-commits mailing list