This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository bnd.
commit 269f6d35d0f5a82c642a917707c64b13a56b9597 Author: Markus Koschany <[email protected]> Date: Mon May 18 15:17:18 2015 +0200 Rebase build-without-biz.aQute.repository.patch --- .../build-without-biz.aQute.repository.patch | 46 ---------------------- debian/patches/series | 1 - 2 files changed, 47 deletions(-) diff --git a/debian/patches/build-without-biz.aQute.repository.patch b/debian/patches/build-without-biz.aQute.repository.patch deleted file mode 100644 index cc3be5a..0000000 --- a/debian/patches/build-without-biz.aQute.repository.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Sun, 17 May 2015 15:03:45 +0200 -Subject: build without biz.aQute.repository - -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 9abfa87..51996fe 100644 ---- a/build.xml -+++ b/build.xml -@@ -10,7 +10,6 @@ - </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" > -@@ -18,7 +17,6 @@ - </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"> -diff --git a/dist/bnd.bnd b/dist/bnd.bnd -index d827250..33ada6f 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 -+-dependson: biz.aQute.bnd, biz.aQute.resolve, biz.aQute.jpm - -nobundles: true - - no.junit: true diff --git a/debian/patches/series b/debian/patches/series index 1e6c8ef..95862e8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,5 +5,4 @@ findbugs.patch 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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
