[pkg-java] r18918 - in trunk/net-luminis-build-plugin/debian: . patches

[Markus Koschany]

Author: apo-guest
Date: 2015-11-20 17:03:41 +0000 (Fri, 20 Nov 2015)
New Revision: 18918

Added:
   trunk/net-luminis-build-plugin/debian/patches/bnd-2.1.0.patch
Modified:
   trunk/net-luminis-build-plugin/debian/changelog
   trunk/net-luminis-build-plugin/debian/control
   trunk/net-luminis-build-plugin/debian/patches/series
   trunk/net-luminis-build-plugin/debian/rules
Log:
Debian release 0.2.0-3


Modified: trunk/net-luminis-build-plugin/debian/changelog
===================================================================
--- trunk/net-luminis-build-plugin/debian/changelog	2015-11-20 13:12:51 UTC (rev 18917)
+++ trunk/net-luminis-build-plugin/debian/changelog	2015-11-20 17:03:41 UTC (rev 18918)
@@ -1,3 +1,12 @@
+net-luminis-build-plugin (0.2.0-3) unstable; urgency=medium
+
+  * Team upload.
+  * Transition to bnd 2.1.0.
+  * Add bnd-2.1.0.patch and make the package compatible with bnd 2.1.0.
+  * Remove versioned build dependency on javahelper.
+
+ -- Markus Koschany <apo at debian.org>  Fri, 20 Nov 2015 17:57:02 +0100
+
 net-luminis-build-plugin (0.2.0-2) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/net-luminis-build-plugin/debian/control
===================================================================
--- trunk/net-luminis-build-plugin/debian/control	2015-11-20 13:12:51 UTC (rev 18917)
+++ trunk/net-luminis-build-plugin/debian/control	2015-11-20 17:03:41 UTC (rev 18918)
@@ -6,10 +6,10 @@
  Mathieu Malaterre <malat at debian.org>
 Build-Depends:
  debhelper (>= 9),
- javahelper (>= 0.25)
+ javahelper
 Build-Depends-Indep:
  ant,
- bnd1.50,
+ bnd (>= 2.1.0),
  default-jdk
 Standards-Version: 3.9.6
 Homepage: https://opensource.luminis.net/wiki/display/SITE/OSGi+Bundle+Ant+Task

Added: trunk/net-luminis-build-plugin/debian/patches/bnd-2.1.0.patch
===================================================================
--- trunk/net-luminis-build-plugin/debian/patches/bnd-2.1.0.patch	                        (rev 0)
+++ trunk/net-luminis-build-plugin/debian/patches/bnd-2.1.0.patch	2015-11-20 17:03:41 UTC (rev 18918)
@@ -0,0 +1,28 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 20 Nov 2015 17:29:39 +0100
+Subject: bnd 2.1.0
+
+Transition to bnd version 2.1.0.
+
+Forwarded: not-needed
+---
+ src/net/luminis/build/plugin/bnd/BuildTask.java | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/net/luminis/build/plugin/bnd/BuildTask.java b/src/net/luminis/build/plugin/bnd/BuildTask.java
+index 705d115..f5bc749 100644
+--- a/src/net/luminis/build/plugin/bnd/BuildTask.java
++++ b/src/net/luminis/build/plugin/bnd/BuildTask.java
+@@ -47,9 +47,9 @@ import org.apache.tools.ant.taskdefs.Manifest.Attribute;
+ import org.apache.tools.ant.taskdefs.Manifest.Section;
+ import org.apache.tools.ant.types.Path;
+ 
+-import aQute.lib.osgi.Analyzer;
+-import aQute.lib.osgi.Builder;
+-import aQute.lib.osgi.Jar;
++import aQute.bnd.osgi.Analyzer;
++import aQute.bnd.osgi.Builder;
++import aQute.bnd.osgi.Jar;
+ 
+ public class BuildTask extends Task {
+     Properties m_instructions = new Properties();

Modified: trunk/net-luminis-build-plugin/debian/patches/series
===================================================================
--- trunk/net-luminis-build-plugin/debian/patches/series	2015-11-20 13:12:51 UTC (rev 18917)
+++ trunk/net-luminis-build-plugin/debian/patches/series	2015-11-20 17:03:41 UTC (rev 18918)
@@ -1,2 +1,3 @@
 fixbuildxml.patch
 remove_headers.patch
+bnd-2.1.0.patch

Modified: trunk/net-luminis-build-plugin/debian/rules
===================================================================
--- trunk/net-luminis-build-plugin/debian/rules	2015-11-20 13:12:51 UTC (rev 18917)
+++ trunk/net-luminis-build-plugin/debian/rules	2015-11-20 17:03:41 UTC (rev 18918)
@@ -2,7 +2,7 @@
 #export DH_VERBOSE=1
 
 JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/bnd-1.50.0.jar
+export CLASSPATH=/usr/share/java/bnd.jar
 #DEB_ANT_BUILD_TARGET := dist
 
 %: