The following commit has been merged in the master branch:
commit 9dbae9e703da3cb220caf14377d8d1caf2c19793
Author: Andrew Ross <ubu...@rossfamily.co.uk>
Date: Wed Nov 30 21:27:58 2011 +0000
Updates to fix build with latest osgi-core
diff --git a/debian/patches/netbeans-platform~osgi-4.3.patch
b/debian/patches/netbeans-platform~osgi-4.3.patch
new file mode 100644
index 0000000..11389d5
--- /dev/null
+++ b/debian/patches/netbeans-platform~osgi-4.3.patch
@@ -0,0 +1,28 @@
+Handle minor changes to the osgi core API from 4.2 to 4.3.
+
+Index: netbeans/core.netigso/src/org/netbeans/core/netigso/Netigso.java
+===================================================================
+--- netbeans.orig/core.netigso/src/org/netbeans/core/netigso/Netigso.java
2011-11-29 21:14:05.244675984 +0000
++++ netbeans/core.netigso/src/org/netbeans/core/netigso/Netigso.java
2011-11-29 21:21:41.413842638 +0000
+@@ -112,7 +112,7 @@
+ if (framework == null) {
+ readBundles();
+
+- Map<String, Object> configMap = new HashMap<String, Object>();
++ Map configMap = new HashMap();
+ final String cache = getNetigsoCache().getPath();
+ configMap.put(Constants.FRAMEWORK_STORAGE, cache);
+ activator = new NetigsoActivator();
+Index: netbeans/core.osgi/src/org/netbeans/core/osgi/Activator.java
+===================================================================
+--- netbeans.orig/core.osgi/src/org/netbeans/core/osgi/Activator.java
2011-11-30 20:54:52.197734467 +0000
++++ netbeans/core.osgi/src/org/netbeans/core/osgi/Activator.java
2011-11-30 20:59:13.197733746 +0000
+@@ -324,7 +324,7 @@
+ }
+ BundleContext context =
bundle.getBundleContext();
+ if (context != null) {
+-
context.registerService(URLStreamHandlerService.class.getName(), new Svc(),
props);
++
context.registerService(URLStreamHandlerService.class.getName(), new Svc(),
(Dictionary)props);
+ } else {
+ LOG.log(Level.WARNING, "no context
for {0} in state {1}", new Object[] {bundle.getSymbolicName(),
bundle.getState()});
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 679a67a..3d6427b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@ netbeans~small-ide.patch
netbeans~debugger.jpda.ui.patch
netbeans~xsl.patch
netbeans~db.patch
+netbeans-platform~osgi-4.3.patch
diff --git a/debian/rules b/debian/rules
index b4a6433..0fe5929 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,8 +75,8 @@ override_dh_auto_build:
#TODO $(call symlink, /usr/share/ant/lib,
o.apache.tools.ant.module/external/lib)
################################################################
# Build the Windows launcher
- cd o.n.bootstrap/launcher/windows && make .build-impl nbexec.exe
- cd apisupport.harness/windows-launcher-src && make
+ cd o.n.bootstrap/launcher/windows && LDFLAGS="" make .build-impl
nbexec.exe
+ cd apisupport.harness/windows-launcher-src && LDFLAGS="" make
################################################################
# Build the ide. DISPLAY must be unset to avoid build failures.
unset DISPLAY; ant \
--
netbeans packaging
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
