[bnd] 19/22: Update no_ee_minimum.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch experimental
in repository bnd.

commit 76b08fc5b4b2b1044c26126248470fcdc333c1db
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu May 14 21:05:13 2015 +0200

    Update no_ee_minimum.patch
---
 debian/patches/no_ee_minimum.patch | 15 ++++++++-------
 debian/patches/no_felix.patch      |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/patches/no_ee_minimum.patch b/debian/patches/no_ee_minimum.patch
index 35d4ba5..dd0871c 100644
--- a/debian/patches/no_ee_minimum.patch
+++ b/debian/patches/no_ee_minimum.patch
@@ -5,8 +5,8 @@ Subject: no_ee_minimum
 ---
  biz.aQute.bndlib/bnd.bnd | 1 -
  biz.aQute.junit/bnd.bnd  | 3 +--
- demo/bnd.bnd             | 4 +---
- 3 files changed, 2 insertions(+), 6 deletions(-)
+ 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
@@ -35,20 +35,21 @@ index f749234..e6a3e85 100644
  Tester-Plugin: aQute.junit.plugin.ProjectTesterImpl
  
 diff --git a/demo/bnd.bnd b/demo/bnd.bnd
-index 6a7086a..9819530 100644
+index 6a7086a..d6a1335 100644
 --- a/demo/bnd.bnd
 +++ b/demo/bnd.bnd
-@@ -3,8 +3,7 @@ Bundle-Activator: com.example.demo.Activator
+@@ -2,9 +2,7 @@ Private-Package: com.example.demo, test
+ Bundle-Activator: com.example.demo.Activator
  Bundle-SymbolicName: demo
  
- -buildpath: osgi.core,\
+--buildpath: osgi.core,\
 -	ee.minimum;version=1.2.1,\
 -	ee.j2se;version=${javac.ee}
-+	ee.minimum;version=1.2.1
++-buildpath: osgi.core
  	
  	
  -testpath: \
-@@ -25,7 +24,6 @@ Import-Package: \
+@@ -25,7 +23,6 @@ Import-Package: \
  	*
  
  -buildpath: osgi.core,\
diff --git a/debian/patches/no_felix.patch b/debian/patches/no_felix.patch
index fb7d2f1..96350e9 100644
--- a/debian/patches/no_felix.patch
+++ b/debian/patches/no_felix.patch
@@ -7,10 +7,10 @@ Subject: no_felix
  1 file changed, 3 deletions(-)
 
 diff --git a/demo/bnd.bnd b/demo/bnd.bnd
-index 9819530..83aae12 100644
+index d6a1335..762127e 100644
 --- a/demo/bnd.bnd
 +++ b/demo/bnd.bnd
-@@ -13,9 +13,6 @@ Bundle-SymbolicName: demo
+@@ -12,9 +12,6 @@ Bundle-SymbolicName: demo
  	org.apache.felix.framework;version='[2.0.5,2.0.5]', \
  	biz.aQute.launcher; version=snapshot
   	

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git