This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit 14e54d54bf11493997b909fa6a7977eb552a5ca6 Author: Markus Koschany <[email protected]> Date: Thu Dec 17 01:38:16 2015 +0100 Drop netbeans-ide-launcher.patch --- debian/patches/netbeans-ide-launcher.patch | 61 ------------------------------ debian/patches/series | 1 - 2 files changed, 62 deletions(-) diff --git a/debian/patches/netbeans-ide-launcher.patch b/debian/patches/netbeans-ide-launcher.patch deleted file mode 100644 index 321e6bd..0000000 --- a/debian/patches/netbeans-ide-launcher.patch +++ /dev/null @@ -1,61 +0,0 @@ -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 ++++----- - 2 files changed, 5 insertions(+), 6 deletions(-) - -diff --git a/ide/launcher/netbeans.conf b/ide/launcher/netbeans.conf -index fa3afde..1ace6bb 100644 ---- a/ide/launcher/netbeans.conf -+++ b/ide/launcher/netbeans.conf -@@ -43,7 +43,7 @@ netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/8.0.2" - # Concurrent Mark & Sweep garbage collector. - # (see http://wiki.netbeans.org/FaqGCPauses) - # --netbeans_default_options="-J-client -J-Xss2m -J-Xms32m -J-XX:PermSize=32m -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dsun.zip.disableMemoryMapping=true" -+netbeans_default_options="-J-client -J-Xss2m -J-Xms32m -J-XX:PermSize=32m -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dsun.zip.disableMemoryMapping=true -J-Dsun.java2d.pmoffscreen=false" - - # Default location of JDK: - # (set by installer or commented out if launcher should decide) -diff --git a/ide/launcher/unix/netbeans b/ide/launcher/unix/netbeans -index 8218c36..afc9d38 100644 ---- a/ide/launcher/unix/netbeans -+++ b/ide/launcher/unix/netbeans -@@ -57,7 +57,7 @@ while [ -h "$PRG" ]; do - fi - done - --progdir=`dirname "$PRG"` -+progdir=/usr/share/netbeans/8.0.2/bin - old=`pwd` - cd "$progdir"/.. - basedir=`pwd` -@@ -84,9 +84,9 @@ if [ -f "$basedir"/etc/netbeans.conf ] ; then - fi - - # following should be done just in RPM or Solaris Launcher --# if [ -f /etc/netbeans.conf ] ; then --# . /etc/netbeans.conf --# fi -+ if [ -f /etc/netbeans.conf ] ; then -+ . /etc/netbeans.conf -+ fi - - export DEFAULT_USERDIR_ROOT - -@@ -236,7 +236,6 @@ case "`uname`" in - --branding nb \ - --clusters '"$netbeans_clusters"' \ - -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \ -- -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \ - ${netbeans_default_options} \ - '"$@"' - ;; diff --git a/debian/patches/series b/debian/patches/series index 20faf53..ac14575 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,7 +13,6 @@ netbeans-spi.java.hints.patch netbeans-libs.jaxb.patch netbeans-xml.jaxb.api.patch netbeans-build.patch -netbeans-ide-launcher.patch netbeans-small-ide.patch netbeans-xsl-httpserver.patch netbeans-svnclient.patch -- 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
