[bnd] 15/17: Add build-without-biz.aQute.repository-and-resolve.patch

[Markus Koschany]

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

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

commit b90507cd2c8fe1d19914f6fda4640e8176545f9f
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon May 18 15:19:30 2015 +0200

    Add build-without-biz.aQute.repository-and-resolve.patch
---
 ...-without-biz.aQute.repository-and-resolve.patch | 43 ++++++++++++++++++++++
 debian/patches/findbugs.patch                      |  2 +-
 debian/patches/series                              |  1 +
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/debian/patches/build-without-biz.aQute.repository-and-resolve.patch b/debian/patches/build-without-biz.aQute.repository-and-resolve.patch
new file mode 100644
index 0000000..0f30c84
--- /dev/null
+++ b/debian/patches/build-without-biz.aQute.repository-and-resolve.patch
@@ -0,0 +1,43 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Mon, 18 May 2015 15:19:00 +0200
+Subject: build without biz.aQute.repository and resolve
+
+---
+ build.xml    | 4 ----
+ 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>
+ 	<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="release">
+ 		<ant dir="biz.aQute.bnd" target="release" />
+-		<ant dir="biz.aQute.repository" target="release" />
+-		<ant dir="biz.aQute.resolve" target="release" />
+ 	</target>
+ 	<target name="clean">
+ 		<iterate target="clean" />
+diff --git a/dist/bnd.bnd b/dist/bnd.bnd
+index cba3e5d..8cd392a 100644
+--- a/dist/bnd.bnd
++++ b/dist/bnd.bnd
+@@ -2,7 +2,7 @@
+ # This directory holds the distribution of the bnd project
+ #
+ 
+--dependson: biz.aQute.bnd, biz.aQute.resolve, biz.aQute.repository, biz.aQute.jpm, osgi.r5
++-dependson: biz.aQute.bnd, biz.aQute.jpm, osgi.r5
+ -nobundles: true
+ 
+ no.junit:	true
diff --git a/debian/patches/findbugs.patch b/debian/patches/findbugs.patch
index ebaefcc..497d55d 100644
--- a/debian/patches/findbugs.patch
+++ b/debian/patches/findbugs.patch
@@ -11,7 +11,7 @@ Forwarded: not-needed
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cnf/build.xml b/cnf/build.xml
-index 17a1761..e759e7f 100644
+index 87d9b4e..709f4d2 100644
 --- a/cnf/build.xml
 +++ b/cnf/build.xml
 @@ -31,7 +31,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index eecb4e5..61805e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ findbugs.patch
 embedded-repo.patch
 FTBFS.patch
 implement-missing-methods.patch
+build-without-biz.aQute.repository-and-resolve.patch

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