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

[Jakub Adam]

Author: xhaakon-guest
Date: 2012-04-30 18:15:40 +0000 (Mon, 30 Apr 2012)
New Revision: 16026

Added:
   trunk/bnd/debian/patches/find_swt_jar.diff
Modified:
   trunk/bnd/debian/changelog
   trunk/bnd/debian/patches/series
   trunk/bnd/debian/rules
Log:
Fix FTBFS after update to eclipse 3.7.2-1

Modified: trunk/bnd/debian/changelog
===================================================================
--- trunk/bnd/debian/changelog	2012-04-30 13:15:43 UTC (rev 16025)
+++ trunk/bnd/debian/changelog	2012-04-30 18:15:40 UTC (rev 16026)
@@ -1,3 +1,9 @@
+bnd (1.50.0-4) UNRELEASED; urgency=low
+
+  * Fix FTBFS after update to eclipse 3.7.2-1 (Closes: #669533).
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 30 Apr 2012 19:42:26 +0200
+
 bnd (1.50.0-3) unstable; urgency=low
 
   * d/rules: Fix broken link with Eclipse JDT during build. (Closes: #655548).

Added: trunk/bnd/debian/patches/find_swt_jar.diff
===================================================================
--- trunk/bnd/debian/patches/find_swt_jar.diff	                        (rev 0)
+++ trunk/bnd/debian/patches/find_swt_jar.diff	2012-04-30 18:15:40 UTC (rev 16026)
@@ -0,0 +1,21 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Mon, 30 Apr 2012 19:50:31 +0200
+Subject: find_swt_jar
+
+---
+ biz.aQute.bnd/bnd.bnd |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/biz.aQute.bnd/bnd.bnd b/biz.aQute.bnd/bnd.bnd
+index b15cd90..b54ed5c 100644
+--- a/biz.aQute.bnd/bnd.bnd
++++ b/biz.aQute.bnd/bnd.bnd
+@@ -28,7 +28,7 @@ Bundle-License: 				http://www.opensource.org/licenses/apache2.0.php; \
+ 	org.eclipse.ui.editors,\
+ 	org.eclipse.ui.ide,\
+ 	org.eclipse.ui.workbench.texteditor,\
+-	org.eclipse.swt.carbon.macosx,\
++	org.eclipse.swt,\
+ 	org.eclipse.core.jobs,\
+ 	org.eclipse.equinox.common,\
+ 	org.eclipse.equinox.registry,\

Modified: trunk/bnd/debian/patches/series
===================================================================
--- trunk/bnd/debian/patches/series	2012-04-30 13:15:43 UTC (rev 16025)
+++ trunk/bnd/debian/patches/series	2012-04-30 18:15:40 UTC (rev 16026)
@@ -4,3 +4,4 @@
 no_git_during_build.diff
 osgi43_fixes.diff
 display_bsn_on_missing_bundle.diff
+find_swt_jar.diff

Modified: trunk/bnd/debian/rules
===================================================================
--- trunk/bnd/debian/rules	2012-04-30 13:15:43 UTC (rev 16025)
+++ trunk/bnd/debian/rules	2012-04-30 18:15:40 UTC (rev 16026)
@@ -49,7 +49,6 @@
 		cnf/repo/org.eclipse.ui.ide \
 		cnf/repo/org.eclipse.core.jobs \
 		cnf/repo/org.eclipse.text \
-		cnf/repo/org.eclipse.swt.carbon.macosx \
 		cnf/repo/org.osgi.impl.bundle.bindex
 	ln -s $(CURDIR)/bootstrap/bnd.jar cnf/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar
 	ln -s /usr/share/java/junit.jar cnf/repo/com.springsource.junit/com.springsource.junit-3.8.2.jar
@@ -81,7 +80,6 @@
 	ln -s /usr/lib/eclipse/plugins/org.eclipse.ui.ide_*.jar cnf/repo/org.eclipse.ui.ide/org.eclipse.ui.ide-3.3.2.jar
 	ln -s /usr/lib/eclipse/plugins/org.eclipse.core.jobs_*.jar cnf/repo/org.eclipse.core.jobs/org.eclipse.core.jobs-3.3.1.jar
 	ln -s /usr/lib/eclipse/plugins/org.eclipse.text_*.jar cnf/repo/org.eclipse.text/org.eclipse.text-3.5.100.jar
-	ln -s /usr/lib/eclipse/plugins/org.eclipse.swt.*_*.jar cnf/repo/org.eclipse.swt.carbon.macosx/org.eclipse.swt.carbon.macosx-3.3.3.jar
 	ln -s /usr/share/java/bindex.jar cnf/repo/org.osgi.impl.bundle.bindex/org.osgi.impl.bundle.bindex-2.2.0.jar
 	touch $@
 clean-bootstrap: DEB_BUILDDIR=$(CURDIR)