This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository bnd.
commit ae8a34447fabc3bbf378d74d6ccf6ed22445b31c Author: Markus Koschany <[email protected]> Date: Mon May 18 15:09:57 2015 +0200 Drop no_git_during_build.patch --- debian/changelog | 19 ++++++++++--------- debian/patches/no_git_during_build.patch | 21 --------------------- debian/patches/series | 1 - 3 files changed, 10 insertions(+), 31 deletions(-) diff --git a/debian/changelog b/debian/changelog index feaca65..1b1f375 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,20 +14,21 @@ bnd (2.1.0-1) experimental; urgency=medium - find_swt_jar.diff - java8-compatibility.diff - osgi43_fixes.diff + * Use patch extension instead of diff for patches. * Drop fix-encoding.patch and use upstream values instead. * Drop build_excludes.patch and use upstream values again. * Drop no_felix.patch because bnd builds fine without it. + * Drop no_git_during_build.patch because bnd builds fine without it. * Delete debian/ant.properties file because it was not used. - * Use patch extension instead of diff for patches. * New patches: - - no-ee.j2se.patch - - no-osgi.r5.patch - - findbugs.patch - - embedded-repo.patch - - FTBFS.patch - - implement-missing-methods.patch - - build-without-biz.aQute.repository.patch - - build-without-biz.aQute.resolve.patch + - no-ee.j2se.patch + - no-osgi.r5.patch + - findbugs.patch + - embedded-repo.patch + - FTBFS.patch + - implement-missing-methods.patch + - build-without-biz.aQute.repository.patch + - build-without-biz.aQute.resolve.patch * debian/control: - Add findbugs to Build-Depends. - Add junit4 to Build-Depends. diff --git a/debian/patches/no_git_during_build.patch b/debian/patches/no_git_during_build.patch deleted file mode 100644 index d7cb36b..0000000 --- a/debian/patches/no_git_during_build.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Debian Java Maintainers <[email protected]> -Date: Thu, 14 May 2015 13:17:37 +0200 -Subject: no_git_during_build - ---- - cnf/build.bnd | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cnf/build.bnd b/cnf/build.bnd -index 79189ef..7140407 100644 ---- a/cnf/build.bnd -+++ b/cnf/build.bnd -@@ -1,6 +1,6 @@ - # We use git --Git-Descriptor: ${system-allow-fail;git describe --dirty --always} --Git-SHA: ${system-allow-fail;git rev-list -1 HEAD} -+#Git-Descriptor: ${system-allow-fail;git describe --dirty --always} -+#Git-SHA: ${system-allow-fail;git rev-list -1 HEAD} - - Bundle-SCM = git://github.com/bndtools/bnd.git - diff --git a/debian/patches/series b/debian/patches/series index 9811947..359497b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ no_ee_minimum.patch -no_git_during_build.patch display_bsn_on_missing_bundle.patch no-ee.j2se.patch no-osgi.r5.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
