This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository bnd.
commit 05917243903a95f3f223aad5fdb080c3133aa012 Author: Markus Koschany <[email protected]> Date: Mon May 18 15:05:00 2015 +0200 Drop no_felix.patch. --- debian/changelog | 1 + debian/patches/no_felix.patch | 22 ---------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2666a92..feaca65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ bnd (2.1.0-1) experimental; urgency=medium - osgi43_fixes.diff * 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. * Delete debian/ant.properties file because it was not used. * Use patch extension instead of diff for patches. * New patches: diff --git a/debian/patches/no_felix.patch b/debian/patches/no_felix.patch deleted file mode 100644 index 96350e9..0000000 --- a/debian/patches/no_felix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Debian Java Maintainers <[email protected]> -Date: Thu, 14 May 2015 13:17:37 +0200 -Subject: no_felix - ---- - demo/bnd.bnd | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/demo/bnd.bnd b/demo/bnd.bnd -index d6a1335..762127e 100644 ---- a/demo/bnd.bnd -+++ b/demo/bnd.bnd -@@ -12,9 +12,6 @@ Bundle-SymbolicName: demo - org.apache.felix.framework;version='[2.0.5,2.0.5]', \ - biz.aQute.launcher; version=snapshot - ---runbundles: org.apache.felix.scr,\ -- org.apache.felix.configadmin -- - - Bundle-Activator: test.TestActivator - diff --git a/debian/patches/series b/debian/patches/series index cd0332c..9811947 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ no_ee_minimum.patch -no_felix.patch no_git_during_build.patch display_bsn_on_missing_bundle.patch no-ee.j2se.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
