[pkg-java] r18919 - in tags/net-luminis-build-plugin: . 0.2.0-3/debian 0.2.0-3/debian/patches
Markus Koschany
apo-guest at moszumanska.debian.org
Fri Nov 20 17:04:23 UTC 2015
Author: apo-guest
Date: 2015-11-20 17:04:23 +0000 (Fri, 20 Nov 2015)
New Revision: 18919
Added:
tags/net-luminis-build-plugin/0.2.0-3/
tags/net-luminis-build-plugin/0.2.0-3/debian/changelog
tags/net-luminis-build-plugin/0.2.0-3/debian/control
tags/net-luminis-build-plugin/0.2.0-3/debian/patches/bnd-2.1.0.patch
tags/net-luminis-build-plugin/0.2.0-3/debian/patches/series
tags/net-luminis-build-plugin/0.2.0-3/debian/rules
Removed:
tags/net-luminis-build-plugin/0.2.0-3/debian/changelog
tags/net-luminis-build-plugin/0.2.0-3/debian/control
tags/net-luminis-build-plugin/0.2.0-3/debian/patches/series
tags/net-luminis-build-plugin/0.2.0-3/debian/rules
Log:
[svn-buildpackage] Tagging net-luminis-build-plugin 0.2.0-3
Deleted: tags/net-luminis-build-plugin/0.2.0-3/debian/changelog
===================================================================
--- trunk/net-luminis-build-plugin/debian/changelog 2015-11-20 13:12:51 UTC (rev 18917)
+++ tags/net-luminis-build-plugin/0.2.0-3/debian/changelog 2015-11-20 17:04:23 UTC (rev 18919)
@@ -1,18 +0,0 @@
-net-luminis-build-plugin (0.2.0-2) unstable; urgency=medium
-
- * Team upload.
- * Declare compliance with Debian Policy 3.9.6.
- * wrap-and-sort -sa.
- * Switch to bnd1.50 because this package FTBFS with bnd >= 2.1.
- * Vcs-Browser: Use https.
- * Use compat level 9 and require debhelper >= 9.
- * Fix Lintian warnings dep5-copyright-license-name-not-unique
- and invalid-short-name-in-dep5-copyright.
-
- -- Markus Koschany <apo at debian.org> Sat, 14 Nov 2015 13:40:15 +0100
-
-net-luminis-build-plugin (0.2.0-1) unstable; urgency=low
-
- * Initial Debian Upload (Closes: #641295)
-
- -- Mathieu Malaterre <malat at debian.org> Tue, 10 Apr 2012 14:22:21 +0200
Copied: tags/net-luminis-build-plugin/0.2.0-3/debian/changelog (from rev 18918, trunk/net-luminis-build-plugin/debian/changelog)
===================================================================
--- tags/net-luminis-build-plugin/0.2.0-3/debian/changelog (rev 0)
+++ tags/net-luminis-build-plugin/0.2.0-3/debian/changelog 2015-11-20 17:04:23 UTC (rev 18919)
@@ -0,0 +1,27 @@
+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.
+ * Declare compliance with Debian Policy 3.9.6.
+ * wrap-and-sort -sa.
+ * Switch to bnd1.50 because this package FTBFS with bnd >= 2.1.
+ * Vcs-Browser: Use https.
+ * Use compat level 9 and require debhelper >= 9.
+ * Fix Lintian warnings dep5-copyright-license-name-not-unique
+ and invalid-short-name-in-dep5-copyright.
+
+ -- Markus Koschany <apo at debian.org> Sat, 14 Nov 2015 13:40:15 +0100
+
+net-luminis-build-plugin (0.2.0-1) unstable; urgency=low
+
+ * Initial Debian Upload (Closes: #641295)
+
+ -- Mathieu Malaterre <malat at debian.org> Tue, 10 Apr 2012 14:22:21 +0200
Deleted: tags/net-luminis-build-plugin/0.2.0-3/debian/control
===================================================================
--- trunk/net-luminis-build-plugin/debian/control 2015-11-20 13:12:51 UTC (rev 18917)
+++ tags/net-luminis-build-plugin/0.2.0-3/debian/control 2015-11-20 17:04:23 UTC (rev 18919)
@@ -1,31 +0,0 @@
-Source: net-luminis-build-plugin
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders:
- Mathieu Malaterre <malat at debian.org>
-Build-Depends:
- debhelper (>= 9),
- javahelper (>= 0.25)
-Build-Depends-Indep:
- ant,
- bnd1.50,
- default-jdk
-Standards-Version: 3.9.6
-Homepage: https://opensource.luminis.net/wiki/display/SITE/OSGi+Bundle+Ant+Task
-Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/net-luminis-build-plugin
-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/net-luminis-build-plugin/
-
-Package: libnet-luminis-build-plugin-java
-Architecture: all
-Depends:
- ${java:Depends},
- ${misc:Depends}
-Recommends:
- ${java:Recommends}
-Description: Wrapper around Bnd to allow easy bundle creation from ant builds.
- The OSGi bundle ant task is a wrapper around Bnd to allow easy bundle creation
- from ant builds.
- .
- Creates an OSGi bundle. Computes OSGi headers (most notably the importPackage
- and exportPackage) from class analysis.
Copied: tags/net-luminis-build-plugin/0.2.0-3/debian/control (from rev 18918, trunk/net-luminis-build-plugin/debian/control)
===================================================================
--- tags/net-luminis-build-plugin/0.2.0-3/debian/control (rev 0)
+++ tags/net-luminis-build-plugin/0.2.0-3/debian/control 2015-11-20 17:04:23 UTC (rev 18919)
@@ -0,0 +1,31 @@
+Source: net-luminis-build-plugin
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders:
+ Mathieu Malaterre <malat at debian.org>
+Build-Depends:
+ debhelper (>= 9),
+ javahelper
+Build-Depends-Indep:
+ ant,
+ bnd (>= 2.1.0),
+ default-jdk
+Standards-Version: 3.9.6
+Homepage: https://opensource.luminis.net/wiki/display/SITE/OSGi+Bundle+Ant+Task
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/net-luminis-build-plugin
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/net-luminis-build-plugin/
+
+Package: libnet-luminis-build-plugin-java
+Architecture: all
+Depends:
+ ${java:Depends},
+ ${misc:Depends}
+Recommends:
+ ${java:Recommends}
+Description: Wrapper around Bnd to allow easy bundle creation from ant builds.
+ The OSGi bundle ant task is a wrapper around Bnd to allow easy bundle creation
+ from ant builds.
+ .
+ Creates an OSGi bundle. Computes OSGi headers (most notably the importPackage
+ and exportPackage) from class analysis.
Copied: tags/net-luminis-build-plugin/0.2.0-3/debian/patches/bnd-2.1.0.patch (from rev 18918, trunk/net-luminis-build-plugin/debian/patches/bnd-2.1.0.patch)
===================================================================
--- tags/net-luminis-build-plugin/0.2.0-3/debian/patches/bnd-2.1.0.patch (rev 0)
+++ tags/net-luminis-build-plugin/0.2.0-3/debian/patches/bnd-2.1.0.patch 2015-11-20 17:04:23 UTC (rev 18919)
@@ -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();
Deleted: tags/net-luminis-build-plugin/0.2.0-3/debian/patches/series
===================================================================
--- trunk/net-luminis-build-plugin/debian/patches/series 2015-11-20 13:12:51 UTC (rev 18917)
+++ tags/net-luminis-build-plugin/0.2.0-3/debian/patches/series 2015-11-20 17:04:23 UTC (rev 18919)
@@ -1,2 +0,0 @@
-fixbuildxml.patch
-remove_headers.patch
Copied: tags/net-luminis-build-plugin/0.2.0-3/debian/patches/series (from rev 18918, trunk/net-luminis-build-plugin/debian/patches/series)
===================================================================
--- tags/net-luminis-build-plugin/0.2.0-3/debian/patches/series (rev 0)
+++ tags/net-luminis-build-plugin/0.2.0-3/debian/patches/series 2015-11-20 17:04:23 UTC (rev 18919)
@@ -0,0 +1,3 @@
+fixbuildxml.patch
+remove_headers.patch
+bnd-2.1.0.patch
Deleted: tags/net-luminis-build-plugin/0.2.0-3/debian/rules
===================================================================
--- trunk/net-luminis-build-plugin/debian/rules 2015-11-20 13:12:51 UTC (rev 18917)
+++ tags/net-luminis-build-plugin/0.2.0-3/debian/rules 2015-11-20 17:04:23 UTC (rev 18919)
@@ -1,15 +0,0 @@
-#!/usr/bin/make -f
-#export DH_VERBOSE=1
-
-JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/bnd-1.50.0.jar
-#DEB_ANT_BUILD_TARGET := dist
-
-%:
- dh $@ --with javahelper
-
-override_dh_auto_build:
- ant dist
-
-get-orig-source:
- ./debian/get-orig-source
Copied: tags/net-luminis-build-plugin/0.2.0-3/debian/rules (from rev 18918, trunk/net-luminis-build-plugin/debian/rules)
===================================================================
--- tags/net-luminis-build-plugin/0.2.0-3/debian/rules (rev 0)
+++ tags/net-luminis-build-plugin/0.2.0-3/debian/rules 2015-11-20 17:04:23 UTC (rev 18919)
@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+#export DH_VERBOSE=1
+
+JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/java/bnd.jar
+#DEB_ANT_BUILD_TARGET := dist
+
+%:
+ dh $@ --with javahelper
+
+override_dh_auto_build:
+ ant dist
+
+get-orig-source:
+ ./debian/get-orig-source
More information about the pkg-java-commits
mailing list