[bnd] 07/12: Add build-without-biz.aQute.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 5910e0550c3c2b2c05b54bddb9c181750cc88a3b
Author: Markus Koschany <apo at gambaru.de>
Date:   Sun May 17 15:16:25 2015 +0200

    Add build-without-biz.aQute.resolve.patch
---
 .../build-without-biz.aQute.repository.patch       |  6 ++--
 .../patches/build-without-biz.aQute.resolve.patch  | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/debian/patches/build-without-biz.aQute.repository.patch b/debian/patches/build-without-biz.aQute.repository.patch
index fd6ff2e..cb56f18 100644
--- a/debian/patches/build-without-biz.aQute.repository.patch
+++ b/debian/patches/build-without-biz.aQute.repository.patch
@@ -3,9 +3,9 @@ Date: Sun, 17 May 2015 15:03:45 +0200
 Subject: build without biz.aQute.repository
 
 ---
- build.xml                 | 2 --
- dist/bnd.bnd              | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
+ build.xml    | 2 --
+ dist/bnd.bnd | 2 +-
+ 2 files changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/build.xml b/build.xml
 index 9abfa87..51996fe 100644
diff --git a/debian/patches/build-without-biz.aQute.resolve.patch b/debian/patches/build-without-biz.aQute.resolve.patch
new file mode 100644
index 0000000..a68413a
--- /dev/null
+++ b/debian/patches/build-without-biz.aQute.resolve.patch
@@ -0,0 +1,41 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Sun, 17 May 2015 15:16:05 +0200
+Subject: build without biz.aQute.resolve
+
+---
+ build.xml    | 2 --
+ dist/bnd.bnd | 2 +-
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 51996fe..4540c0a 100644
+--- a/build.xml
++++ b/build.xml
+@@ -10,14 +10,12 @@
+ 	</macrodef>
+ 	<target name="build">
+ 		<ant dir="biz.aQute.bnd" 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.resolve" target="release" />
+ 	</target>
+ 	<target name="clean">
+ 		<iterate target="clean" />
+diff --git a/dist/bnd.bnd b/dist/bnd.bnd
+index 33ada6f..be23a6d 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.jpm
++-dependson: biz.aQute.bnd, biz.aQute.jpm
+ -nobundles: true
+ 
+ no.junit:	true
diff --git a/debian/patches/series b/debian/patches/series
index 753ac52..d946fde 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ embedded-repo.patch
 FTBFS.patch
 implement-missing-methods.patch
 build-without-biz.aQute.repository.patch
+build-without-biz.aQute.resolve.patch

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