This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch experimental in repository bnd.
commit 0e6372912a989063568ebf61c50d1d106b057ca5 Author: Markus Koschany <[email protected]> Date: Thu May 14 12:01:23 2015 +0200 Drop all already disabled patches. - find_swt_jar.diff - java8-compatibility.diff - osgi43_fixes.diff --- debian/patches/find_swt_jar.diff | 21 -------- debian/patches/java8-compatibility.diff | 74 --------------------------- debian/patches/osgi43_fixes.diff | 88 --------------------------------- debian/patches/series | 3 -- 4 files changed, 186 deletions(-) diff --git a/debian/patches/find_swt_jar.diff b/debian/patches/find_swt_jar.diff deleted file mode 100644 index 5a41f10..0000000 --- a/debian/patches/find_swt_jar.diff +++ /dev/null @@ -1,21 +0,0 @@ -From: Jakub Adam <[email protected]> -Date: Mon, 30 Apr 2012 19:50:31 +0200 -Subject: find_swt_jar - ---- - biz.aQute.bnd/bnd.bnd | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/biz.aQute.bnd/bnd.bnd b/biz.aQute.bnd/bnd.bnd -index b15cd90..b54ed5c 100644 ---- a/biz.aQute.bnd/bnd.bnd -+++ b/biz.aQute.bnd/bnd.bnd -@@ -28,7 +28,7 @@ Bundle-License: http://www.opensource.org/licenses/apache2.0.php; \ - org.eclipse.ui.editors,\ - org.eclipse.ui.ide,\ - org.eclipse.ui.workbench.texteditor,\ -- org.eclipse.swt.carbon.macosx,\ -+ org.eclipse.swt,\ - org.eclipse.core.jobs,\ - org.eclipse.equinox.common,\ - org.eclipse.equinox.registry,\ diff --git a/debian/patches/java8-compatibility.diff b/debian/patches/java8-compatibility.diff deleted file mode 100644 index 1430776..0000000 --- a/debian/patches/java8-compatibility.diff +++ /dev/null @@ -1,74 +0,0 @@ -Description: Fixes the compilation errors with Java 8 -Author: Emmanuel Bourg -Forwarded: no ---- a/biz.aQute.bndlib/src/aQute/bnd/signing/Signer.java -+++ b/biz.aQute.bndlib/src/aQute/bnd/signing/Signer.java -@@ -7,7 +7,7 @@ - import java.util.jar.*; - import java.util.regex.*; - --import aQute.lib.base64.*; -+import aQute.lib.base64.Base64; - import aQute.lib.osgi.*; - - /** ---- a/biz.aQute.bndlib/src/aQute/lib/osgi/Jar.java -+++ b/biz.aQute.bndlib/src/aQute/lib/osgi/Jar.java -@@ -9,7 +9,7 @@ - import java.util.regex.*; - import java.util.zip.*; - --import aQute.lib.base64.*; -+import aQute.lib.base64.Base64; - import aQute.libg.reporter.*; - - public class Jar implements Closeable { ---- a/biz.aQute.bndlib/src/aQute/lib/osgi/Analyzer.java -+++ b/biz.aQute.bndlib/src/aQute/lib/osgi/Analyzer.java -@@ -29,7 +29,7 @@ - - import aQute.bnd.annotation.*; - import aQute.bnd.service.*; --import aQute.lib.base64.*; -+import aQute.lib.base64.Base64; - import aQute.lib.collections.*; - import aQute.lib.filter.*; - import aQute.lib.hex.*; ---- a/aQute.libg/src/aQute/lib/collections/MultiMap.java -+++ b/aQute.libg/src/aQute/lib/collections/MultiMap.java -@@ -24,6 +24,7 @@ - return set.addAll(value); - } - -+/* - public boolean remove( K key, V value ) { - Set<V> set = get(key); - if ( set == null) { -@@ -34,6 +35,7 @@ - remove(key); - return result; - } -+*/ - - public boolean removeAll( K key, Collection<V> value ) { - Set<V> set = get(key); ---- a/biz.aQute.junit/bnd.bnd -+++ b/biz.aQute.junit/bnd.bnd -@@ -7,7 +7,7 @@ - Tester-Plugin: aQute.junit.plugin.ProjectTesterImpl - - javac.source = 1.5 --javac.target = jsr14 -+javac.target = 1.5 - Private-Package: aQute.junit.*,\ - junit.framework - Export-Package: junit.framework; version=3.8 ---- a/biz.aQute.launcher/bnd.bnd -+++ b/biz.aQute.launcher/bnd.bnd -@@ -11,4 +11,4 @@ - - Bundle-Version: 1.0.0 - javac.source = 1.5 --javac.target = jsr14 -\ No newline at end of file -+javac.target = 1.5 diff --git a/debian/patches/osgi43_fixes.diff b/debian/patches/osgi43_fixes.diff deleted file mode 100644 index ac1320a..0000000 --- a/debian/patches/osgi43_fixes.diff +++ /dev/null @@ -1,88 +0,0 @@ -Description: Implements some missing methods for OSGi R4.3 -Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2011-11-09 -Forwarded: no - -Index: b/biz.aQute.launcher/src/aQute/launcher/Launcher.java -=================================================================== ---- a/biz.aQute.launcher/src/aQute/launcher/Launcher.java -+++ b/biz.aQute.launcher/src/aQute/launcher/Launcher.java -@@ -458,7 +458,7 @@ - Class<?> clazz = loader.loadClass(implementation); - FrameworkFactory factory = (FrameworkFactory) clazz.newInstance(); - trace("Framework factory %s", factory); -- systemBundle = factory.newFramework(p); -+ systemBundle = factory.newFramework((java.util.Map)p); - trace("framework instance %s", systemBundle); - } else { - trace("using embedded mini framework because we were told not to use META-INF/services"); -Index: b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java -=================================================================== ---- a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java -+++ b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java -@@ -331,4 +331,30 @@ - public String toString() { - return id + " " + location; - } -+ -+ public <A> A adapt(java.lang.Class<A> type) { -+ return null; -+ } -+ -+ public int compareTo(Bundle bundle) { -+ return 0; -+ } -+ -+ public Bundle getBundle(java.lang.String location) { -+ return null; -+ } -+ -+ public <S> ServiceReference<S> getServiceReference(java.lang.Class<S> clazz) { -+ return null; -+ } -+ -+ public <S> java.util.Collection<ServiceReference<S>> getServiceReferences(java.lang.Class<S> clazz, String filter) -+ throws InvalidSyntaxException { -+ return null; -+ } -+ -+ public <S> ServiceRegistration<S> registerService(java.lang.Class<S> clazz, S service, -+ java.util.Dictionary<java.lang.String,?> properties) { -+ throw new UnsupportedOperationException(); -+ } - } -Index: b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java -=================================================================== ---- a/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java -+++ b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java -@@ -290,4 +290,30 @@ - throw new ClassNotFoundException(name); - } - } -+ -+ public <A> A adapt(java.lang.Class<A> type) { -+ return null; -+ } -+ -+ public int compareTo(Bundle bundle) { -+ return 0; -+ } -+ -+ public Bundle getBundle(java.lang.String location) { -+ return null; -+ } -+ public <S> ServiceReference<S> getServiceReference(java.lang.Class<S> clazz) { -+ return null; -+ } -+ -+ public <S> java.util.Collection<ServiceReference<S>> getServiceReferences(java.lang.Class<S> clazz, String filter) -+ throws InvalidSyntaxException { -+ return null; -+ } -+ -+ public <S> ServiceRegistration<S> registerService(java.lang.Class<S> clazz, S service, -+ java.util.Dictionary<java.lang.String,?> properties) { -+ throw new UnsupportedOperationException(); -+ } -+ - } diff --git a/debian/patches/series b/debian/patches/series index baea1c4..1f54f41 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,8 +2,5 @@ build_excludes.diff no_ee_minimum.diff no_felix.diff no_git_during_build.diff -#osgi43_fixes.diff display_bsn_on_missing_bundle.diff -#find_swt_jar.diff fix-encoding.diff -#java8-compatibility.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
