This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch experimental in repository bnd.
commit 32a0f8fa48b801070ff7098911343f36a4177559 Author: Markus Koschany <[email protected]> Date: Thu May 14 13:22:03 2015 +0200 Add no-ee.j2se.patch --- debian/patches/no-ee.j2se.patch | 111 ++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 112 insertions(+) diff --git a/debian/patches/no-ee.j2se.patch b/debian/patches/no-ee.j2se.patch new file mode 100644 index 0000000..ac7edd0 --- /dev/null +++ b/debian/patches/no-ee.j2se.patch @@ -0,0 +1,111 @@ +From: Markus Koschany <[email protected]> +Date: Thu, 14 May 2015 13:21:39 +0200 +Subject: no ee.j2se + +--- + aQute.libg/bnd.bnd | 3 +-- + biz.aQute.bnd/bnd.bnd | 3 +-- + biz.aQute.bndlib.tests/bnd.bnd | 1 - + biz.aQute.jpm/bnd.bnd | 1 - + biz.aQute.launcher/bnd.bnd | 1 - + biz.aQute.repository/bnd.bnd | 1 - + biz.aQute.resolve/bnd.bnd | 3 +-- + 7 files changed, 3 insertions(+), 10 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 @@ +--buildpath: com.springsource.junit,\ +- ee.j2se;version=${javac.ee} ++-buildpath: com.springsource.junit + + 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 + -sub: *.bnd + + -buildpath: aQute.libg;version=latest,\ +- ee.j2se;version=${javac.ee},\ + 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 @@ + osgi.cmpn;version=4.3.0,\ + osgi.core;version=4.2.1,\ + junit.osgi;version=3.8.2,\ +- ee.j2se;version=${javac.ee},\ + 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 + + -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..003ddad 100644 +--- a/biz.aQute.launcher/bnd.bnd ++++ b/biz.aQute.launcher/bnd.bnd +@@ -2,7 +2,6 @@ + aQute.libg;version=project,\ + osgi.core;version=4.2.1,\ + junit.osgi;version=3.8.2,\ +- ee.j2se;version=${javac.ee} + # ee.minimum;version=1.2.1 + + +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,\ + osgi.r5;version=1.0.1,\ + javax.xml.stream-1.0.1.jar;version=file,\ + org.mockito.mockito-all,\ +- ee.j2se;version=${javac.ee},\ + ${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 @@ + junit.osgi,\ + biz.aQute.bndlib;version=snapshot,\ + biz.aQute.repository;version=snapshot,\ +- ee.j2se;version=${javac.ee},\ + org.mockito.mockito-all,\ + osgi.cmpn + +@@ -14,4 +13,4 @@ Export-Package: biz.aQute.resolve,\ + + Private-Package: biz.aQute.resolve.* + +-Conditional-Package: aQute.libg.* +\ No newline at end of file ++Conditional-Package: aQute.libg.* diff --git a/debian/patches/series b/debian/patches/series index 1622a7f..07f94c4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ no_felix.patch no_git_during_build.patch display_bsn_on_missing_bundle.patch fix-encoding.patch +no-ee.j2se.patch -- 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
