[pkg-java] r15724 - in trunk/bnd/debian: . patches

[Damien Raude-Morvan]

Author: drazzib
Date: 2012-01-17 22:22:18 +0000 (Tue, 17 Jan 2012)
New Revision: 15724

Added:
   trunk/bnd/debian/patches/display_bsn_on_missing_bundle.diff
Modified:
   trunk/bnd/debian/bootstrap.xml
   trunk/bnd/debian/changelog
   trunk/bnd/debian/patches/series
   trunk/bnd/debian/rules
Log:
* 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.

Modified: trunk/bnd/debian/bootstrap.xml
===================================================================
--- trunk/bnd/debian/bootstrap.xml	2012-01-17 17:24:25 UTC (rev 15723)
+++ trunk/bnd/debian/bootstrap.xml	2012-01-17 22:22:18 UTC (rev 15724)
@@ -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"/>

Modified: trunk/bnd/debian/changelog
===================================================================
--- trunk/bnd/debian/changelog	2012-01-17 17:24:25 UTC (rev 15723)
+++ trunk/bnd/debian/changelog	2012-01-17 22:22:18 UTC (rev 15724)
@@ -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 <drazzib at debian.org>  Tue, 17 Jan 2012 23:16:19 +0100
+
 bnd (1.50.0-2) unstable; urgency=low
 
   [ Miguel Landaeta ]

Added: trunk/bnd/debian/patches/display_bsn_on_missing_bundle.diff
===================================================================
--- trunk/bnd/debian/patches/display_bsn_on_missing_bundle.diff	                        (rev 0)
+++ trunk/bnd/debian/patches/display_bsn_on_missing_bundle.diff	2012-01-17 22:22:18 UTC (rev 15724)
@@ -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 <drazzib at debian.org>
+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?",

Modified: trunk/bnd/debian/patches/series
===================================================================
--- trunk/bnd/debian/patches/series	2012-01-17 17:24:25 UTC (rev 15723)
+++ trunk/bnd/debian/patches/series	2012-01-17 22:22:18 UTC (rev 15724)
@@ -3,3 +3,4 @@
 no_felix.diff
 no_git_during_build.diff
 osgi43_fixes.diff
+display_bsn_on_missing_bundle.diff

Modified: trunk/bnd/debian/rules
===================================================================
--- trunk/bnd/debian/rules	2012-01-17 17:24:25 UTC (rev 15723)
+++ trunk/bnd/debian/rules	2012-01-17 22:22:18 UTC (rev 15724)
@@ -62,7 +62,7 @@
 	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