This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository bnd.
commit 77c29182cb012a95634f4a647f106ff88a4a4e49 Author: Emmanuel Bourg <[email protected]> Date: Wed Dec 16 00:11:50 2015 +0100 Refreshed the patches --- debian/changelog | 4 ++- ...-without-biz.aQute.repository-and-resolve.patch | 25 +++++++--------- debian/patches/display_bsn_on_missing_bundle.patch | 4 +-- debian/patches/embedded-repo.patch | 8 +---- debian/patches/findbugs.patch | 18 +++++------ debian/patches/implement-missing-methods.patch | 14 +++------ debian/patches/no-ee.j2se.patch | 35 +++++----------------- debian/patches/no-osgi.r5.patch | 12 ++------ debian/patches/no_ee_minimum.patch | 18 ++++------- 9 files changed, 44 insertions(+), 94 deletions(-) diff --git a/debian/changelog b/debian/changelog index b4b78be..a61d0d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -bnd (2.1.0-3) UNRELEASED; urgency=medium +bnd (2.2.0-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Refreshed the patches * Use XZ compression for the upstream tarball -- Emmanuel Bourg <[email protected]> Tue, 15 Dec 2015 22:34:41 +0100 diff --git a/debian/patches/build-without-biz.aQute.repository-and-resolve.patch b/debian/patches/build-without-biz.aQute.repository-and-resolve.patch index 706f810..582dc14 100644 --- a/debian/patches/build-without-biz.aQute.repository-and-resolve.patch +++ b/debian/patches/build-without-biz.aQute.repository-and-resolve.patch @@ -12,29 +12,26 @@ Forwarded: not-needed dist/bnd.bnd | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) -diff --git a/build.xml b/build.xml -index 9abfa87..4540c0a 100644 --- a/build.xml +++ b/build.xml -@@ -10,16 +10,12 @@ - </macrodef> +@@ -20,8 +20,6 @@ + <target name="build"> <ant dir="biz.aQute.bnd" target="build" /> - <ant dir="biz.aQute.repository" target="build" /> - <ant dir="biz.aQute.resolve" target="build" /> </target> - <target name="dist" > - <ant dir="dist" target="release" /> - </target> + + <target name="junit" depends="__mainiterateinit"> +@@ -34,8 +32,6 @@ + <target name="release"> - <ant dir="biz.aQute.bnd" target="release" /> -- <ant dir="biz.aQute.repository" target="release" /> -- <ant dir="biz.aQute.resolve" target="release" /> + <ant dir="biz.aQute.bnd" target="mainRelease" /> +- <ant dir="biz.aQute.repository" target="mainRelease" /> +- <ant dir="biz.aQute.resolve" target="mainRelease" /> </target> - <target name="clean"> - <iterate target="clean" /> -diff --git a/dist/bnd.bnd b/dist/bnd.bnd -index cba3e5d..8cd392a 100644 + + <target name="clean" depends="__mainiterateinit"> --- a/dist/bnd.bnd +++ b/dist/bnd.bnd @@ -2,7 +2,7 @@ diff --git a/debian/patches/display_bsn_on_missing_bundle.patch b/debian/patches/display_bsn_on_missing_bundle.patch index 1d88995..b15fd71 100644 --- a/debian/patches/display_bsn_on_missing_bundle.patch +++ b/debian/patches/display_bsn_on_missing_bundle.patch @@ -10,11 +10,9 @@ Forwarded: no biz.aQute.bndlib/src/aQute/bnd/build/Project.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/biz.aQute.bndlib/src/aQute/bnd/build/Project.java b/biz.aQute.bndlib/src/aQute/bnd/build/Project.java -index 954da2e..8725b4a 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/build/Project.java +++ b/biz.aQute.bndlib/src/aQute/bnd/build/Project.java -@@ -878,8 +878,11 @@ public class Project extends Processor { +@@ -891,8 +891,11 @@ File file = plugin.get(bsn, version, attrs, blocker); // and the entry must exist // if it does, return this as a result diff --git a/debian/patches/embedded-repo.patch b/debian/patches/embedded-repo.patch index c436c36..b273e8e 100644 --- a/debian/patches/embedded-repo.patch +++ b/debian/patches/embedded-repo.patch @@ -4,15 +4,9 @@ Subject: embedded repo The embedded-repo.jar is not built. To avoid a FTBFS the error is commented out. ---- - biz.aQute.bndlib/src/aQute/bnd/build/Workspace.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/biz.aQute.bndlib/src/aQute/bnd/build/Workspace.java b/biz.aQute.bndlib/src/aQute/bnd/build/Workspace.java -index be7a71c..bed7436 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/build/Workspace.java +++ b/biz.aQute.bndlib/src/aQute/bnd/build/Workspace.java -@@ -291,7 +291,7 @@ public class Workspace extends Processor { +@@ -314,7 +314,7 @@ if (in != null) unzip(in, root); else { diff --git a/debian/patches/findbugs.patch b/debian/patches/findbugs.patch index ffccd88..e526be8 100644 --- a/debian/patches/findbugs.patch +++ b/debian/patches/findbugs.patch @@ -10,16 +10,14 @@ Forwarded: not-needed cnf/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/cnf/build.xml b/cnf/build.xml -index 87d9b4e..709f4d2 100644 --- a/cnf/build.xml +++ b/cnf/build.xml -@@ -31,7 +31,7 @@ +@@ -123,7 +123,7 @@ - <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"> - <classpath> -- <fileset dir="${workspacedir}/cnf/findbugs/lib"> -+ <fileset dir="/usr/share/java/"> - <include name="**/*.jar" /> - </fileset> - </classpath> + <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"> + <classpath> +- <fileset dir="${workspacedir}/cnf/findbugs/lib"> ++ <fileset dir="/usr/share/java"> + <include name="**/*.jar" /> + </fileset> + </classpath> diff --git a/debian/patches/implement-missing-methods.patch b/debian/patches/implement-missing-methods.patch index 08f847d..a94d6d3 100644 --- a/debian/patches/implement-missing-methods.patch +++ b/debian/patches/implement-missing-methods.patch @@ -13,11 +13,9 @@ Forwarded: no .../src/aQute/launcher/minifw/MiniFramework.java | 11 +++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) -diff --git a/biz.aQute.launcher/src/aQute/launcher/Launcher.java b/biz.aQute.launcher/src/aQute/launcher/Launcher.java -index 221c412..3cb3a5e 100644 --- a/biz.aQute.launcher/src/aQute/launcher/Launcher.java +++ b/biz.aQute.launcher/src/aQute/launcher/Launcher.java -@@ -580,7 +580,8 @@ public class Launcher implements ServiceListener { +@@ -739,7 +739,8 @@ Class< ? > clazz = loader.loadClass(implementation); FrameworkFactory factory = (FrameworkFactory) clazz.newInstance(); trace("Framework factory %s", factory); @@ -27,11 +25,9 @@ index 221c412..3cb3a5e 100644 trace("framework instance %s", systemBundle); } else { trace("using embedded mini framework because we were told not to use META-INF/services"); -diff --git a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java -index 8c5111f..b16bd13 100644 --- a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java +++ b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java -@@ -370,4 +370,11 @@ public class Context extends URLClassLoader implements Bundle, BundleContext, Bu +@@ -370,4 +370,11 @@ // TODO Auto-generated method stub return null; } @@ -43,11 +39,9 @@ index 8c5111f..b16bd13 100644 + return null; + } } -diff --git a/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java -index 67e9348..8178409 100644 --- a/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java +++ b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java -@@ -28,6 +28,9 @@ public class MiniFramework implements Framework, Bundle, BundleContext { +@@ -28,6 +28,9 @@ state = Bundle.ACTIVE; } @@ -57,7 +51,7 @@ index 67e9348..8178409 100644 public FrameworkEvent waitForStop(long timeout) throws InterruptedException { long deadline = System.currentTimeMillis() + timeout; -@@ -325,4 +328,12 @@ public class MiniFramework implements Framework, Bundle, BundleContext { +@@ -325,4 +328,12 @@ // TODO Auto-generated method stub return null; } diff --git a/debian/patches/no-ee.j2se.patch b/debian/patches/no-ee.j2se.patch index 23814a1..bae1e4a 100644 --- a/debian/patches/no-ee.j2se.patch +++ b/debian/patches/no-ee.j2se.patch @@ -15,8 +15,6 @@ Forwarded: not-needed biz.aQute.resolve/bnd.bnd | 3 +-- 7 files changed, 4 insertions(+), 12 deletions(-) -diff --git a/aQute.libg/bnd.bnd b/aQute.libg/bnd.bnd -index 4640058..6aab41f 100644 --- a/aQute.libg/bnd.bnd +++ b/aQute.libg/bnd.bnd @@ -1,5 +1,4 @@ @@ -26,11 +24,9 @@ index 4640058..6aab41f 100644 Export-Package: aQute.lib.*, aQute.libg.*, aQute.configurable, aQute.service.* Bundle-Version: 2.7.4.${tstamp;yyyyMMdd-HHmmss} -diff --git a/biz.aQute.bnd/bnd.bnd b/biz.aQute.bnd/bnd.bnd -index b546ae4..2c30f70 100644 --- a/biz.aQute.bnd/bnd.bnd +++ b/biz.aQute.bnd/bnd.bnd -@@ -4,7 +4,6 @@ Conditional-Package: aQute.libg.*,aQute.lib.*,aQute.configurable +@@ -4,7 +4,6 @@ -sub: *.bnd -buildpath: aQute.libg;version=latest,\ @@ -38,15 +34,6 @@ index b546ae4..2c30f70 100644 biz.aQute.bndlib;version=project,\ biz.aQute.junit;version=project,\ biz.aQute.launcher;version=project,\ -@@ -18,4 +17,4 @@ Conditional-Package: aQute.libg.*,aQute.lib.*,aQute.configurable - # About the aQute.library.bndrepo dep. Needed to add them here - # by hand even though they are in bndlib. However, they are added - # and we can unfortunately not see those packages ... -- -\ No newline at end of file -+ -diff --git a/biz.aQute.bndlib.tests/bnd.bnd b/biz.aQute.bndlib.tests/bnd.bnd -index cad98e5..65cac6a 100644 --- a/biz.aQute.bndlib.tests/bnd.bnd +++ b/biz.aQute.bndlib.tests/bnd.bnd @@ -6,7 +6,6 @@ @@ -57,20 +44,16 @@ index cad98e5..65cac6a 100644 org.mockito.mockito-all;version=1.9.0 -runtrace: true -diff --git a/biz.aQute.jpm/bnd.bnd b/biz.aQute.jpm/bnd.bnd -index 8dfaf24..0883535 100644 --- a/biz.aQute.jpm/bnd.bnd +++ b/biz.aQute.jpm/bnd.bnd -@@ -25,7 +25,6 @@ Bundle-Version: 1.0.2 +@@ -24,7 +24,6 @@ + Bundle-Version: 1.0.2 -buildpath: aQute.libg;version=project,\ - biz.aQute.bndlib;version=project,\ - ee.j2se;version=${javac.ee},\ com.springsource.junit,\ org.mockito.mockito-all;version=1.9.0,\ - aQute.library.client;version=1.0.1 -diff --git a/biz.aQute.launcher/bnd.bnd b/biz.aQute.launcher/bnd.bnd -index 4a6ac68..d4d6ee1 100644 + biz.aQute.bndlib;version=latest,\ --- a/biz.aQute.launcher/bnd.bnd +++ b/biz.aQute.launcher/bnd.bnd @@ -1,9 +1,7 @@ @@ -84,11 +67,9 @@ index 4a6ac68..d4d6ee1 100644 Launcher-Plugin: aQute.launcher.plugin.ProjectLauncherImpl -diff --git a/biz.aQute.repository/bnd.bnd b/biz.aQute.repository/bnd.bnd -index 20d9630..0f39a37 100644 --- a/biz.aQute.repository/bnd.bnd +++ b/biz.aQute.repository/bnd.bnd -@@ -18,7 +18,6 @@ jetty.libs: lib/javax.servlet-2.5.0.jar;version=file,\ +@@ -18,7 +18,6 @@ osgi.r5;version=1.0.1,\ javax.xml.stream-1.0.1.jar;version=file,\ org.mockito.mockito-all,\ @@ -96,8 +77,6 @@ index 20d9630..0f39a37 100644 ${jetty.libs} Bnd-Plugins: -diff --git a/biz.aQute.resolve/bnd.bnd b/biz.aQute.resolve/bnd.bnd -index 4c476c2..23be1c1 100644 --- a/biz.aQute.resolve/bnd.bnd +++ b/biz.aQute.resolve/bnd.bnd @@ -3,7 +3,6 @@ @@ -106,9 +85,9 @@ index 4c476c2..23be1c1 100644 biz.aQute.repository;version=snapshot,\ - ee.j2se;version=${javac.ee},\ org.mockito.mockito-all,\ + org.apache.felix.resolver,\ osgi.cmpn - -@@ -14,4 +13,4 @@ Export-Package: biz.aQute.resolve,\ +@@ -15,4 +14,4 @@ Private-Package: biz.aQute.resolve.* diff --git a/debian/patches/no-osgi.r5.patch b/debian/patches/no-osgi.r5.patch index a854ce5..d48f28c 100644 --- a/debian/patches/no-osgi.r5.patch +++ b/debian/patches/no-osgi.r5.patch @@ -11,11 +11,9 @@ Forwarded: not-needed dist/bnd.bnd | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) -diff --git a/biz.aQute.bnd/bnd.bnd b/biz.aQute.bnd/bnd.bnd -index 2c30f70..238231d 100644 --- a/biz.aQute.bnd/bnd.bnd +++ b/biz.aQute.bnd/bnd.bnd -@@ -11,8 +11,7 @@ Conditional-Package: aQute.libg.*,aQute.lib.*,aQute.configurable +@@ -11,8 +11,7 @@ osgi.cmpn;version=4.3,\ osgi.core;version=4.1,\ junit.osgi,\ @@ -25,11 +23,9 @@ index 2c30f70..238231d 100644 # About the aQute.library.bndrepo dep. Needed to add them here # by hand even though they are in bndlib. However, they are added -diff --git a/biz.aQute.bndlib/bnd.bnd b/biz.aQute.bndlib/bnd.bnd -index 49d247f..11c0104 100644 --- a/biz.aQute.bndlib/bnd.bnd +++ b/biz.aQute.bndlib/bnd.bnd -@@ -42,8 +42,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 +@@ -42,8 +42,7 @@ -buildpath: com.springsource.junit,\ osgi.cmpn;version=4.3,\ aQute.libg;version=project,\ @@ -37,10 +33,8 @@ index 49d247f..11c0104 100644 - osgi.r5;version=1.0.1,\ + osgi.core;version=4.1 - Bundle-Version: 2.1.0.${tstamp;yyyyMMdd-HHmmss} + Bundle-Version: 2.2.0.${tstamp;yyyyMMdd-HHmmss} Import-Package: junit.framework;resolution:=optional,\ -diff --git a/dist/bnd.bnd b/dist/bnd.bnd -index 8cd392a..be23a6d 100644 --- a/dist/bnd.bnd +++ b/dist/bnd.bnd @@ -2,7 +2,7 @@ diff --git a/debian/patches/no_ee_minimum.patch b/debian/patches/no_ee_minimum.patch index d0fcbc7..3ce1849 100644 --- a/debian/patches/no_ee_minimum.patch +++ b/debian/patches/no_ee_minimum.patch @@ -11,20 +11,16 @@ Forwarded: not-needed demo/bnd.bnd | 5 +---- 3 files changed, 2 insertions(+), 7 deletions(-) -diff --git a/biz.aQute.bndlib/bnd.bnd b/biz.aQute.bndlib/bnd.bnd -index e583927..49d247f 100644 --- a/biz.aQute.bndlib/bnd.bnd +++ b/biz.aQute.bndlib/bnd.bnd -@@ -44,7 +44,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 +@@ -44,7 +44,6 @@ aQute.libg;version=project,\ osgi.core;version=4.1,\ osgi.r5;version=1.0.1,\ - ee.j2se;version=${javac.ee} - Bundle-Version: 2.1.0.${tstamp;yyyyMMdd-HHmmss} + Bundle-Version: 2.2.0.${tstamp;yyyyMMdd-HHmmss} Import-Package: junit.framework;resolution:=optional,\ -diff --git a/biz.aQute.junit/bnd.bnd b/biz.aQute.junit/bnd.bnd -index f749234..e6a3e85 100644 --- a/biz.aQute.junit/bnd.bnd +++ b/biz.aQute.junit/bnd.bnd @@ -2,8 +2,7 @@ @@ -37,11 +33,9 @@ index f749234..e6a3e85 100644 Tester-Plugin: aQute.junit.plugin.ProjectTesterImpl -diff --git a/demo/bnd.bnd b/demo/bnd.bnd -index 6a7086a..d6a1335 100644 --- a/demo/bnd.bnd +++ b/demo/bnd.bnd -@@ -2,9 +2,7 @@ Private-Package: com.example.demo, test +@@ -2,9 +2,7 @@ Bundle-Activator: com.example.demo.Activator Bundle-SymbolicName: demo @@ -52,11 +46,11 @@ index 6a7086a..d6a1335 100644 -testpath: \ -@@ -25,7 +23,6 @@ Import-Package: \ +@@ -25,7 +23,6 @@ * -buildpath: osgi.core,\ -- ee.minimum;version=1.2.1,\ +- ee.j2se;version=1.5.0,\ junit.osgi - javac.target=1.4 + javac.target=1.5 -- 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
