[SCM] svnclientadapter packaging branch, master, updated. debian/0.9.100-2-20-g1fe9041

[Jakub Adam]

The following commit has been merged in the master branch:
commit 1fe90412a579aac30481436c3df8b08e2094d500
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Oct 12 00:58:20 2012 +0200

    Use bnd to generate OSGi metadata

diff --git a/debian/changelog b/debian/changelog
index 01e0ecc..69b2fb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ svnclientadapter (1.8.16-1) UNRELEASED; urgency=low
   * Remove emma.jar and emma_ant.jar from Class-Path, they are required
     only for running tests.
   * Refreshed d/patches/packaging-changes.patch.
+  * Use bnd to generate OSGi metadata.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sun, 17 Jun 2012 23:00:09 +0200
 
diff --git a/debian/control b/debian/control
index 8bfcb05..6251b4e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Andres Mejia <amejia at debian.org>, Jakub Adam <jakub.adam at ktknet.cz>
-Build-Depends: debhelper (>= 8~), javahelper, ant, ant-optional,
+Build-Depends: debhelper (>= 8~), javahelper, ant, ant-optional, bnd,
  default-jdk, libsvn-java (>= 1.7.5~), libsvnkit-java (>= 1.7.5~),
  libemma-java
 Standards-Version: 3.9.3
diff --git a/debian/manifest b/debian/manifest
deleted file mode 100644
index f101871..0000000
--- a/debian/manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/share/java/svnClientAdapter.jar:
- Bundle-ManifestVersion: 2
- Bundle-Name: High-level API for Subversion
- Bundle-Vendor: tigris.org
- Bundle-SymbolicName: org.tigris.subversion.svnclientadapter
- Bundle-Version: 1.6.12
- Export-Package: org.tigris.subversion.svnclientadapter,org.tigris.subversion.svnclientadapter.utils,org.tigris.subversion.svnclientadapter.javahl
- Import-Package: org.tigris.subversion.javahl
diff --git a/debian/rules b/debian/rules
index 6f364ae..f195b4d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,8 @@ VERSION := $(shell dpkg-parsechangelog | grep Version: | sed 's/Version: \(.*\)-
 
 override_dh_auto_build:
 	ant -DsvnClientAdapter.version=$(VERSION)
+	bnd wrap -properties debian/svnClientAdapter.bnd \
+		-output build/lib/svnClientAdapter-*.jar build/lib/svnClientAdapter-*.jar
 
 override_jh_depends:
 	jh_depends --exclude=libsvn-java --exclude=libsvnkit-java 
diff --git a/debian/svnClientAdapter.bnd b/debian/svnClientAdapter.bnd
new file mode 100644
index 0000000..764f74b
--- /dev/null
+++ b/debian/svnClientAdapter.bnd
@@ -0,0 +1,5 @@
+Bundle-Name: High-level API for Subversion
+Bundle-SymbolicName: org.tigris.subversion.svnclientadapter
+Bundle-Vendor: Debian.org
+Bundle-Version: 1.6.12
+Import-Package: !org.tmatesoft.svn.core*,*

-- 
svnclientadapter packaging