This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit b2e78d80704a1a87fece68a6b53987b7196a0a29 Author: Markus Koschany <[email protected]> Date: Sun Jun 14 21:50:56 2015 +0200 Improve DEP-3 headers. --- debian/patches/netbeans-build.patch | 4 ++++ debian/patches/netbeans-cluster-properties.patch | 4 ++++ debian/patches/netbeans-ide-launcher.patch | 5 +++++ debian/patches/netbeans-javacc.patch | 3 +++ debian/patches/netbeans-libs.jaxb.patch | 3 +++ debian/patches/netbeans-nocopy.patch | 4 ++++ debian/patches/netbeans-o.apache.tools.ant.module.patch | 4 ++++ debian/patches/netbeans-platform-o.n.bootstrap.patch | 5 +++++ debian/patches/netbeans-slf4j.dummy.patch | 8 ++++++++ debian/patches/netbeans-small-ide.patch | 3 +++ debian/patches/netbeans-svnclient.patch | 4 ++++ debian/patches/netbeans-updatecenters.patch | 4 ++++ debian/patches/netbeans-xml.jaxb.api.patch | 4 ++++ debian/patches/netbeans-xsl-httpserver.patch | 4 ++++ 14 files changed, 59 insertions(+) diff --git a/debian/patches/netbeans-build.patch b/debian/patches/netbeans-build.patch index 6752a7b..275f449 100644 --- a/debian/patches/netbeans-build.patch +++ b/debian/patches/netbeans-build.patch @@ -2,6 +2,10 @@ From: Markus Koschany <[email protected]> Date: Wed, 10 Jun 2015 13:02:05 +0200 Subject: netbeans build +Fix FTBFS since we changed the build system in regard of building the windows +executables. + +Forwarded: not-needed --- nbbuild/build.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/patches/netbeans-cluster-properties.patch b/debian/patches/netbeans-cluster-properties.patch index d2d3fe1..dd10ac6 100644 --- a/debian/patches/netbeans-cluster-properties.patch +++ b/debian/patches/netbeans-cluster-properties.patch @@ -2,6 +2,10 @@ From: Markus Koschany <[email protected]> Date: Sun, 7 Jun 2015 13:53:31 +0200 Subject: netbeans cluster properties +Disable modules which are either not supported by us, depend on packages which +are not in Debian yet or cause other build failures. + +Forwarded: not-needed --- nbbuild/cluster.properties | 97 +--------------------------------------------- 1 file changed, 2 insertions(+), 95 deletions(-) diff --git a/debian/patches/netbeans-ide-launcher.patch b/debian/patches/netbeans-ide-launcher.patch index 22a4c0d..177f87a 100644 --- a/debian/patches/netbeans-ide-launcher.patch +++ b/debian/patches/netbeans-ide-launcher.patch @@ -2,6 +2,11 @@ From: Markus Koschany <[email protected]> Date: Wed, 10 Jun 2015 14:30:38 +0200 Subject: netbeans ide launcher +Update the launcher script to use Debian specific paths and start parameters. +Disable check for license agreement since we have debian/copyright for that in +Debian. + +Forwarded: not-needed --- ide/launcher/netbeans.conf | 2 +- ide/launcher/unix/netbeans | 9 ++++----- diff --git a/debian/patches/netbeans-javacc.patch b/debian/patches/netbeans-javacc.patch index 0912407..5339057 100644 --- a/debian/patches/netbeans-javacc.patch +++ b/debian/patches/netbeans-javacc.patch @@ -2,6 +2,9 @@ From: Markus Koschany <[email protected]> Date: Mon, 8 Jun 2015 17:23:04 +0200 Subject: netbeans javacc +Use Debian's system javacc.jar. + +Forwarded: not-needed --- db.sql.visualeditor/build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/patches/netbeans-libs.jaxb.patch b/debian/patches/netbeans-libs.jaxb.patch index 25c7a50..3d502e1 100644 --- a/debian/patches/netbeans-libs.jaxb.patch +++ b/debian/patches/netbeans-libs.jaxb.patch @@ -2,6 +2,9 @@ From: Markus Koschany <[email protected]> Date: Wed, 10 Jun 2015 11:46:45 +0200 Subject: netbeans libs.jaxb +Fix another FTBFS and use Debian's system jars. + +Forwarded: not-needed --- libs.jaxb/nbproject/project.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/patches/netbeans-nocopy.patch b/debian/patches/netbeans-nocopy.patch index be69c65..1e84261 100644 --- a/debian/patches/netbeans-nocopy.patch +++ b/debian/patches/netbeans-nocopy.patch @@ -2,6 +2,10 @@ From: Markus Koschany <[email protected]> Date: Mon, 8 Jun 2015 13:45:17 +0200 Subject: netbeans nocopy +Fix a FTBFS. Do not copy files which we don't use or are replaced by system jar +files. + +Forwarded: not-needed --- css.editor/nbproject/project.properties | 4 ++-- db.drivers/nbproject/project.properties | 4 ++-- diff --git a/debian/patches/netbeans-o.apache.tools.ant.module.patch b/debian/patches/netbeans-o.apache.tools.ant.module.patch index e039c2b..462ce33 100644 --- a/debian/patches/netbeans-o.apache.tools.ant.module.patch +++ b/debian/patches/netbeans-o.apache.tools.ant.module.patch @@ -2,6 +2,10 @@ From: Markus Koschany <[email protected]> Date: Tue, 9 Jun 2015 19:06:47 +0200 Subject: netbeans o.apache.tools.ant.module +Use Debian's ant package and don't unzip the now non-existent embedded ant +version. + +Forwarded: not-needed --- o.apache.tools.ant.module/build.xml | 4 ++-- o.apache.tools.ant.module/external/build.xml | 2 +- diff --git a/debian/patches/netbeans-platform-o.n.bootstrap.patch b/debian/patches/netbeans-platform-o.n.bootstrap.patch index 509a8c5..c5fc407 100644 --- a/debian/patches/netbeans-platform-o.n.bootstrap.patch +++ b/debian/patches/netbeans-platform-o.n.bootstrap.patch @@ -2,6 +2,11 @@ From: Markus Koschany <[email protected]> Date: Sun, 14 Jun 2015 16:33:34 +0200 Subject: netbeans platform o.n.bootstrap +Fixes another FTBFS. We do not build the platform packages wit 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/debian/patches/netbeans-slf4j.dummy.patch b/debian/patches/netbeans-slf4j.dummy.patch index c7fb07b..3258b57 100644 --- a/debian/patches/netbeans-slf4j.dummy.patch +++ b/debian/patches/netbeans-slf4j.dummy.patch @@ -2,6 +2,14 @@ From: Markus Koschany <[email protected]> Date: Sun, 14 Jun 2015 02:44:00 +0200 Subject: netbeans slf4j.dummy +Fix a runtime error when loading the o.eclipse.jgit module. The bundle expects +the org.slf4j package but it is not exported by other packages. Hence we have +to create a dummy package similar to javaewah.dummy. Other methods like +symlinking slf4j to the same directory or the ext/ directory did not work. +Another solution would be to remove org.slf4j from the MANIFEST.MF file of the +o.eclipse.jgit module. + +Forwarded: not-needed --- nbbuild/cluster.properties | 1 + o.eclipse.jgit/nbproject/project.xml | 5 +++++ diff --git a/debian/patches/netbeans-small-ide.patch b/debian/patches/netbeans-small-ide.patch index 42c668e..0b751d7 100644 --- a/debian/patches/netbeans-small-ide.patch +++ b/debian/patches/netbeans-small-ide.patch @@ -2,6 +2,9 @@ From: Markus Koschany <[email protected]> Date: Thu, 11 Jun 2015 23:17:00 +0200 Subject: netbeans small ide +Don't include all modules in the build but only those which we can support. + +Forwarded: not-needed --- apisupport.kit/nbproject/project.xml | 4 ++-- editor.kit/nbproject/project.xml | 8 ++++---- diff --git a/debian/patches/netbeans-svnclient.patch b/debian/patches/netbeans-svnclient.patch index 9638e64..ca059ce 100644 --- a/debian/patches/netbeans-svnclient.patch +++ b/debian/patches/netbeans-svnclient.patch @@ -2,6 +2,10 @@ From: Markus Koschany <[email protected]> Date: Fri, 12 Jun 2015 16:35:17 +0200 Subject: netbeans svnclient +Fix the SVN module of Netbeans and add all necessary jar files to the +classpath. + +Forwarded: not-needed --- libs.svnClientAdapter.javahl/nbproject/project.properties | 2 +- libs.svnClientAdapter.javahl/nbproject/project.xml | 6 +++--- diff --git a/debian/patches/netbeans-updatecenters.patch b/debian/patches/netbeans-updatecenters.patch index e9ad862..8a0e062 100644 --- a/debian/patches/netbeans-updatecenters.patch +++ b/debian/patches/netbeans-updatecenters.patch @@ -2,6 +2,10 @@ From: Markus Koschany <[email protected]> Date: Fri, 12 Jun 2015 22:44:34 +0200 Subject: netbeans updatecenters +Disable the updatecenters by default. Let users opt-in if they want to download +and update plugins. + +Forwarded: not-needed --- .../src/org/netbeans/modules/updatecenters/resources/mf-layer.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/patches/netbeans-xml.jaxb.api.patch b/debian/patches/netbeans-xml.jaxb.api.patch index 5fca477..c41cf65 100644 --- a/debian/patches/netbeans-xml.jaxb.api.patch +++ b/debian/patches/netbeans-xml.jaxb.api.patch @@ -2,6 +2,10 @@ From: Markus Koschany <[email protected]> Date: Wed, 10 Jun 2015 12:34:04 +0200 Subject: netbeans xml.jaxb.api +Fix another FTBFS. activation.jar and jsr173_1.0_api.jar are not required on +Debian systems because we support Java7 already. + +Forwarded: not-needed --- xml.jaxb.api/nbproject/project.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/patches/netbeans-xsl-httpserver.patch b/debian/patches/netbeans-xsl-httpserver.patch index 9e46d39..5d30074 100644 --- a/debian/patches/netbeans-xsl-httpserver.patch +++ b/debian/patches/netbeans-xsl-httpserver.patch @@ -2,6 +2,10 @@ From: Markus Koschany <[email protected]> Date: Fri, 12 Jun 2015 01:11:12 +0200 Subject: netbeans xsl httpserver +Do not require the httpserver module since it is disabled. +Fixes a runtime error. Without this patch most base modules cannot be loaded. + +Forwarded: not-needed --- xsl/manifest.mf | 1 - 1 file changed, 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
