This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to annotated tag debian/1.50.0-4 in repository bnd.
commit 7a08459ce0fc849f41eb30f6a06c38c73fccf8a7 Author: Damien Raude-Morvan <[email protected]> Date: Tue Jan 17 22:22:18 2012 +0000 * d/rules: Fix broken link with Eclipse JDT during build. (Closes: #655548). * d/patches/display_bsn_on_missing_bundle.diff: Improve error message when some bundle is missing. --- debian/bootstrap.xml | 3 ++- debian/changelog | 8 +++++++ debian/patches/display_bsn_on_missing_bundle.diff | 29 +++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 2 +- 5 files changed, 41 insertions(+), 2 deletions(-) diff --git a/debian/bootstrap.xml b/debian/bootstrap.xml index 6d69a47..6bc7ae5 100644 --- a/debian/bootstrap.xml +++ b/debian/bootstrap.xml @@ -10,7 +10,8 @@ <mkdir dir="bootstrap/build"/> <javac destdir="bootstrap/build" - classpath="/usr/share/java/osgi.core.jar:/usr/share/java/osgi.compendium.jar:/usr/share/java/bindex.jar"> + classpath="/usr/share/java/osgi.core.jar:/usr/share/java/osgi.compendium.jar:/usr/share/java/bindex.jar" + debug="true"> <src path="aQute.libg/src"/> <src path="biz.aQute.bndlib/src"/> <src path="biz.aQute.bnd/src"/> diff --git a/debian/changelog b/debian/changelog index f4e2c91..ac8e466 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +bnd (1.50.0-3) unstable; urgency=low + + * d/rules: Fix broken link with Eclipse JDT during build. (Closes: #655548). + * d/patches/display_bsn_on_missing_bundle.diff: Improve error message when + some bundle is missing. + + -- Damien Raude-Morvan <[email protected]> Tue, 17 Jan 2012 23:16:19 +0100 + bnd (1.50.0-2) unstable; urgency=low [ Miguel Landaeta ] diff --git a/debian/patches/display_bsn_on_missing_bundle.diff b/debian/patches/display_bsn_on_missing_bundle.diff new file mode 100644 index 0000000..f2b1716 --- /dev/null +++ b/debian/patches/display_bsn_on_missing_bundle.diff @@ -0,0 +1,29 @@ +Description: Add a print to System.err when some bundle + is missing (will improve diagnostic when some symlink is broken). +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2012-01-17 +--- a/biz.aQute.bndlib/src/aQute/bnd/build/Project.java ++++ b/biz.aQute.bndlib/src/aQute/bnd/build/Project.java +@@ -977,8 +977,11 @@ + File file = plugin.get(bsn, range, useStrategy, attrs); + // and the entry must exist + // if it does, return this as a result +- if (file != null) ++ if (file != null) { + return toContainer(bsn, range, attrs, file); ++ } else { ++ System.err.println("Missing: " + bsn + " " + range); ++ } + } + } + } +@@ -1002,6 +1005,9 @@ + RepositoryPlugin repo = versions.get(provider); + String version = provider.toString(); + File result = repo.get(bsn, version, Strategy.EXACT, attrs); ++ if (result == null) { ++ System.err.println("Missing: " + bsn + " " + range); ++ } + return toContainer(bsn, version, attrs, result); + } else + error("Unexpected, found versions %s but then not provider for startegy %s?", diff --git a/debian/patches/series b/debian/patches/series index 13f8c9a..94a2be4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ no_ee_minimum.diff no_felix.diff no_git_during_build.diff osgi43_fixes.diff +display_bsn_on_missing_bundle.diff diff --git a/debian/rules b/debian/rules index 482ca40..6407f0b 100755 --- a/debian/rules +++ b/debian/rules @@ -62,7 +62,7 @@ debian/stamp-bootstrap: ln -s /usr/lib/eclipse/plugins/org.eclipse.core.runtime_*.jar cnf/repo/org.eclipse.core.runtime/org.eclipse.core.runtime-3.3.100.jar ln -s /usr/lib/eclipse/plugins/org.eclipse.core.resources_*.jar cnf/repo/org.eclipse.core.resources/org.eclipse.core.resources-3.3.1.jar ln -s /usr/lib/eclipse/plugins/org.eclipse.core.commands_*.jar cnf/repo/org.eclipse.core.commands/org.eclipse.core.commands-3.3.3.jar - ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar cnf/repo/org.eclipse.jdt.core/org.eclipse.jdt.core-3.3.3.jar + ln -s /usr/lib/eclipse/plugins/org.eclipse.jdt.core_*.jar cnf/repo/org.eclipse.jdt.core/org.eclipse.jdt.core-3.3.3.jar ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.ui_*.jar cnf/repo/org.eclipse.jdt.ui/org.eclipse.jdt.ui-3.3.3.jar ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*.jar cnf/repo/org.eclipse.jdt.debug.ui/org.eclipse.jdt.debug.ui-3.2.102.jar ln -s /usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit_*.jar cnf/repo/org.eclipse.jdt.junit/org.eclipse.jdt.junit-3.3.3.jar -- 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
