[netbeans] 26/49: Refresh netbeans-o.n.bootstrap.patch
Markus Koschany
apo-guest at moszumanska.debian.org
Sat Dec 26 20:44:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository netbeans.
commit b1383705c8b979462be5169b1236d996d4db1f9c
Author: Markus Koschany <apo at debian.org>
Date: Fri Dec 25 19:17:23 2015 +0100
Refresh netbeans-o.n.bootstrap.patch
---
debian/patches/netbeans-o.n.bootstrap.patch | 34 +++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 35 insertions(+)
diff --git a/debian/patches/netbeans-o.n.bootstrap.patch b/debian/patches/netbeans-o.n.bootstrap.patch
new file mode 100644
index 0000000..f05eb06
--- /dev/null
+++ b/debian/patches/netbeans-o.n.bootstrap.patch
@@ -0,0 +1,34 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 25 Dec 2015 19:16:50 +0100
+Subject: netbeans o.n.bootstrap
+
+Fixes another FTBFS. We do not build the platform packages with source:netbeans
+and no windows launchers. Therefore we depend on libnb-platform-java and
+disable them here.
+
+Forwarded: not-needed
+---
+ o.n.bootstrap/nbproject/project.properties | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/o.n.bootstrap/nbproject/project.properties b/o.n.bootstrap/nbproject/project.properties
+index bc67095..396d029 100644
+--- a/o.n.bootstrap/nbproject/project.properties
++++ b/o.n.bootstrap/nbproject/project.properties
+@@ -44,11 +44,11 @@ javac.compilerargs=-Xlint -Xlint:-serial
+ javac.source=1.7
+ module.jar.dir=lib
+ module.jar.basename=boot.jar
+-release.launcher/unix/nbexec=lib/nbexec
+-release.launcher/windows/nbexec.exe=lib/nbexec.exe
+-release.launcher/windows/nbexec64.exe=lib/nbexec64.exe
+-release.launcher/windows/nbexec.dll=lib/nbexec.dll
+-release.launcher/windows/nbexec64.dll=lib/nbexec64.dll
++#release.launcher/unix/nbexec=lib/nbexec
++#release.launcher/windows/nbexec.exe=lib/nbexec.exe
++#release.launcher/windows/nbexec64.exe=lib/nbexec64.exe
++#release.launcher/windows/nbexec.dll=lib/nbexec.dll
++#release.launcher/windows/nbexec64.dll=lib/nbexec64.dll
+ nbm.executable.files=lib/nbexec
+
+ javadoc.arch=${basedir}/arch.xml
diff --git a/debian/patches/series b/debian/patches/series
index c3b4b0f..4ed4717 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ netbeans-build.patch
netbeans-updatecenters.patch
reproducible-build.patch
netbeans-cluster-properties.patch
+netbeans-o.n.bootstrap.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git
More information about the pkg-java-commits
mailing list