This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository bnd.
commit 6e6a1d155d45a8a9f03386a670fd86ac7031202a Author: Markus Koschany <[email protected]> Date: Mon May 18 15:17:51 2015 +0200 Rebase build-without-biz.aQute.resolve.patch --- .../patches/build-without-biz.aQute.resolve.patch | 45 ---------------------- debian/patches/series | 1 - 2 files changed, 46 deletions(-) diff --git a/debian/patches/build-without-biz.aQute.resolve.patch b/debian/patches/build-without-biz.aQute.resolve.patch deleted file mode 100644 index ca5d56f..0000000 --- a/debian/patches/build-without-biz.aQute.resolve.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Sun, 17 May 2015 15:16:05 +0200 -Subject: build without biz.aQute.resolve - -Build without biz.aQute.repository. Reason: Debian provides its own way of -distributing dependencies. Thus a separate repository is not needed. - -Forwarded: not-needed ---- - 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 95862e8..eecb4e5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,4 +5,3 @@ findbugs.patch embedded-repo.patch FTBFS.patch implement-missing-methods.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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
