[SCM] svnclientadapter packaging branch, master, updated. debian/0.9.100-1-5-g98ee4f2

Jakub Adam jakub.adam at ktknet.cz
Mon Oct 24 19:16:03 UTC 2011


The following commit has been merged in the master branch:
commit e9c79431624a0602b229441c38c158740695036c
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Oct 24 20:25:25 2011 +0200

    Use jh_manifest to insert OSGi metadata to jar manifest
    
    Better way to update manifest without need to patch build.xml

diff --git a/debian/manifest b/debian/manifest
new file mode 100644
index 0000000..f101871
--- /dev/null
+++ b/debian/manifest
@@ -0,0 +1,8 @@
+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/patches/add-osgi-metadata.patch b/debian/patches/add-osgi-metadata.patch
deleted file mode 100644
index 76e48af..0000000
--- a/debian/patches/add-osgi-metadata.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Sat, 1 Oct 2011 12:50:43 +0200
-Subject: add-osgi-metadata.patch
-
----
- build.xml |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index 8eac813..6af5a06 100644
---- a/build.xml
-+++ b/build.xml
-@@ -107,6 +107,11 @@
-          includes="**/*"
-          excludes="**/*Test*.class">
-    	  <manifest>
-+   	    <attribute name="Bundle-ManifestVersion" value="2"/>
-+   	    <attribute name="Bundle-SymbolicName" value="org.tigris.subversion.svnclientadapter"/>
-+   	    <attribute name="Bundle-Version" value="1.6.12"/>
-+   	    <attribute name="Export-Package" value="org.tigris.subversion.svnclientadapter,org.tigris.subversion.svnclientadapter.utils,org.tigris.subversion.svnclientadapter.javahl"/>
-+   	    <attribute name="Import-Package" value="org.tigris.subversion.javahl"/>
-    	    <section name="org.tigris.subversion.svnclientadapter">
-    	      <attribute name="Specification-Title" value="SVNClientAdapter"/>
-    	      <attribute name="Specification-Version" value="${svnClientAdapter.version}"/>
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 5bce1dd..b352f64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 packaging-changes.patch
-add-osgi-metadata.patch
 subclipse-load-nativelib-from-single-bundle.patch

-- 
svnclientadapter packaging



More information about the pkg-java-commits mailing list