--- netbeans-6.9.orig/debian/netbeans.dirs +++ netbeans-6.9/debian/netbeans.dirs @@ -0,0 +1,5 @@ +usr/share/netbeans/6.9/bin +usr/share/netbeans/6.9/etc +usr/share/netbeans/6.9/nb/var +usr/share/netbeans/6.9/nb/config +etc --- netbeans-6.9.orig/debian/control +++ netbeans-6.9/debian/control @@ -0,0 +1,62 @@ +Source: netbeans +Section: devel +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Yulia Novozhilova +Build-Depends: debhelper (>= 7), cdbs (>= 0.4.63), + ant (>= 1.7.0), ant-optional (>= 1.7.0), + default-jdk, javahelp2 +Build-Depends-Indep: libswing-layout-java (>= 1.0.3), + libnb-platform12-java (>= 6.9), libnb-platform-devel-java (>= 6.9), + libnb-javaparser-java (>= 6.9), libnb-svnclientadapter-java (>= 6.7), + libfreemarker-java, libjsch-java (>= 0.1.42), libxml-commons-resolver1.1-java (>= 1.2-3), + libxerces2-java, liblucene2-java (>= 2.4.1), libappframework-java, + libbeansbinding-java, junit, libcommons-logging-java, + libini4j-java (>=0.4.1), libsvn-java, liboro-java, libcommons-net-java, libswingworker-java, + jruby1.1, libswingx-java (>=0.9.5), libjzlib-java (>= 1.0.7), libservlet2.3-java, w3c-dtd-xhtml +Standards-Version: 3.9.0 +Homepage: http://www.netbeans.org + +Package: netbeans +Architecture: all +Section: devel +Depends: ${misc:Depends}, libnb-platform12-java (>= 6.9), + libnb-ide13-java (= ${binary:Version}), + libnb-java4-java (= ${binary:Version}), + libnb-apisupport2-java (= ${binary:Version}) +Conflicts: netbeans5.5, netbeans-ide +Replaces: netbeans5.5, netbeans-ide +Description: Extensible Java IDE + Integrated Development Environment for software developers. It supports + development of desktop, enterprise, web, and mobile applications. Package + includes the Base IDE, Java Development Tools and Plug-in Development Tools. + Support for PHP, Ruby, C/C++, Java EE and others can be added. + +Package: libnb-ide13-java +Architecture: all +Section: java +Depends: ${misc:Depends}, libnb-platform12-java (>= 6.9), libfreemarker-java, libjsch-java(>=0.1.42), + libxml-commons-resolver1.1-java(>= 1.2-3), libnb-svnclientadapter-java (>= 6.7), + libxerces2-java, libcommons-logging-java, libini4j-java(>=0.4.1), liblucene2-java(>=2.3.2), + libsvn-java, liboro-java, libcommons-net-java, jruby1.1, libswingx-java (>=0.9.5), + libjzlib-java (>= 1.0.7), libservlet2.3-java, liblog4j1.2-java +Description: Common Integrated Development Environment Libraries for NetBeans + Common languages independent libraries for use in the NetBeans IDE. + +Package: libnb-java4-java +Architecture: all +Section: java +Depends: ${misc:Depends}, default-jdk | sun-java6-jdk, libnb-platform12-java (>= 6.9), + libnb-ide13-java (= ${binary:Version}), libnb-javaparser-java (>= 6.9), + libappframework-java, ant (>= 1.7.0), ant-optional (>= 1.7.0), + libbeansbinding-java, junit, libswingworker-java, default-jdk-doc | sun-java6-doc +Description: Common Java Related Libraries for NetBeans + Common libraries for the NetBeans Java IDE. + +Package: libnb-apisupport2-java +Architecture: all +Section: java +Depends: ${misc:Depends}, libnb-platform12-java (>= 6.9), libnb-platform-devel-java (>= 6.9), + libnb-ide13-java (= ${binary:Version}), libnb-java4-java (= ${binary:Version}) +Description: Common NetBeans Platform Development Related Libraries for NetBeans + Common libraries for development of NetBeans Platform modular extensions. --- netbeans-6.9.orig/debian/rules +++ netbeans-6.9/debian/rules @@ -0,0 +1,214 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 + +export JAVA_HOME=/usr/lib/jvm/default-java + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +#package names +pkg-nb := netbeans + +base-apisupport := apisupport2 +base-ide := ide13 +base-java := java4 +base-nb := nb6.9 +base-platform := platform12 + +pkg-apisupport := libnb-$(base-apisupport)-java +pkg-ide := libnb-$(base-ide)-java +pkg-java := libnb-$(base-java)-java + +NBDIR := /usr/share/netbeans +JAVADIR := /usr/share/java + +JHALL_JAR := jhall.jar +JSEARCH_JAR := jsearch.jar +JH_JAR := jh.jar +SWINGL_JAR := swing-layout.jar +JAVAC_API_JAR := javac-api.jar +JAVAC_IMPL_JAR := javac-impl.jar + +NB_SWINGL_JAR := swing-layout-1.0.4.jar +NB_JSEARCH_JAR := jsearch-2.0_05.jar +NB_JH_JAR := jh-2.0_05.jar +NB_JAVAC_API_JAR := javac-api-nb-7.0-b07.jar +NB_JAVAC_IMPL_JAR := javac-impl-nb-7.0-b07.jar +NB_JSR223_JAR := jsr223-api.jar + + +NB_INSTALL_DIR := usr/share/netbeans + +INSTALL := dh_install -p +LINK := dh_link -p + +NB_PLATFORM_BUILD_DIR := $(shell pwd)/nbbuild/netbeans/platform + +DEB_INSTALL_MANPAGES_$(pkg-nb) = $(DEB_SRCDIR)/debian/netbeans.1 + +build/$(pkg-nb):: stamp-build-$(pkg-nb) +# This target is here to avoid multiple invocation of build target. +# build/$(pkg-nb) is invoked 2 times when building binary packages. +stamp-build-$(pkg-nb): + mkdir -p $(DEB_SRCDIR)/nbbuild/netbeans + ln -sf $(NBDIR)/$(base-platform) $(DEB_SRCDIR)/nbbuild/netbeans/platform + ln -sf $(NBDIR)/harness $(DEB_SRCDIR)/nbbuild/netbeans/harness + ln -sf /usr/share/xml/xhtml/schema/dtd/1.0/xhtml* $(DEB_SRCDIR)/nbbuild/external/xhtml1-dtds/ + ln -sf $(JAVADIR)/$(JSEARCH_JAR) $(DEB_SRCDIR)/apisupport.harness/external/$(NB_JSEARCH_JAR) + ln -sf $(JAVADIR)/$(JH_JAR) $(DEB_SRCDIR)/javahelp/external/$(NB_JH_JAR) + ln -sf $(JAVADIR)/$(SWINGL_JAR) $(DEB_SRCDIR)/o.jdesktop.layout/external/$(NB_SWINGL_JAR) + ln -sf $(JAVADIR)/$(JAVAC_API_JAR) $(DEB_SRCDIR)/libs.javacapi/external/$(NB_JAVAC_API_JAR) + ln -sf $(JAVADIR)/$(JAVAC_IMPL_JAR) $(DEB_SRCDIR)/libs.javacimpl/external/$(NB_JAVAC_IMPL_JAR) + + ln -sf /usr/share/ant/lib $(DEB_SRCDIR)/o.apache.tools.ant.module/external/lib + + mkdir -p $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext + ln -sf $(JAVADIR)/jsch.jar $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext/jsch-0.1.41.jar + ln -sf $(JAVADIR)/xml-commons-resolver-1.1.jar $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext/resolver-1.2.jar + ln -sf $(JAVADIR)/ini4j.jar $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext/ini4j-0.4.1.jar + ln -sf $(JAVADIR)/freemarker.jar $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext/freemarker-2.3.8.jar + ln -sf $(JAVADIR)/svnClientAdapter.jar $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext/svnClientAdapter-1.6.0.jar + ln -sf $(JAVADIR)/xercesImpl.jar $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext/xerces-2.8.0.jar + ln -sf $(JAVADIR)/lucene-core.jar $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext/lucene-core-2.4.1.jar + ln -sf $(JAVADIR)/commons-logging.jar $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext/commons-logging-1.1.jar + ln -sf $(JAVADIR)/svn-javahl.jar $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext/svnjavahl-1.6.0.jar + ln -sf $(JAVADIR)/commons-net.jar $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext/commons-net-1.4.1.jar + ln -sf $(JAVADIR)/oro.jar $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext/jakarta-oro-2.0.8.jar + ln -sf $(JAVADIR)/jruby1.1.jar $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext/jvyamlb-0.2.3.jar + ln -sf $(JAVADIR)/jruby1.1.jar $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext/bytelist-0.1.jar + ln -sf $(JAVADIR)/swingx.jar $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext/swingx-0.9.5.jar + ln -sf $(JAVADIR)/jzlib.jar $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext/jzlib-1.0.7.jar + ln -sf $(JAVADIR)/servlet-2.3.jar $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext/servlet-2.2.jar + + mkdir -p $(DEB_SRCDIR)/nbbuild/netbeans/java/modules/ext + ln -sf $(JAVADIR)/javac-api.jar $(DEB_SRCDIR)/nbbuild/netbeans/java/modules/ext/javac-api-nb-7.0-b07.jar + ln -sf $(JAVADIR)/javac-impl.jar $(DEB_SRCDIR)/nbbuild/netbeans/java/modules/ext/javac-impl-nb-7.0-b07.jar + ln -sf $(JAVADIR)/swing-worker.jar $(DEB_SRCDIR)/nbbuild/netbeans/java/modules/ext/swing-worker-1.1.jar + ln -sf $(JAVADIR)/AppFramework.jar $(DEB_SRCDIR)/nbbuild/netbeans/java/modules/ext/appframework-1.0.3.jar + ln -sf $(JAVADIR)/beansbinding.jar $(DEB_SRCDIR)/nbbuild/netbeans/java/modules/ext/beansbinding-1.2.1.jar + ln -sf $(JAVADIR)/junit.jar $(DEB_SRCDIR)/nbbuild/netbeans/java/modules/ext/junit-3.8.2.jar + + cp $(DEB_SRCDIR)/LICENSE.txt $(DEB_SRCDIR)/ide.branding/release-toplevel/ + + ant \ + -Dpermit.jdk6.builds=true \ + -Dbuild.compiler.deprecation=false \ + -Dbuild.compiler.debug=false \ + -Dverify.checkout=false \ + -Dnb.cluster.platform-is-built=true \ + -Dnb.cluster.harness-is-built=true \ + -Do.n.core.dir=$(NB_PLATFORM_BUILD_DIR) \ + -Dcore.dir=$(NB_PLATFORM_BUILD_DIR) \ + -Dcore.startup.dir=$(NB_PLATFORM_BUILD_DIR) \ + -Dopenide.awt.dir=$(NB_PLATFORM_BUILD_DIR) \ + -Dlibs.beans-binding.classpath=$(JAVADIR)/beansbinding.jar \ + -Dlibs.swing-layout.classpath=$(JAVADIR)/$(SWINGL_JAR) \ + -Dext.binaries.downloaded=true \ + -Ddo-not-rebuild-clusters=true \ + -Dcluster.config=basic \ + -v \ + -f $(DEB_SRCDIR)/nbbuild/build.xml build-nozip + + cd $(DEB_SRCDIR)/l10n && ant -v -f build.xml -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" build + touch $@ + +install/$(pkg-ide):: + echo > $(DEB_SRCDIR)/nbbuild/netbeans/ide/.noautoupdate + echo > $(DEB_SRCDIR)/nbbuild/netbeans/ide/.lastModified + #all files are removed from lib because they are in dll formats + rm -rf $(DEB_SRCDIR)/nbbuild/netbeans/$(base-ide)/modules/lib + $(INSTALL)$(pkg-ide) $(DEB_SRCDIR)/nbbuild/netbeans/ide/* $(NB_INSTALL_DIR)/$(base-ide) + $(INSTALL)$(pkg-ide) $(DEB_SRCDIR)/nbbuild/netbeans/ide/.noautoupdate $(NB_INSTALL_DIR)/$(base-ide) + $(INSTALL)$(pkg-ide) $(DEB_SRCDIR)/nbbuild/netbeans/ide/.lastModified $(NB_INSTALL_DIR)/$(base-ide) + +install/$(pkg-java):: + echo > $(DEB_SRCDIR)/nbbuild/netbeans/java/.noautoupdate + echo > $(DEB_SRCDIR)/nbbuild/netbeans/java/.lastModified + #all doc files are removed because they are in zip and jar formats + rm -rf $(DEB_SRCDIR)/nbbuild/netbeans/java/docs + $(INSTALL)$(pkg-java) $(DEB_SRCDIR)/nbbuild/netbeans/java/* $(NB_INSTALL_DIR)/$(base-java) + $(INSTALL)$(pkg-java) $(DEB_SRCDIR)/nbbuild/netbeans/java/.noautoupdate $(NB_INSTALL_DIR)/$(base-java) + $(INSTALL)$(pkg-java) $(DEB_SRCDIR)/nbbuild/netbeans/java/.lastModified $(NB_INSTALL_DIR)/$(base-java) + $(LINK)$(pkg-java) usr/share/ant/bin $(NB_INSTALL_DIR)/$(base-java)/ant/bin + $(LINK)$(pkg-java) usr/share/ant/etc $(NB_INSTALL_DIR)/$(base-java)/ant/etc + $(LINK)$(pkg-java) usr/share/ant/lib $(NB_INSTALL_DIR)/$(base-java)/ant/lib + +install/$(pkg-apisupport):: + echo > $(DEB_SRCDIR)/nbbuild/netbeans/apisupport/.noautoupdate + echo > $(DEB_SRCDIR)/nbbuild/netbeans/apisupport/.lastModified + $(INSTALL)$(pkg-apisupport) $(DEB_SRCDIR)/nbbuild/netbeans/apisupport/* $(NB_INSTALL_DIR)/$(base-apisupport) + $(INSTALL)$(pkg-apisupport) $(DEB_SRCDIR)/nbbuild/netbeans/apisupport/.noautoupdate $(NB_INSTALL_DIR)/$(base-apisupport) + $(INSTALL)$(pkg-apisupport) $(DEB_SRCDIR)/nbbuild/netbeans/apisupport/.lastModified $(NB_INSTALL_DIR)/$(base-apisupport) + +install/$(pkg-nb):: + echo > $(DEB_SRCDIR)/nbbuild/netbeans/nb/.noautoupdate + $(INSTALL)$(pkg-nb) $(DEB_SRCDIR)/nbbuild/netbeans/nb/* $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/nb + $(INSTALL)$(pkg-nb) $(DEB_SRCDIR)/nbbuild/netbeans/nb/.lastModified $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/nb + $(INSTALL)$(pkg-nb) $(DEB_SRCDIR)/nbbuild/netbeans/nb/.noautoupdate $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/nb + $(INSTALL)$(pkg-nb) $(DEB_SRCDIR)/nbbuild/netbeans/bin/* $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/bin + $(INSTALL)$(pkg-nb) $(DEB_SRCDIR)/nbbuild/netbeans/CREDITS.html usr/share/$(pkg-nb) + $(INSTALL)$(pkg-nb) $(DEB_SRCDIR)/nbbuild/netbeans/README.html usr/share/$(pkg-nb) + $(INSTALL)$(pkg-nb) $(DEB_SRCDIR)/nbbuild/netbeans/netbeans.css usr/share/$(pkg-nb) + $(LINK)$(pkg-nb) $(NB_INSTALL_DIR)/$(base-platform) $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/platform + $(LINK)$(pkg-nb) $(NB_INSTALL_DIR)/harness $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/harness + $(LINK)$(pkg-nb) $(NB_INSTALL_DIR)/$(base-apisupport) $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/apisupport + $(LINK)$(pkg-nb) $(NB_INSTALL_DIR)/$(base-ide) $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/ide + $(LINK)$(pkg-nb) $(NB_INSTALL_DIR)/$(base-java) $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/java + + # Create file marker to avoid displaying license dialog at first IDE start + echo > $(DEB_SRCDIR)/debian/license_accepted + $(INSTALL)$(pkg-nb) $(DEB_SRCDIR)/debian/license_accepted $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/nb/var + + # Install file productid used by autoupdate to report installation type + $(INSTALL)$(pkg-nb) $(DEB_SRCDIR)/debian/productid $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/nb/config + + # Install netbeans.conf + $(INSTALL)$(pkg-nb) $(DEB_SRCDIR)/nbbuild/netbeans/etc/netbeans.conf etc + $(LINK)$(pkg-nb) etc/netbeans.conf $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/etc/netbeans.conf + + # Install netbeans.clusters + $(INSTALL)$(pkg-nb) $(DEB_SRCDIR)/nbbuild/netbeans/etc/netbeans.clusters etc + $(LINK)$(pkg-nb) etc/netbeans.clusters $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/etc/netbeans.clusters + + # Save original version of netbeans.conf as postinst patches it + #cp $(DEB_SRCDIR)/nbbuild/netbeans/etc/netbeans.conf $(DEB_SRCDIR)/nbbuild/netbeans/etc/netbeans.conf.orig + #$(INSTALL)$(pkg-nb) $(DEB_SRCDIR)/nbbuild/netbeans/etc/netbeans.conf.orig $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/etc + + # Install launcher + $(INSTALL)$(pkg-nb) $(DEB_SRCDIR)/nbbuild/netbeans/bin/netbeans usr/bin + + # Install desktop file + $(INSTALL)$(pkg-nb) $(DEB_SRCDIR)/debian/netbeans.desktop usr/share/applications + + +clean:: + # these files are left by cdbs + -rm -f *.cdbs-config_list + -rm -f $(DEB_SRCDIR)/stamp-build-$(pkg-nb) + -rm -f $(DEB_SRCDIR)/nbbuild/netbeans/platform + -rm -f $(DEB_SRCDIR)/nbbuild/netbeans/harness + -rm -f $(DEB_SRCDIR)/o.apache.tools.ant.module/external/lib + ln -sf $(JAVADIR)/$(JHALL_JAR) $(DEB_SRCDIR)/javahelp/external/$(NB_JH_JAR) + ant -Dpermit.jdk6.builds=true -f $(DEB_SRCDIR)/nbbuild/build.xml clean + -rm -f $(DEB_SRCDIR)/apisupport.harness/external/$(NB_JSEARCH_JAR) + -rm -f $(DEB_SRCDIR)/javahelp/external/$(NB_JH_JAR) + -rm -f $(DEB_SRCDIR)/o.jdesktop.layout/external/$(NB_SWINGL_JAR) + -rm -f $(DEB_SRCDIR)/libs.javacapi/external/$(NB_JAVAC_API_JAR) + -rm -f $(DEB_SRCDIR)/libs.javacimpl/external/$(NB_JAVAC_IMPL_JAR) + -rm -f $(DEB_SRCDIR)/debian/license_accepted + # this file is not deleted by ant clean though it should so delete it here + -rm -f $(DEB_SRCDIR)/schema2beans/anttask/s2banttask.jar + -rm -f $(DEB_SRCDIR)/swingapp/src/org/netbeans/modules/swingapp/resources/CRUDShellApp.zip + -rm -f $(DEB_SRCDIR)/swingapp/src/org/netbeans/modules/swingapp/resources/BasicShellApp.zip + -rm -f $(DEB_SRCDIR)/nbbuild/nbproject/private/scan-cache-standard.ser + -rm -f $(DEB_SRCDIR)/nbbuild/nbproject/private/scan-cache-full.ser + -rm -f $(DEB_SRCDIR)/gsf.api/anttask/gsfanttask.jar + -rm -f $(DEB_SRCDIR)/ide.branding/release-toplevel/LICENSE.txt + -rm -f $(DEB_SRCDIR)/nbbuild/external/xhtml1-dtds/* + -rm -rf $(DEB_SRCDIR)/l10n/build + -rm -f $(DEB_SRCDIR)/l10n/l10nantext.jar + -rm -f $(DEB_SRCDIR)/nbbuild/nbantext.jar + +get-orig-source: + uscan --verbose --rename --force-download --- netbeans-6.9.orig/debian/libnb-apisupport2-java.dirs +++ netbeans-6.9/debian/libnb-apisupport2-java.dirs @@ -0,0 +1 @@ +usr/share/netbeans/apisupport2 --- netbeans-6.9.orig/debian/copyright +++ netbeans-6.9/debian/copyright @@ -0,0 +1,444 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59 +Name: libnb-platform-java +Source: http://netbeans.org/projects/installer/downloads/directory/netbeans-6.9 + +Files: * +Copyright: Copyright 1997-2010 Oracle and/or its affiliates. + Portions Copyrighted 1997-2009 Sun Microsystems, Inc. +License: CDDL-1 or GPL-2 with CLASSPATH exception + "CLASSPATH" EXCEPTION TO THE GPL VERSION 2 + + Certain source files distributed by Oracle Corp. are subject + to the following clarification and special exception to the + GPL Version 2, but only where Oracle has expressly included + in the particular source file's header the words "Oracle + designates this particular file as subject to the + "Classpath" exception as provided by Oracle in the License + file that accompanied this code." + + Linking this library statically or dynamically with other + modules is making a combined work based on this library. + Thus, the terms and conditions of the GNU General Public + License Version 2 cover the whole combination. + + As a special exception, the copyright holders of this + library give you permission to link this library with + independent modules to produce an executable, regardless of + the license terms of these independent modules, and to copy + and distribute the resulting executable under terms of your + choice, provided that you also meet, for each linked + independent module, the terms and conditions of the license + of that module. An independent module is a module which is + not derived from or based on this library. If you modify + this library, you may extend this exception to your version + of the library, but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from + your version. + +Files: debian/* +Copyright: 2008-2010, Yulia Novozhilova +License: GPL-2 + +Files: ./options.keymap/build.xml, +./openide.awt/test/unit/src/org/openide/awt/ActionsTest.java, +./o.n.bootstrap/test/unit/src/org/netbeans/ModuleMixedOnClasspathTest.java, +./o.n.bootstrap/test/unit/src/org/netbeans/ModuleFactoryTest.java, +./o.n.bootstrap/src/org/netbeans/ModuleFactory.java, +./apisupport.harness/jnlp-src/org/netbeans/modules/apisupport/jnlplauncher/RuntimePolicy.java, +./apisupport.harness/test/unit/src/org/netbeans/modules/apisupport/jnlplauncher/FixPolicyTest.java +Copyright: Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. + Portions Copyrihgt 2005-2006 Nokia +License: CDDL-1 or GPL-2 with CLASSPATH exception + + +Files: ./core.windows/test/unit/src/org/netbeans/core/windows/view/ui/CustomMenuBarTest.java, +./core.startup/test/unit/src/org/netbeans/core/startup/layers/CustomWritableSystemFileSystemTest.java +Copyright: Copyright 1997-2010 Oracle and/or its affiliates. + Portions Copyrihgted 2007 Nokia Siemens Networks Oy +License: CDDL-1 or GPL-2 with CLASSPATH exception + +Files: ./jemmy/* +Copyright: Copyright 1997-2008 Sun Microsystems, Inc. +License: CDDL-1 or GPL-2 with CLASSPATH exception + + +License: GPL-2 + On Debian systems the full text of the GNU General Public + License can be found in the `/usr/share/common-licenses/GPL-2' + file. + +License: CDDL-1 +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) + Version 1.0 + +1. Definitions. + +1.1. "Contributor" means each individual or entity that +creates or contributes to the creation of Modifications. + +1.2. "Contributor Version" means the combination of the +Original Software, prior Modifications used by a Contributor +(if any), and the Modifications made by that particular +Contributor. + +1.3. "Covered Software" means (a) the Original Software, or +(b) Modifications, or (c) the combination of files +containing Original Software with files containing +Modifications, in each case including portions thereof. + +1.4. "Executable" means the Covered Software in any form +other than Source Code. + +1.5. "Initial Developer" means the individual or entity that +first makes Original Software available under this License. + +1.6. "Larger Work" means a work which combines Covered +Software or portions thereof with code not governed by the +terms of this License. + +1.7. "License" means this document. + +1.8. "Licensable" means having the right to grant, to the +maximum extent possible, whether at the time of the initial +grant or subsequently acquired, any and all of the rights +conveyed herein. + +1.9. "Modifications" means the Source Code and Executable +form of any of the following: + +A. Any file that results from an addition to, deletion from +or modification of the contents of a file containing +Original Software or previous Modifications; + +B. Any new file that contains any part of the Original +Software or previous Modification; or + +C. Any new file that is contributed or otherwise made +available under the terms of this License. + +1.10. "Original Software" means the Source Code and +Executable form of computer software code that is originally +released under this License. + +1.11. "Patent Claims" means any patent claim(s), now owned +or hereafter acquired, including without limitation, method, +process, and apparatus claims, in any patent Licensable by +grantor. + +1.12. "Source Code" means (a) the common form of computer +software code in which modifications are made and (b) +associated documentation included in or with such code. + +1.13. "You" (or "Your") means an individual or a legal +entity exercising rights under, and complying with all of +the terms of, this License. For legal entities, "You" +includes any entity which controls, is controlled by, or is +under common control with You. For purposes of this +definition, "control" means (a) the power, direct or +indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (b) ownership +of more than fifty percent (50%) of the outstanding shares +or beneficial ownership of such entity. + +2. License Grants. + +2.1. The Initial Developer Grant. Conditioned upon Your +compliance with Section 3.1 below and subject to third party +intellectual property claims, the Initial Developer hereby +grants You a world-wide, royalty-free, non-exclusive +license: + +(a) under intellectual property rights (other than patent or +trademark) Licensable by Initial Developer, to use, +reproduce, modify, display, perform, sublicense and +distribute the Original Software (or portions thereof), with +or without Modifications, and/or as part of a Larger Work; +and + +(b) under Patent Claims infringed by the making, using or +selling of Original Software, to make, have made, use, +practice, sell, and offer for sale, and/or otherwise dispose +of the Original Software (or portions thereof). + +(c) The licenses granted in Sections 2.1(a) and (b) are +effective on the date Initial Developer first distributes or +otherwise makes the Original Software available to a third +party under the terms of this License. + +(d) Notwithstanding Section 2.1(b) above, no patent license +is granted: (1) for code that You delete from the Original +Software, or (2) for infringements caused by: (i) the +modification of the Original Software, or (ii) the +combination of the Original Software with other software or +devices. + +2.2. Contributor Grant. Conditioned upon Your compliance +with Section 3.1 below and subject to third party +intellectual property claims, each Contributor hereby grants +You a world-wide, royalty-free, non-exclusive license: + +(a) under intellectual property rights (other than patent or +trademark) Licensable by Contributor to use, reproduce, +modify, display, perform, sublicense and distribute the +Modifications created by such Contributor (or portions +thereof), either on an unmodified basis, with other +Modifications, as Covered Software and/or as part of a +Larger Work; and + +(b) under Patent Claims infringed by the making, using, or +selling of Modifications made by that Contributor either +alone and/or in combination with its Contributor Version (or +portions of such combination), to make, use, sell, offer for +sale, have made, and/or otherwise dispose of: (1) +Modifications made by that Contributor (or portions +thereof); and (2) the combination of Modifications made by +that Contributor with its Contributor Version (or portions +of such combination). + +(c) The licenses granted in Sections 2.2(a) and 2.2(b) are +effective on the date Contributor first distributes or +otherwise makes the Modifications available to a third +party. + +(d) Notwithstanding Section 2.2(b) above, no patent license +is granted: (1) for any code that Contributor has deleted +from the Contributor Version; (2) for infringements caused +by: (i) third party modifications of Contributor Version, or +(ii) the combination of Modifications made by that +Contributor with other software (except as part of the +Contributor Version) or other devices; or (3) under Patent +Claims infringed by Covered Software in the absence of +Modifications made by that Contributor. + +3. Distribution Obligations. + +3.1. Availability of Source Code. + +Any Covered Software that You distribute or otherwise make +available in Executable form must also be made available in +Source Code form and that Source Code form must be +distributed only under the terms of this License. You must +include a copy of this License with every copy of the Source +Code form of the Covered Software You distribute or +otherwise make available. You must inform recipients of any +such Covered Software in Executable form as to how they can +obtain such Covered Software in Source Code form in a +reasonable manner on or through a medium customarily used +for software exchange. + +3.2. Modifications. + +The Modifications that You create or to which You contribute +are governed by the terms of this License. You represent +that You believe Your Modifications are Your original +creation(s) and/or You have sufficient rights to grant the +rights conveyed by this License. + +3.3. Required Notices. + +You must include a notice in each of Your Modifications that +identifies You as the Contributor of the Modification. You +may not remove or alter any copyright, patent or trademark +notices contained within the Covered Software, or any +notices of licensing or any descriptive text giving +attribution to any Contributor or the Initial Developer. + +3.4. Application of Additional Terms. + +You may not offer or impose any terms on any Covered +Software in Source Code form that alters or restricts the +applicable version of this License or the recipients' rights +hereunder. You may choose to offer, and to charge a fee for, +warranty, support, indemnity or liability obligations to one +or more recipients of Covered Software. However, you may do +so only on Your own behalf, and not on behalf of the Initial +Developer or any Contributor. You must make it absolutely +clear that any such warranty, support, indemnity or +liability obligation is offered by You alone, and You hereby +agree to indemnify the Initial Developer and every +Contributor for any liability incurred by the Initial +Developer or such Contributor as a result of warranty, +support, indemnity or liability terms You offer. + +3.5. Distribution of Executable Versions. + +You may distribute the Executable form of the Covered +Software under the terms of this License or under the terms +of a license of Your choice, which may contain terms +different from this License, provided that You are in +compliance with the terms of this License and that the +license for the Executable form does not attempt to limit or +alter the recipient's rights in the Source Code form from +the rights set forth in this License. If You distribute the +Covered Software in Executable form under a different +license, You must make it absolutely clear that any terms +which differ from this License are offered by You alone, not +by the Initial Developer or Contributor. You hereby agree to +indemnify the Initial Developer and every Contributor for +any liability incurred by the Initial Developer or such +Contributor as a result of any such terms You offer. + +3.6. Larger Works. + +You may create a Larger Work by combining Covered Software +with other code not governed by the terms of this License +and distribute the Larger Work as a single product. In such +a case, You must make sure the requirements of this License +are fulfilled for the Covered Software. + +4. Versions of the License. + +4.1. New Versions. + +Oracle Corp. is the initial license steward and may publish +revised and/or new versions of this License from time to +time. Each version will be given a distinguishing version +number. Except as provided in Section 4.3, no one other than +the license steward has the right to modify this License. + +4.2. Effect of New Versions. + +You may always continue to use, distribute or otherwise make +the Covered Software available under the terms of the +version of the License under which You originally received +the Covered Software. If the Initial Developer includes a +notice in the Original Software prohibiting it from being +distributed or otherwise made available under any subsequent +version of the License, You must distribute and make the +Covered Software available under the terms of the version of +the License under which You originally received the Covered +Software. Otherwise, You may also choose to use, distribute +or otherwise make the Covered Software available under the +terms of any subsequent version of the License published by +the license steward. + +4.3. Modified Versions. + +When You are an Initial Developer and You want to create a +new license for Your Original Software, You may create and +use a modified version of this License if You: (a) rename +the license and remove any references to the name of the +license steward (except to note that the license differs +from this License); and (b) otherwise make it clear that the +license contains terms which differ from this License. + +5. DISCLAIMER OF WARRANTY. + +COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS +IS" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR +IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE +COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A +PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO +THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH +YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY +RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER +CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, +REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY +CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY +COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS +DISCLAIMER. + +6. TERMINATION. + +6.1. This License and the rights granted hereunder will +terminate automatically if You fail to comply with terms +herein and fail to cure such breach within 30 days of +becoming aware of the breach. Provisions which, by their +nature, must remain in effect beyond the termination of this +License shall survive. + +6.2. If You assert a patent infringement claim (excluding +declaratory judgment actions) against Initial Developer or a +Contributor (the Initial Developer or Contributor against +whom You assert such claim is referred to as "Participant") +alleging that the Participant Software (meaning the +Contributor Version where the Participant is a Contributor +or the Original Software where the Participant is the +Initial Developer) directly or indirectly infringes any +patent, then any and all rights granted directly or +indirectly to You by such Participant, the Initial Developer +(if the Initial Developer is not the Participant) and all +Contributors under Sections 2.1 and/or 2.2 of this License +shall, upon 60 days notice from Participant terminate +prospectively and automatically at the expiration of such 60 +day notice period, unless if within such 60 day period You +withdraw Your claim with respect to the Participant Software +against such Participant either unilaterally or pursuant to +a written agreement with Participant. + +6.3. In the event of termination under Sections 6.1 or 6.2 +above, all end user licenses that have been validly granted +by You or any distributor hereunder prior to termination +(excluding licenses granted to You by any distributor) shall +survive termination. + +7. LIMITATION OF LIABILITY. + +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER +TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL +YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY +DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF +SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, +SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY +CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST +PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE +OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR +LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE +POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY +SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY +RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT +APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS +DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR +CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY +NOT APPLY TO YOU. + +8. U.S. GOVERNMENT END USERS. + +The Covered Software is a "commercial item," as that term is +defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of +"commercial computer software" (as that term is defined at +48 C.F.R. 252.227-7014(a)(1)) and "commercial computer +software documentation" as such terms are used in 48 C.F.R. +12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 +C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. +Government End Users acquire Covered Software with only +those rights set forth herein. This U.S. Government Rights +clause is in lieu of, and supersedes, any other FAR, DFAR, +or other clause or provision that addresses Government +rights in computer software under this License. + +9. MISCELLANEOUS. + +This License represents the complete agreement concerning +subject matter hereof. If any provision of this License is +held to be unenforceable, such provision shall be reformed +only to the extent necessary to make it enforceable. This +License shall be governed by the law of the jurisdiction +specified in a notice contained within the Original Software +(except to the extent applicable law, if any, provides +otherwise), excluding such jurisdiction's conflict-of-law +provisions. Any litigation relating to this License shall be +subject to the jurisdiction of the courts located in the +jurisdiction and venue specified in a notice contained +within the Original Software, with the losing party +responsible for costs, including, without limitation, court +costs and reasonable attorneys' fees and expenses. The +application of the United Nations Convention on Contracts +for the International Sale of Goods is expressly excluded. +Any law or regulation which provides that the language of a +contract shall be construed against the drafter shall not +apply to this License. You agree that You alone are +responsible for compliance with the United States export +administration regulations (and the export control laws and +regulation of any other countries) when You use, distribute +or otherwise make available any Covered Software. + +10. RESPONSIBILITY FOR CLAIMS. + +As between Initial Developer and the Contributors, each +party is responsible for claims and damages arising, +directly or indirectly, out of its utilization of rights +under this License and You agree to work with Initial +Developer and Contributors to distribute such responsibility +on an equitable basis. Nothing herein is intended or shall +be deemed to constitute any admission of liability. --- netbeans-6.9.orig/debian/netbeans.1 +++ netbeans-6.9/debian/netbeans.1 @@ -0,0 +1,95 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" The first parameter, NAME, should be all caps +.\" The second parameter, SECTION, should be 1-8, maybe with subsection +.\" Other parameters are allowed: see man(7), man(1) +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.TH "NETBEANS" "1" "January 18, 2008" "" "Java IDE and More" +.SH "NAME" +NetBeans \- Java IDE +.SH "SYNOPSIS" +.LP +.nf +\f3 +.fl +\fP\f3netbeans\fP [ \f2options\fP ] [ \f2files\fP ] +.br + +.fl +.fi + +.LP +.SH "PARAMETERS" +.LP + +.LP +.TP 3 +options +Command\-line options. +.TP 3 +files +Files to be opened in NetBeans IDE. +.LP +.SH "DESCRIPTION" +.B NetBeans +is a cross\-platform IDE written in Java. It supports development in Java, and support for other languages can be added. The whole IDE is built around a core framework with APIs, and features are implemented in the form of plugin modules. This clean, modular architecture makes NetBeans a good platform for building development tools and custom IDEs. +.SH "OPTIONS" +.LP +General options: +.TP 3 +\-\-help +List available command line options +.TP 3 +\-\-jdkhome +Path to JDK home used to run IDE +.TP 3 +\-J +Pass to JVM +.TP 3 +\-\-cp:p +Prepend to classpath +.TP 3 +\-\-cp:a +Append to classpath +.LP +Core options: +.TP 3 + \-\-laf +Use given LookAndFeel class instead of the default +.TP 3 + \-\-fontsize +Set the base font size of the user interface, in points +.TP 3 + \-\-locale +Use specified locale +.TP 3 + \-\-userdir +Use specified directory to store user settings +.LP +Module reload options: +.TP 3 + \-\-reload /path/to/module.jar +Installs or reinstalls a module JAR file. +.LP +OpenFile module options: +.TP 3 + \-\-open FILE +Open FILE. +.TP 3 + \-\-open FILE:LINE +Open FILE at line LINE (starting from 1). +.SH "AUTHOR" +NetBeans was written by the NetBeans Community . +.PP +This manual page was written by Marek Slama , +for the Debian project (but may be used by others). --- netbeans-6.9.orig/debian/libnb-ide13-java.dirs +++ netbeans-6.9/debian/libnb-ide13-java.dirs @@ -0,0 +1 @@ +usr/share/netbeans/ide13 --- netbeans-6.9.orig/debian/watch +++ netbeans-6.9/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://netbeans.org/projects/installer/downloads/directory/netbeans-6.9 .*netbeans-([\d\.]+)-\d*-base-src-linux.tar.gz debian uupdate \ No newline at end of file --- netbeans-6.9.orig/debian/compat +++ netbeans-6.9/debian/compat @@ -0,0 +1 @@ +7 --- netbeans-6.9.orig/debian/changelog +++ netbeans-6.9/debian/changelog @@ -0,0 +1,110 @@ +netbeans (6.9-0ubuntu2) maverick; urgency=low + + * Bug fix upload: + - correct netbeans-6.9~updatecenters.patch to point to Ubuntu UC + + -- Yulia Novozhilova Fri, 20 Aug 2010 17:19:59 +0400 + +netbeans (6.9-0ubuntu1) maverick; urgency=low + + * New upstream release (LP: #595000) + * debian/control/Standards-Versions is updated to 3.9.0 + * debian/copyright file is updated + + -- Yulia Novozhilova Thu, 05 Aug 2010 12:17:51 +0400 + +netbeans (6.8-0ubuntu4) lucid; urgency=low + + * Update Center is switched to the Ubuntu specific one (LP: #544459) + - patches/01-updatecenters.patch is updated + + -- Yulia Novozhilova Wed, 31 Mar 2010 15:19:29 +0400 + +netbeans (6.8-0ubuntu3) lucid; urgency=low + + * debian/patches/l10n.patch is added (LP: #527547) + * debiian/rules is updated to build l10n + * debian/control dependency to default-jdk-doc | sun-java6-doc is added + for libnb-java3-java package (LP: #545563) + + -- Yulia Novozhilova Fri, 26 Mar 2010 16:26:52 +0300 + +netbeans (6.8-0ubuntu2) lucid; urgency=low + + * Bug fix upload + - debian/patches/14-config.patch added (LP: #315499) + + -- Yulia Novozhilova Wed, 17 Feb 2010 15:44:50 +0300 + +netbeans (6.8-0ubuntu1) lucid; urgency=low + + * New upstream release (LP: #495478) + * postinstall script is removed (LP: #464939) + * control/Standards-Versions is updated to 3.8.4 + * debian/copyright file is updated to point to the correct location + + -- Yulia Novozhilova Fri, 12 Feb 2010 20:36:32 +0300 + +netbeans (6.7.1-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #381814) + * Fixed upstream bugs: + - (LP: #336349) + - (LP: #354144) + - (LP: #357579) + - (LP: #366740) + - (LP: #401407) + * control/Standards-Versions is updated to 3.8.3 + * control/Section is updated to java for *-java + + -- Yulia Novozhilova Mon, 13 Jul 2009 19:05:01 +0400 + +netbeans (6.5-0ubuntu2.1) jaunty; urgency=low + + * Bug fix upload (LP: #353080) + - Added a critical patch 96-fix-lucene.patch + + -- Yulia Novozhilova Mon, 25 May 2009 23:28:08 +0400 + +netbeans (6.5-0ubuntu2) jaunty; urgency=low + + * Added bugfix patches from 6.5.1 for NetBeans IDE (LP: #345562) + * 40-ide-launcher.patch is updated (LP: #307103) + * debian/rules: commons-logging jar's version changed from 1.0.4 to 1.1. + + -- Yulia Novozhilova Tue, 31 Mar 2009 18:34:02 +0400 + +netbeans (6.5-0ubuntu1) jaunty; urgency=low + + * New upstream release. (LP: #251173) + -Added "Conflicts: netbeans-ide" to control (LP: #257307) + -Added watch file and get-orig-source target to rules file + + -- Yulia Novozhilova Fri, 26 Sep 2008 18:51:50 +0400 + +netbeans (6.1-0ubuntu1) intrepid; urgency=low + + * New upstream release. (LP: #253016) + - Updated Standards-Version to 3.8.0 + - Patches updated. (LP: #206324) + - Cleaned up debian/rules + - Updated postinstall script. (LP: #254587) + + -- Yulia Novozhilova Tue, 29 Jul 2008 19:43:23 +0400 + +netbeans (6.0.1-0ubuntu2) hardy; urgency=low + + * Bug fix upload (LP: #201332) + - Replace GPLv2 text in debian/copyright by reference to + /usr/share/common-licenses/GPL-2 + - Update dependency to openjdk6 + - Refine package descriptions + - Add IDE Update Center specific to Ubuntu packages + + -- Marek Slama Fri, 07 Mar 2008 18:00:00 +0100 + +netbeans (6.0.1-0ubuntu1) hardy; urgency=low + + * Initial version. (LP: #187708) + + -- Marek Slama Tue, 29 Jan 2008 14:11:22 +0100 --- netbeans-6.9.orig/debian/netbeans.desktop +++ netbeans-6.9/debian/netbeans.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=NetBeans IDE 6.9 +Comment=Integrated Development Environment +TryExec=/usr/bin/netbeans +Exec=/usr/bin/netbeans +Icon=/usr/share/netbeans/6.9/nb/netbeans.png +Categories=Development;IDE;Java; +Terminal=false +Type=Application +StartupNotify=true --- netbeans-6.9.orig/debian/productid +++ netbeans-6.9/debian/productid @@ -0,0 +1 @@ +NBUBU --- netbeans-6.9.orig/debian/libnb-java4-java.dirs +++ netbeans-6.9/debian/libnb-java4-java.dirs @@ -0,0 +1 @@ +usr/share/netbeans/java3 --- netbeans-6.9.orig/debian/patches/netbeans-6.9~10-o.apache.tools.ant.module.patch +++ netbeans-6.9/debian/patches/netbeans-6.9~10-o.apache.tools.ant.module.patch @@ -0,0 +1,32 @@ +diff -Nur netbeans-6.9/o.apache.tools.ant.module/build.xml netbeans-6.9.new/o.apache.tools.ant.module/build.xml +--- netbeans-6.9/o.apache.tools.ant.module/build.xml 2010-06-10 15:20:50.000000000 +0400 ++++ netbeans-6.9.new/o.apache.tools.ant.module/build.xml 2010-07-14 19:49:51.126679798 +0400 +@@ -78,6 +78,7 @@ + + + ++ + + + +diff -Nur netbeans-6.9/o.apache.tools.ant.module/external/build.xml netbeans-6.9.new/o.apache.tools.ant.module/external/build.xml +--- netbeans-6.9/o.apache.tools.ant.module/external/build.xml 2010-06-10 15:20:50.000000000 +0400 ++++ netbeans-6.9.new/o.apache.tools.ant.module/external/build.xml 2010-07-14 19:53:47.904672448 +0400 +@@ -45,7 +45,9 @@ + --> + + ++ + + + --- netbeans-6.9.orig/debian/patches/netbeans-6.9~80-config.patch +++ netbeans-6.9/debian/patches/netbeans-6.9~80-config.patch @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' netbeans-6.9/ide/launcher/netbeans.conf netbeans-6.9.new/ide/launcher/netbeans.conf +--- netbeans-6.9/ide/launcher/netbeans.conf 2010-06-10 15:19:10.000000000 +0400 ++++ netbeans-6.9.new/ide/launcher/netbeans.conf 2010-08-11 17:33:29.000000000 +0400 +@@ -3,7 +3,7 @@ + + # Options used by NetBeans launcher by default, can be overridden by explicit + # command line switches: +-netbeans_default_options="-J-client -J-Xss2m -J-Xms32m -J-XX:PermSize=32m -J-XX:MaxPermSize=200m -J-Dapple.laf.useScreenMenuBar=true -J-Dsun.java2d.noddraw=true" ++netbeans_default_options="-J-client -J-Xss2m -J-Xms32m -J-XX:PermSize=32m -J-XX:MaxPermSize=200m -J-Dapple.laf.useScreenMenuBar=true -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.pmoffscreen=false" + # Note that a default -Xmx is selected for you automatically. + # You can find this value in var/log/messages.log file in your userdir. + # The automatically selected value can be overridden by specifying -J-Xmx here --- netbeans-6.9.orig/debian/patches/netbeans-6.9~40-ide-launcher.patch +++ netbeans-6.9/debian/patches/netbeans-6.9~40-ide-launcher.patch @@ -0,0 +1,52 @@ +diff -Nur netbeans-6.9/ide/launcher/unix/netbeans netbeans-6.9.new/ide/launcher/unix/netbeans +--- netbeans-6.9/ide/launcher/unix/netbeans 2010-06-10 15:19:10.000000000 +0400 ++++ netbeans-6.9.new/ide/launcher/unix/netbeans 2010-07-22 04:03:54.905999281 +0400 +@@ -41,6 +41,17 @@ + # Version 2 license, then the option applies only if the new code is + # made subject to such option by the copyright holder. + ++# The Startup Notification Protocol Specification established by freedesktop.org ++# recommends to unset the DESKTOP_STARTUP_ID environment variable to avoid ++# possible reuse by some process started later by this process, e.g. when a browser ++# will be started after clicking a hyperlink in the NetBeans. ++if [ ! -z $DESKTOP_STARTUP_ID ] ; then ++ # Save a value for later using in the NB_DESKTOP_STARTUP_ID ++ NB_DESKTOP_STARTUP_ID=$DESKTOP_STARTUP_ID; export NB_DESKTOP_STARTUP_ID ++ ++ unset DESKTOP_STARTUP_ID ++fi ++ + # + # resolve symlinks + # +@@ -57,16 +68,18 @@ + fi + done + +-progdir=`dirname "$PRG"` ++#progdir=`dirname "$PRG"` ++# Patch for Debian/Ubuntu/Fedora where launcher is in /usr/bin ++progdir=/usr/share/netbeans/6.9/bin + + if [ -f "$progdir"/../etc/netbeans.conf ] ; then + . "$progdir"/../etc/netbeans.conf + 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 + + + # #68373: look for userdir, but do not modify "$@" +@@ -198,7 +211,6 @@ + --branding nb \ + --clusters '"$netbeans_clusters"' \ + -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \ +- -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \ + ${netbeans_default_options} \ + '"$@"' + ;; --- netbeans-6.9.orig/debian/patches/netbeans-6.9~60-nosvnkit.patch +++ netbeans-6.9/debian/patches/netbeans-6.9~60-nosvnkit.patch @@ -0,0 +1,34 @@ +diff -Nur netbeans-6.9/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java netbeans-6.9.new/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java +--- netbeans-6.9/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java 2010-06-10 15:20:26.000000000 +0400 ++++ netbeans-6.9.new/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java 2010-07-20 06:58:22.586364869 +0400 +@@ -48,7 +48,7 @@ + import org.tigris.subversion.svnclientadapter.SVNClientException; + import org.tigris.subversion.svnclientadapter.javahl.JhlClientAdapter; + import org.tigris.subversion.svnclientadapter.javahl.JhlClientAdapterFactory; +-import org.tigris.subversion.svnclientadapter.svnkit.SvnKitClientAdapterFactory; ++//import org.tigris.subversion.svnclientadapter.svnkit.SvnKitClientAdapterFactory; + + /** + * +@@ -101,8 +101,9 @@ + return JhlClientAdapterFactory.isAvailable(); + } + case svnkit: { +- SvnKitClientAdapterFactory.setup(); +- return SvnKitClientAdapterFactory.isAvailable(); ++// SvnKitClientAdapterFactory.setup(); ++// return SvnKitClientAdapterFactory.isAvailable(); ++ return false; + } + } + return false; +@@ -114,7 +115,8 @@ + return JhlClientAdapterFactory.createSVNClient(JhlClientAdapterFactory.JAVAHL_CLIENT); + } + case svnkit: { +- return SvnKitClientAdapterFactory.createSVNClient(SvnKitClientAdapterFactory.SVNKIT_CLIENT); ++// return SvnKitClientAdapterFactory.createSVNClient(SvnKitClientAdapterFactory.SVNKIT_CLIENT); ++ return null; + } + } + return null; --- netbeans-6.9.orig/debian/patches/netbeans-6.9~70-small-ide-cluster.patch +++ netbeans-6.9/debian/patches/netbeans-6.9~70-small-ide-cluster.patch @@ -0,0 +1,171 @@ +diff -Nur -x '*.orig' -x '*~' netbeans-6.9/apisupport.kit/nbproject/project.xml netbeans-6.9.new/apisupport.kit/nbproject/project.xml +--- netbeans-6.9/apisupport.kit/nbproject/project.xml 2010-08-11 17:51:53.000000000 +0400 ++++ netbeans-6.9.new/apisupport.kit/nbproject/project.xml 2010-08-11 17:58:46.000000000 +0400 +@@ -12,43 +12,18 @@ + + + +- org.netbeans.modules.apisupport.crudsample +- +- 1.0 +- +- +- +- org.netbeans.modules.apisupport.feedreader +- +- 1 +- 1.4 +- +- +- + org.netbeans.modules.apisupport.harness + + 1.10 + + + +- org.netbeans.modules.apisupport.installer +- +- 1.0 +- +- +- + org.netbeans.modules.apisupport.osgidemo + + 1.1 + + + +- org.netbeans.modules.apisupport.paintapp +- +- 1.1 +- +- +- + org.netbeans.modules.apisupport.project + + 1 +diff -Nur -x '*.orig' -x '*~' netbeans-6.9/editor.kit/nbproject/project.xml netbeans-6.9.new/editor.kit/nbproject/project.xml +--- netbeans-6.9/editor.kit/nbproject/project.xml 2010-08-11 17:51:53.000000000 +0400 ++++ netbeans-6.9.new/editor.kit/nbproject/project.xml 2010-08-11 17:59:25.000000000 +0400 +@@ -6,13 +6,6 @@ + org.netbeans.modules.editor.kit + + +- org.netbeans.modules.css.visual +- +- 1 +- 2.4 +- +- +- + org.netbeans.modules.editor.actions + + 1 +@@ -40,13 +33,7 @@ + 1.19 + + +- +- org.netbeans.modules.javascript.kit +- +- 1 +- 0.103 +- +- ++ + + org.netbeans.modules.languages.diff + +@@ -80,13 +67,6 @@ + + + +- org.netbeans.modules.web.flyingsaucer +- +- 1 +- 1 +- +- +- + org.netbeans.modules.xml.core + + 2 +@@ -119,13 +99,6 @@ + 1.13 + + +- +- org.netbeans.modules.xsl +- +- 1 +- 1.13 +- +- + + + +diff -Nur -x '*.orig' -x '*~' netbeans-6.9/ide.kit/nbproject/project.xml netbeans-6.9.new/ide.kit/nbproject/project.xml +--- netbeans-6.9/ide.kit/nbproject/project.xml 2010-08-11 17:51:53.000000000 +0400 ++++ netbeans-6.9.new/ide.kit/nbproject/project.xml 2010-08-11 17:56:38.000000000 +0400 +@@ -129,6 +129,7 @@ + 1.11 + + ++ + + org.netbeans.modules.jumpto + +@@ -222,12 +224,14 @@ + 1.0 + + ++ + + + +diff -Nur -x '*.orig' -x '*~' netbeans-6.9/java.kit/nbproject/project.xml netbeans-6.9.new/java.kit/nbproject/project.xml +--- netbeans-6.9/java.kit/nbproject/project.xml 2010-08-11 17:51:53.000000000 +0400 ++++ netbeans-6.9.new/java.kit/nbproject/project.xml 2010-08-11 17:59:50.000000000 +0400 +@@ -205,26 +205,6 @@ + + + +- org.netbeans.modules.websvc.jaxws21 +- +- 1 +- 1.1 +- +- +- +- org.netbeans.modules.websvc.jaxws21api +- +- 1 +- +- +- +- org.netbeans.modules.xml.jaxb +- +- 1 +- 1.0 +- +- +- + org.netbeans.modules.xml.tools.java + + 1.3 --- netbeans-6.9.orig/debian/patches/netbeans-6.9~50-build-copy.patch +++ netbeans-6.9/debian/patches/netbeans-6.9~50-build-copy.patch @@ -0,0 +1,289 @@ +diff -Nur netbeans-6.9/css.editor/nbproject/project.properties netbeans-6.9.new/css.editor/nbproject/project.properties +--- netbeans-6.9/css.editor/nbproject/project.properties 2010-06-10 15:18:26.000000000 +0400 ++++ netbeans-6.9.new/css.editor/nbproject/project.properties 2010-07-16 05:59:44.594742595 +0400 +@@ -40,7 +40,7 @@ + # Version 2 license, then the option applies only if the new code is + # made subject to such option by the copyright holder. + +-release.external/css21-spec.zip=docs/css21-spec.zip ++#release.external/css21-spec.zip=docs/css21-spec.zip + jnlp.indirect.jars=docs/css21-spec.zip + + javac.compilerargs=-Xlint -Xlint:-serial +diff -Nur netbeans-6.9/html.editor/nbproject/project.properties netbeans-6.9.new/html.editor/nbproject/project.properties +--- netbeans-6.9/html.editor/nbproject/project.properties 2010-06-10 15:19:04.000000000 +0400 ++++ netbeans-6.9.new/html.editor/nbproject/project.properties 2010-07-16 06:00:23.027727913 +0400 +@@ -40,7 +40,7 @@ + # Version 2 license, then the option applies only if the new code is + # made subject to such option by the copyright holder. + +-release.external/html-4.01.zip=docs/html-4.01.zip ++#release.external/html-4.01.zip=docs/html-4.01.zip + + javac.compilerargs=-Xlint:unchecked + javac.source=1.6 +diff -Nur netbeans-6.9/junit/nbproject/project.properties netbeans-6.9.new/junit/nbproject/project.properties +--- netbeans-6.9/junit/nbproject/project.properties 2010-06-10 15:20:14.000000000 +0400 ++++ netbeans-6.9.new/junit/nbproject/project.properties 2010-07-16 06:01:49.883726928 +0400 +@@ -45,11 +45,11 @@ + javadoc.arch=${basedir}/arch.xml + javadoc.apichanges=${basedir}/apichanges.xml + +-release.external/junit-3.8.2.jar=modules/ext/junit-3.8.2.jar +-release.external/junit-3.8.2-api.zip=docs/junit-3.8.2-api.zip +-release.external/junit-4.5-api.zip=docs/junit-4.5-api.zip +-release.external/junit-4.5-src.jar=docs/junit-4.5-src.jar +-release.external/Ant-1.8.0-binary-patch-72080.jar=ant/patches/72080.jar ++#release.external/junit-3.8.2.jar=modules/ext/junit-3.8.2.jar ++#release.external/junit-3.8.2-api.zip=docs/junit-3.8.2-api.zip ++#release.external/junit-4.5-api.zip=docs/junit-4.5-api.zip ++#release.external/junit-4.5-src.jar=docs/junit-4.5-src.jar ++#release.external/Ant-1.8.0-binary-patch-72080.jar=ant/patches/72080.jar + + # XXX AntBridge.createMainClassPath probably would not find this anyway: + jnlp.verify.excludes=ant/patches/72080.jar +diff -Nur netbeans-6.9/libs.bytelist/nbproject/project.properties netbeans-6.9.new/libs.bytelist/nbproject/project.properties +--- netbeans-6.9/libs.bytelist/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400 ++++ netbeans-6.9.new/libs.bytelist/nbproject/project.properties 2010-07-16 06:02:25.053954346 +0400 +@@ -41,5 +41,5 @@ + # made subject to such option by the copyright holder. + + is.autoload=true +-release.external/bytelist-0.1.jar=modules/ext/bytelist-0.1.jar ++#release.external/bytelist-0.1.jar=modules/ext/bytelist-0.1.jar + spec.version.base=0.7.1 +diff -Nur netbeans-6.9/libs.commons_logging/nbproject/project.properties netbeans-6.9.new/libs.commons_logging/nbproject/project.properties +--- netbeans-6.9/libs.commons_logging/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400 ++++ netbeans-6.9.new/libs.commons_logging/nbproject/project.properties 2010-07-16 06:03:48.899676485 +0400 +@@ -41,5 +41,5 @@ + # made subject to such option by the copyright holder. + + is.autoload=true +-release.external/commons-logging-1.1.jar=modules/ext/commons-logging-1.1.jar ++#release.external/commons-logging-1.1.jar=modules/ext/commons-logging-1.1.jar + spec.version.base=1.13.1 +diff -Nur netbeans-6.9/libs.commons_net/nbproject/project.properties netbeans-6.9.new/libs.commons_net/nbproject/project.properties +--- netbeans-6.9/libs.commons_net/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400 ++++ netbeans-6.9.new/libs.commons_net/nbproject/project.properties 2010-07-16 06:04:27.258857826 +0400 +@@ -41,5 +41,5 @@ + # made subject to such option by the copyright holder. + + is.autoload=true +-release.external/commons-net-1.4.1.jar=modules/ext/commons-net-1.4.1.jar ++#release.external/commons-net-1.4.1.jar=modules/ext/commons-net-1.4.1.jar + spec.version.base=1.8.1 +diff -Nur netbeans-6.9/libs.freemarker/nbproject/project.properties netbeans-6.9.new/libs.freemarker/nbproject/project.properties +--- netbeans-6.9/libs.freemarker/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400 ++++ netbeans-6.9.new/libs.freemarker/nbproject/project.properties 2010-07-16 06:05:34.871676824 +0400 +@@ -44,6 +44,6 @@ + + javac.compilerargs=-Xlint:unchecked + javac.source=1.6 +-release.external/freemarker-2.3.8.jar=modules/ext/freemarker-2.3.8.jar ++#release.external/freemarker-2.3.8.jar=modules/ext/freemarker-2.3.8.jar + module.jar.verifylinkageignores=freemarker.((ext.ant.FreemarkerXmlTask)|(template.DefaultObjectWrapper)) + spec.version.base=2.11.1 +diff -Nur netbeans-6.9/libs.ini4j/nbproject/project.properties netbeans-6.9.new/libs.ini4j/nbproject/project.properties +--- netbeans-6.9/libs.ini4j/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400 ++++ netbeans-6.9.new/libs.ini4j/nbproject/project.properties 2010-07-16 06:06:19.885673929 +0400 +@@ -41,7 +41,7 @@ + # made subject to such option by the copyright holder. + + is.autoload=true +-release.external/ini4j-0.4.1.jar=modules/ext/ini4j-0.4.1.jar ++#release.external/ini4j-0.4.1.jar=modules/ext/ini4j-0.4.1.jar + module.jar.verifylinkageignores=org.ini4j.IniPreferencesFactoryListener + + # Fatal error: class javax.servlet.ServletContextListener not found +diff -Nur netbeans-6.9/libs.jakarta_oro/nbproject/project.properties netbeans-6.9.new/libs.jakarta_oro/nbproject/project.properties +--- netbeans-6.9/libs.jakarta_oro/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400 ++++ netbeans-6.9.new/libs.jakarta_oro/nbproject/project.properties 2010-07-16 06:06:44.109804385 +0400 +@@ -41,5 +41,5 @@ + # made subject to such option by the copyright holder. + + is.autoload=true +-release.external/jakarta-oro-2.0.8.jar=modules/ext/jakarta-oro-2.0.8.jar ++#release.external/jakarta-oro-2.0.8.jar=modules/ext/jakarta-oro-2.0.8.jar + spec.version.base=1.7.1 +diff -Nur netbeans-6.9/libs.javacapi/nbproject/project.properties netbeans-6.9.new/libs.javacapi/nbproject/project.properties +--- netbeans-6.9/libs.javacapi/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400 ++++ netbeans-6.9.new/libs.javacapi/nbproject/project.properties 2010-07-16 06:07:35.303728982 +0400 +@@ -47,6 +47,6 @@ + nbm.homepage=http://jackpot.netbeans.org/ + nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc. + spec.version.base=0.13.1 +-release.external/javac-api-nb-7.0-b07.jar=modules/ext/javac-api-nb-7.0-b07.jar ++#release.external/javac-api-nb-7.0-b07.jar=modules/ext/javac-api-nb-7.0-b07.jar + javadoc.arch=${basedir}/arch.xml + module.javadoc.packages=com.sun.source.tree,com.sun.source.util +diff -Nur netbeans-6.9/libs.javacimpl/nbproject/project.properties netbeans-6.9.new/libs.javacimpl/nbproject/project.properties +--- netbeans-6.9/libs.javacimpl/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400 ++++ netbeans-6.9.new/libs.javacimpl/nbproject/project.properties 2010-07-16 06:08:26.597996098 +0400 +@@ -44,7 +44,7 @@ + nbm.homepage=http://jackpot.netbeans.org/ + nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc. + spec.version.base=0.16.1 +-release.external/javac-impl-nb-7.0-b07.jar=modules/ext/javac-impl-nb-7.0-b07.jar ++#release.external/javac-impl-nb-7.0-b07.jar=modules/ext/javac-impl-nb-7.0-b07.jar + javadoc.arch=${basedir}/arch.xml + + +diff -Nur netbeans-6.9/libs.jna/nbproject/project.properties netbeans-6.9.new/libs.jna/nbproject/project.properties +--- netbeans-6.9/libs.jna/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400 ++++ netbeans-6.9.new/libs.jna/nbproject/project.properties 2010-07-16 06:09:14.791678998 +0400 +@@ -40,4 +40,4 @@ + # Version 2 license, then the option applies only if the new code is + # made subject to such option by the copyright holder. + +-release.external/jna-3.0.9.jar=modules/ext/jna-3.0.9.jar ++#release.external/jna-3.0.9.jar=modules/ext/jna-3.0.9.jar +diff -Nur netbeans-6.9/libs.jsch/nbproject/project.properties netbeans-6.9.new/libs.jsch/nbproject/project.properties +--- netbeans-6.9/libs.jsch/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400 ++++ netbeans-6.9.new/libs.jsch/nbproject/project.properties 2010-07-16 06:10:13.651928868 +0400 +@@ -41,6 +41,6 @@ + # made subject to such option by the copyright holder. + + is.autoload=true +-release.external/jsch-0.1.41.jar=modules/ext/jsch-0.1.41.jar ++#release.external/jsch-0.1.41.jar=modules/ext/jsch-0.1.41.jar + sigtest.gen.fail.on.error=false + +diff -Nur netbeans-6.9/libs.junit4/nbproject/project.properties netbeans-6.9.new/libs.junit4/nbproject/project.properties +--- netbeans-6.9/libs.junit4/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400 ++++ netbeans-6.9.new/libs.junit4/nbproject/project.properties 2010-07-16 06:10:45.703797050 +0400 +@@ -41,7 +41,7 @@ + # made subject to such option by the copyright holder. + + is.autoload=true +-release.external/junit-4.5.jar=modules/ext/junit-4.5.jar ++#release.external/junit-4.5.jar=modules/ext/junit-4.5.jar + + + sigtest.skip.check=true +diff -Nur netbeans-6.9/libs.jvyamlb/nbproject/project.properties netbeans-6.9.new/libs.jvyamlb/nbproject/project.properties +--- netbeans-6.9/libs.jvyamlb/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400 ++++ netbeans-6.9.new/libs.jvyamlb/nbproject/project.properties 2010-07-16 06:11:55.084698916 +0400 +@@ -41,6 +41,6 @@ + # made subject to such option by the copyright holder. + + is.autoload=true +-release.external/jvyamlb-0.2.3.jar=modules/ext/jvyamlb-0.2.3.jar ++#release.external/jvyamlb-0.2.3.jar=modules/ext/jvyamlb-0.2.3.jar + + sigtest.gen.fail.on.error=false +diff -Nur netbeans-6.9/libs.jzlib/nbproject/project.properties netbeans-6.9.new/libs.jzlib/nbproject/project.properties +--- netbeans-6.9/libs.jzlib/nbproject/project.properties 2010-06-10 15:20:24.000000000 +0400 ++++ netbeans-6.9.new/libs.jzlib/nbproject/project.properties 2010-07-16 06:13:06.616686401 +0400 +@@ -41,6 +41,6 @@ + # made subject to such option by the copyright holder. + + is.autoload=true +-release.external/jzlib-1.0.7.jar=modules/ext/jzlib-1.0.7.jar ++#release.external/jzlib-1.0.7.jar=modules/ext/jzlib-1.0.7.jar + spec.version.base=1.4.1 + sigtest.gen.fail.on.error=false +diff -Nur netbeans-6.9/libs.lucene/nbproject/project.properties netbeans-6.9.new/libs.lucene/nbproject/project.properties +--- netbeans-6.9/libs.lucene/nbproject/project.properties 2010-06-10 15:20:26.000000000 +0400 ++++ netbeans-6.9.new/libs.lucene/nbproject/project.properties 2010-07-16 06:14:21.604681273 +0400 +@@ -41,5 +41,5 @@ + # made subject to such option by the copyright holder. + + is.autoload=true +-release.external/lucene-core-2.4.1.jar=modules/ext/lucene-core-2.4.1.jar ++#release.external/lucene-core-2.4.1.jar=modules/ext/lucene-core-2.4.1.jar + spec.version.base=2.10.1 +diff -Nur netbeans-6.9/libs.svnClientAdapter/nbproject/project.properties netbeans-6.9.new/libs.svnClientAdapter/nbproject/project.properties +--- netbeans-6.9/libs.svnClientAdapter/nbproject/project.properties 2010-06-10 15:20:26.000000000 +0400 ++++ netbeans-6.9.new/libs.svnClientAdapter/nbproject/project.properties 2010-07-16 06:15:17.101763246 +0400 +@@ -43,8 +43,8 @@ + is.autoload=true + + javac.source=1.6 +-release.external/svnClientAdapter-1.6.0.jar=modules/ext/svnClientAdapter-1.6.0.jar +-release.external/svnjavahl-1.6.0.jar=modules/ext/svnjavahl-1.6.0.jar ++#release.external/svnClientAdapter-1.6.0.jar=modules/ext/svnClientAdapter-1.6.0.jar ++#release.external/svnjavahl-1.6.0.jar=modules/ext/svnjavahl-1.6.0.jar + + # Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected byte[] org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine.execBytes(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnCommandLine + # Hidden class found: org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments in method protected java.lang.String org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine.execString(org.tigris.subversion.svnclientadapter.commandline.CommandLine$CmdArguments,boolean) throws java.lang.Exception in class org.tigris.subversion.svnclientadapter.commandline.SvnAdminCommandLine +diff -Nur netbeans-6.9/libs.swingx/nbproject/project.properties netbeans-6.9.new/libs.swingx/nbproject/project.properties +--- netbeans-6.9/libs.swingx/nbproject/project.properties 2010-06-10 15:20:26.000000000 +0400 ++++ netbeans-6.9.new/libs.swingx/nbproject/project.properties 2010-07-16 06:17:30.875793234 +0400 +@@ -40,6 +40,6 @@ + # Version 2 license, then the option applies only if the new code is + # made subject to such option by the copyright holder. + +-release.external/swingx-0.9.5.jar=modules/ext/swingx-0.9.5.jar ++#release.external/swingx-0.9.5.jar=modules/ext/swingx-0.9.5.jar + sigtest.gen.fail.on.error=false + +diff -Nur netbeans-6.9/libs.xerces/nbproject/project.properties netbeans-6.9.new/libs.xerces/nbproject/project.properties +--- netbeans-6.9/libs.xerces/nbproject/project.properties 2010-06-10 15:20:26.000000000 +0400 ++++ netbeans-6.9.new/libs.xerces/nbproject/project.properties 2010-07-16 06:17:59.308937253 +0400 +@@ -41,6 +41,6 @@ + # made subject to such option by the copyright holder. + + is.autoload=true +-release.external/xerces-2.8.0.jar=modules/ext/xerces-2.8.0.jar ++#release.external/xerces-2.8.0.jar=modules/ext/xerces-2.8.0.jar + module.jar.verifylinkageignores=org.apache.xerces.util.XMLCatalogResolver + spec.version.base=1.18.1 +diff -Nur netbeans-6.9/o.apache.xml.resolver/nbproject/project.properties netbeans-6.9.new/o.apache.xml.resolver/nbproject/project.properties +--- netbeans-6.9/o.apache.xml.resolver/nbproject/project.properties 2010-06-10 15:20:50.000000000 +0400 ++++ netbeans-6.9.new/o.apache.xml.resolver/nbproject/project.properties 2010-07-16 06:18:37.024719810 +0400 +@@ -41,5 +41,5 @@ + # made subject to such option by the copyright holder. + + is.autoload=true +-release.external/resolver-1.2.jar=modules/ext/resolver-1.2.jar ++#release.external/resolver-1.2.jar=modules/ext/resolver-1.2.jar + spec.version.base=1.11.1 +diff -Nur netbeans-6.9/o.jdesktop.beansbinding/nbproject/project.properties netbeans-6.9.new/o.jdesktop.beansbinding/nbproject/project.properties +--- netbeans-6.9/o.jdesktop.beansbinding/nbproject/project.properties 2010-06-10 15:20:50.000000000 +0400 ++++ netbeans-6.9.new/o.jdesktop.beansbinding/nbproject/project.properties 2010-07-16 06:19:29.208734667 +0400 +@@ -41,7 +41,7 @@ + # made subject to such option by the copyright holder. + + is.autoload=true +-release.external/beansbinding-1.2.1.jar=modules/ext/beansbinding-1.2.1.jar +-release.external/beansbinding-1.2.1-doc.zip=docs/beansbinding-1.2.1-doc.zip ++#release.external/beansbinding-1.2.1.jar=modules/ext/beansbinding-1.2.1.jar ++#release.external/beansbinding-1.2.1-doc.zip=docs/beansbinding-1.2.1-doc.zip + jnlp.indirect.jars=docs/beansbinding-1.2.1-doc.zip + spec.version.base=1.7.1 +diff -Nur netbeans-6.9/o.jdesktop.layout/nbproject/project.properties netbeans-6.9.new/o.jdesktop.layout/nbproject/project.properties +--- netbeans-6.9/o.jdesktop.layout/nbproject/project.properties 2010-06-10 15:20:50.000000000 +0400 ++++ netbeans-6.9.new/o.jdesktop.layout/nbproject/project.properties 2010-07-16 06:20:31.435815424 +0400 +@@ -41,7 +41,7 @@ + # made subject to such option by the copyright holder. + + is.autoload=true +-release.external/swing-layout-1.0.4.jar=modules/ext/swing-layout-1.0.4.jar +-release.external/swing-layout-1.0.4-doc.zip=docs/swing-layout-1.0.4-doc.zip +-release.external/swing-layout-1.0.4-src.zip=docs/swing-layout-1.0.4-src.zip ++#release.external/swing-layout-1.0.4.jar=modules/ext/swing-layout-1.0.4.jar ++#release.external/swing-layout-1.0.4-doc.zip=docs/swing-layout-1.0.4-doc.zip ++#release.external/swing-layout-1.0.4-src.zip=docs/swing-layout-1.0.4-src.zip + jnlp.indirect.jars=docs/swing-layout-1.0.4-doc.zip, docs/swing-layout-1.0.4-src.zip +diff -Nur netbeans-6.9/servletapi/nbproject/project.properties netbeans-6.9.new/servletapi/nbproject/project.properties +--- netbeans-6.9/servletapi/nbproject/project.properties 2010-06-10 15:22:08.000000000 +0400 ++++ netbeans-6.9.new/servletapi/nbproject/project.properties 2010-07-16 06:21:11.095676854 +0400 +@@ -41,4 +41,4 @@ + # made subject to such option by the copyright holder. + + is.autoload=true +-release.external/servlet-2.2.jar=modules/ext/servlet-2.2.jar ++#release.external/servlet-2.2.jar=modules/ext/servlet-2.2.jar +diff -Nur netbeans-6.9/swingapp/nbproject/project.properties netbeans-6.9.new/swingapp/nbproject/project.properties +--- netbeans-6.9/swingapp/nbproject/project.properties 2010-06-10 15:22:26.000000000 +0400 ++++ netbeans-6.9.new/swingapp/nbproject/project.properties 2010-07-16 06:22:04.988688029 +0400 +@@ -1,6 +1,6 @@ +-extra.module.files=modules/ext/appframework-1.0.3.jar,\ +- docs/appframework-1.0.3-doc.zip,\ +- modules/ext/swing-worker-1.1.jar ++#extra.module.files=modules/ext/appframework-1.0.3.jar,\ ++# docs/appframework-1.0.3-doc.zip,\ ++# modules/ext/swing-worker-1.1.jar + jnlp.indirect.jars=docs/appframework-1.0.3-doc.zip + javac.source=1.6 + spec.version.base=1.9.1 --- netbeans-6.9.orig/debian/patches/netbeans-6.9~90-junit-migration.patch +++ netbeans-6.9/debian/patches/netbeans-6.9~90-junit-migration.patch @@ -0,0 +1,196 @@ +diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/Bundle.properties netbeans-6.9.new/junit/src/org/netbeans/modules/junit/Bundle.properties +--- netbeans-6.9/junit/src/org/netbeans/modules/junit/Bundle.properties 2010-06-10 15:20:14.000000000 +0400 ++++ netbeans-6.9.new/junit/src/org/netbeans/modules/junit/Bundle.properties 2010-08-05 15:37:50.000000000 +0400 +@@ -399,7 +399,7 @@ + + #names of the JUnit libraries + junit=JUnit 3.8.2 +-junit_4=JUnit 4.5 ++junit_4=JUnit 4.8 + + MSG_MISSING_TEST=The directory for tests was not found. Use source directory instead? + MSG_MISSING_TEST_TITLE=Missing Test Directory +diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/resources/junit_4_5_lib.xml netbeans-6.9.new/junit/src/org/netbeans/modules/junit/resources/junit_4_5_lib.xml +--- netbeans-6.9/junit/src/org/netbeans/modules/junit/resources/junit_4_5_lib.xml 2010-06-10 15:20:14.000000000 +0400 ++++ netbeans-6.9.new/junit/src/org/netbeans/modules/junit/resources/junit_4_5_lib.xml 1970-01-01 03:00:00.000000000 +0300 +@@ -1,68 +0,0 @@ +- +- +- +- +- junit_4 +- j2se +- org.netbeans.modules.junit.Bundle +- +- classpath +- jar:nbinst://org.netbeans.libs.junit4/modules/ext/junit-4.5.jar!/ +- +- +- javadoc +- jar:nbinst://org.netbeans.modules.junit/docs/junit-4.5-api.zip!/ +- +- +- src +- jar:nbinst://org.netbeans.modules.junit/docs/junit-4.5-src.jar!/ +- +- +- +- maven-pom +- http://repo1.maven.org/maven2/junit/junit/4.4/junit-4.4.pom +- +- +diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/resources/junit_4_8_lib.xml netbeans-6.9.new/junit/src/org/netbeans/modules/junit/resources/junit_4_8_lib.xml +--- netbeans-6.9/junit/src/org/netbeans/modules/junit/resources/junit_4_8_lib.xml 1970-01-01 03:00:00.000000000 +0300 ++++ netbeans-6.9.new/junit/src/org/netbeans/modules/junit/resources/junit_4_8_lib.xml 2010-08-05 15:52:53.000000000 +0400 +@@ -0,0 +1,66 @@ ++ ++ ++ ++ ++ junit_4 ++ j2se ++ org.netbeans.modules.junit.Bundle ++ ++ classpath ++ jar:nbinst://org.netbeans.libs.junit4/modules/ext/junit-4.8.jar!/ ++ jar:nbinst://org.netbeans.libs.junit4/modules/ext/hamcrest-core.jar!/ ++ ++ ++ ++ ++ maven-pom ++ http://repo1.maven.org/maven2/junit/junit/4.4/junit-4.4.pom ++ ++ +diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/resources/layer.xml netbeans-6.9.new/junit/src/org/netbeans/modules/junit/resources/layer.xml +--- netbeans-6.9/junit/src/org/netbeans/modules/junit/resources/layer.xml 2010-06-10 15:20:14.000000000 +0400 ++++ netbeans-6.9.new/junit/src/org/netbeans/modules/junit/resources/layer.xml 2010-08-05 15:53:45.000000000 +0400 +@@ -50,7 +50,7 @@ + + + +- ++ + + + +diff -Nur -x '*.orig' -x '*~' netbeans-6.9/libs.junit4/nbproject/project.xml netbeans-6.9.new/libs.junit4/nbproject/project.xml +--- netbeans-6.9/libs.junit4/nbproject/project.xml 2010-06-10 15:20:24.000000000 +0400 ++++ netbeans-6.9.new/libs.junit4/nbproject/project.xml 2010-08-05 16:02:54.000000000 +0400 +@@ -63,8 +63,12 @@ + org.junit.runners + + +- ext/junit-4.5.jar +- external/junit-4.5.jar ++ ext/hamcrest-core.jar ++ external/hamcrest-core.jar ++ ++ ++ ext/junit-4.8.jar ++ external/junit-4.8.jar + + + +diff -Nur -x '*.orig' -x '*~' netbeans-6.9/nbbuild/build.properties netbeans-6.9.new/nbbuild/build.properties +--- netbeans-6.9/nbbuild/build.properties 2010-06-10 15:20:46.000000000 +0400 ++++ netbeans-6.9.new/nbbuild/build.properties 2010-08-05 16:03:22.000000000 +0400 +@@ -79,7 +79,7 @@ + stop.when.clean.error=true + + test.unit.cp=\ +- ../libs.junit4/external/junit-4.5.jar:\ ++ ../libs.junit4/external/junit-4.8.jar:\ + netbeans/harness/modules/org-netbeans-modules-nbjunit.jar:\ + netbeans/harness/modules/org-netbeans-insane.jar:\ + ../o.apache.tools.ant.module/external/lib/ant-nodeps.jar:\ --- netbeans-6.9.orig/debian/patches/netbeans-6.9~00-updatecenters.patch +++ netbeans-6.9/debian/patches/netbeans-6.9~00-updatecenters.patch @@ -0,0 +1,46 @@ +diff -Nur -x '*.orig' -x '*~' netbeans-6.9/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties netbeans-6.9.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties +--- netbeans-6.9/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties 2010-08-11 16:04:56.000000000 +0400 ++++ netbeans-6.9.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties 2010-08-11 17:17:43.000000000 +0400 +@@ -53,9 +53,11 @@ + Services/AutoupdateType/beta-update-provider.instance=NetBeans Beta + Services/AutoupdateType/thirdparty-update-provider.instance=3rd Party Plugins + Services/AutoupdateType/pluginportal-update-provider.instance=Plugin Portal ++Services/AutoupdateType/standard-update-provider-ubuntu.instance=NetBeans for Ubuntu + #NOI18N + URL_Standard=http://updates.netbeans.org/netbeans/updates/6.9/uc/final/stable/catalog.xml.gz?{$netbeans.hash.code} + URL_Beta=http://updates.netbeans.org/netbeans/updates/6.9/uc/final/beta/catalog.xml.gz?{$netbeans.hash.code} + URL_ThirdParty=http://updates.netbeans.org/netbeans/updates/6.9/uc/final/thirdparty/catalog.xml.gz?{$netbeans.hash.code} + URL_PluginPortal=http://plugins.netbeans.org/nbpluginportal/updates/6.9/catalog.xml.gz ++URL_Standard_Ubuntu=http://updates.netbeans.org/netbeans/updates/6.9/uc/final/ubuntu/catalog.xml.gz?{$netbeans.hash.code} + +diff -Nur -x '*.orig' -x '*~' netbeans-6.9/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml netbeans-6.9.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml +--- netbeans-6.9/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml 2010-08-11 16:04:56.000000000 +0400 ++++ netbeans-6.9.new/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml 2010-08-11 17:18:34.000000000 +0400 +@@ -55,7 +55,7 @@ + + + +- ++ + + + +@@ -89,7 +89,17 @@ + + + +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + --- netbeans-6.9.orig/debian/patches/netbeans-6.9~71-cluster-properties.patch +++ netbeans-6.9/debian/patches/netbeans-6.9~71-cluster-properties.patch @@ -0,0 +1,265 @@ +diff -Nur -x '*.orig' -x '*~' netbeans-6.9/nbbuild/cluster.properties netbeans-6.9.new/nbbuild/cluster.properties +--- netbeans-6.9/nbbuild/cluster.properties 2010-08-11 16:04:56.000000000 +0400 ++++ netbeans-6.9.new/nbbuild/cluster.properties 2010-08-11 17:22:31.000000000 +0400 +@@ -112,9 +112,7 @@ + clusters.config.java.list=\ + ${clusters.config.platform.list},\ + nb.cluster.ide,\ +- nb.cluster.websvccommon,\ + nb.cluster.java,\ +- nb.cluster.profiler,\ + nb.cluster.nb + + clusters.config.enterprise.list=\ +@@ -275,30 +273,12 @@ + api.debugger,\ + api.java.classpath,\ + api.xml,\ +- bugtracking,\ +- bugtracking.bridge,\ +- bugtracking.kenai,\ +- bugzilla,\ + core.browser,\ + core.ide,\ + csl.api,\ + css.editor,\ +- css.visual,\ +- db,\ +- db.core,\ +- db.dataview,\ +- db.drivers,\ +- db.kit,\ +- db.metadata.model,\ +- db.mysql,\ +- db.sql.editor,\ +- db.sql.visualeditor,\ +- dbapi,\ + defaults,\ +- derby,\ + diff,\ +- dlight.nativeexecution,\ +- dlight.terminal,\ + editor,\ + editor.actions,\ + editor.bookmarks,\ +@@ -324,8 +304,6 @@ + editor.util,\ + extbrowser,\ + extexecution,\ +- extexecution.destroy,\ +- glassfish.common,\ + gototest,\ + gsf,\ + gsf.api,\ +@@ -336,21 +314,13 @@ + html.editor,\ + html.editor.lib,\ + html.lexer,\ +- httpserver,\ + hudson,\ +- hudson.kenai,\ + hudson.mercurial,\ + hudson.subversion,\ + ide.kit,\ + image,\ +- javascript.editing,\ +- javascript.hints,\ +- javascript.kit,\ +- javascript.refactoring,\ + jellytools.ide,\ + jumpto,\ +- kenai,\ +- kenai.ui,\ + languages,\ + languages.diff,\ + languages.manifest,\ +@@ -359,28 +329,22 @@ + lexer.nbbridge,\ + lib.cvsclient,\ + lib.terminalemulator,\ +- libs.bugtracking,\ +- libs.bugzilla,\ + libs.bytelist,\ +- libs.commons_codec,\ + libs.commons_logging,\ + libs.commons_net,\ + libs.freemarker,\ + libs.ini4j,\ + libs.jakarta_oro,\ +- libs.jaxb,\ + libs.jsch,\ + libs.jvyamlb,\ + libs.jzlib,\ + libs.lucene,\ +- libs.smack,\ + libs.svnClientAdapter,\ + libs.swingx,\ + libs.xerces,\ + localhistory,\ + mercurial,\ + o.apache.xml.resolver,\ +- o.mozilla.rhino.patched,\ + o.n.swing.dirchooser,\ + o.openidex.util,\ + options.editor,\ +@@ -402,7 +366,6 @@ + spellchecker.apimodule,\ + spellchecker.bindings.htmlxml,\ + spellchecker.bindings.properties,\ +- spellchecker.dictionary_en,\ + spellchecker.kit,\ + spi.debugger.ui,\ + spi.editor.hints,\ +@@ -411,30 +374,25 @@ + spi.tasklist,\ + spi.viewmodel,\ + subversion,\ +- swing.validation,\ + target.iterator,\ + tasklist.kit,\ + tasklist.projectint,\ + tasklist.todo,\ + tasklist.ui,\ +- team.kit,\ + terminal,\ + usersguide,\ + utilities,\ + utilities.project,\ + versioning,\ + versioning.indexingbridge,\ +- versioning.kenai,\ + versioning.system.cvss,\ + versioning.util,\ + web.client.tools.api,\ + web.common,\ +- web.flyingsaucer,\ + xml,\ + xml.axi,\ + xml.catalog,\ + xml.core,\ +- xml.jaxb.api,\ + xml.lexer,\ + xml.multiview,\ + xml.retriever,\ +@@ -445,8 +403,7 @@ + xml.tools,\ + xml.wsdl.model,\ + xml.xam,\ +- xml.xdm,\ +- xsl ++ xml.xdm + validation.nb.cluster.ide=\ + ide.kit + +@@ -454,7 +411,6 @@ + nb.cluster.java.depends=\ + nb.cluster.ide,\ + nb.cluster.platform,\ +- nb.cluster.websvccommon,\ + nb.cluster.harness + nb.cluster.java=\ + ant.browsetask,\ +@@ -466,30 +422,19 @@ + api.java,\ + beans,\ + classfile,\ +- dbschema,\ + debugger.jpda,\ + debugger.jpda.ant,\ + debugger.jpda.projects,\ + debugger.jpda.ui,\ + form,\ +- form.j2ee,\ + form.kit,\ +- hibernate,\ +- hibernatelib,\ + hudson.ant,\ +- hudson.maven,\ + i18n,\ + i18n.form,\ + j2ee.core.utilities,\ +- j2ee.eclipselink,\ +- j2ee.jpa.refactoring,\ +- j2ee.jpa.verification,\ + j2ee.metadata,\ + j2ee.metadata.model.support,\ +- j2ee.persistence,\ +- j2ee.persistence.kit,\ + j2ee.persistenceapi,\ +- j2ee.toplinklib,\ + java.api.common,\ + java.debug,\ + java.editor,\ +@@ -516,37 +461,15 @@ + jellytools,\ + jellytools.java,\ + junit,\ +- kenai.maven,\ +- libs.cglib,\ + libs.javacapi,\ + libs.javacimpl,\ +- libs.springframework,\ +- maven,\ +- maven.embedder,\ +- maven.grammar,\ +- maven.graph,\ +- maven.hints,\ +- maven.indexer,\ +- maven.junit,\ +- maven.kit,\ +- maven.model,\ +- maven.osgi,\ +- maven.persistence,\ +- maven.repository,\ +- maven.search,\ +- maven.spring,\ + o.apache.tools.ant.module,\ + o.jdesktop.beansbinding,\ + projectimport.eclipse.core,\ + projectimport.eclipse.j2se,\ + refactoring.java,\ + spellchecker.bindings.java,\ +- spring.beans,\ + swingapp,\ +- websvc.jaxws21,\ +- websvc.jaxws21api,\ +- websvc.saas.codegen.java,\ +- xml.jaxb,\ + xml.tools.java + validation.nb.cluster.java=\ + java.kit +@@ -684,16 +607,10 @@ + nb.cluster.harness + nb.cluster.apisupport=\ + apisupport.ant,\ +- apisupport.crudsample,\ +- apisupport.feedreader,\ +- apisupport.installer,\ +- apisupport.installer.maven,\ + apisupport.kit,\ + apisupport.osgidemo,\ +- apisupport.paintapp,\ + apisupport.project,\ +- apisupport.refactoring,\ +- maven.apisupport ++ apisupport.refactoring + + nb.cluster.enterprise.dir=enterprise + nb.cluster.enterprise.depends=\ +@@ -810,7 +727,6 @@ + nb.cluster.nb.depends=nb.cluster.ide,nb.cluster.harness + nb.cluster.nb=\ + autoupdate.pluginimporter,\ +- bugzilla.exceptionreporter,\ + ide.branding,\ + ide.branding.kit,\ + lib.uihandler,\ +@@ -829,8 +745,6 @@ + apisupport.tc.cobertura,\ + jellytools.platform,\ + jemmy,\ +- libs.nbi.ant,\ +- libs.nbi.engine,\ + nbjunit,\ + o.n.insane + --- netbeans-6.9.orig/debian/patches/netbeans-6.9~41-log4j-classpath.patch +++ netbeans-6.9/debian/patches/netbeans-6.9~41-log4j-classpath.patch @@ -0,0 +1,11 @@ +diff -Nur -x '*.orig' -x '*~' netbeans-6.9/ide/launcher/unix/netbeans netbeans-6.9.new/ide/launcher/unix/netbeans +--- netbeans-6.9/ide/launcher/unix/netbeans 2010-08-11 17:25:55.000000000 +0400 ++++ netbeans-6.9.new/ide/launcher/unix/netbeans 2010-08-11 17:28:52.000000000 +0400 +@@ -211,6 +211,7 @@ + --branding nb \ + --clusters '"$netbeans_clusters"' \ + -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \ ++ --cp:p /usr/share/java/log4j-1.2.jar \ + ${netbeans_default_options} \ + '"$@"' + ;; --- netbeans-6.9.orig/debian/patches/netbeans-6.9~30-build-xml.patch +++ netbeans-6.9/debian/patches/netbeans-6.9~30-build-xml.patch @@ -0,0 +1,19 @@ +diff -Nur -x '*.orig' -x '*~' netbeans-6.9/nbbuild/build.xml netbeans-6.9.new/nbbuild/build.xml +--- netbeans-6.9/nbbuild/build.xml 2010-06-10 15:20:46.000000000 +0400 ++++ netbeans-6.9.new/nbbuild/build.xml 2010-08-06 19:35:33.000000000 +0400 +@@ -149,7 +149,6 @@ + + + +- + + + +@@ -299,7 +298,6 @@ + + + +- + + + --- netbeans-6.9.orig/nbbuild/build.properties_orig +++ netbeans-6.9/nbbuild/build.properties_orig @@ -0,0 +1,218 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + +netbeans.dest=netbeans +test.dist.dir=build/testdist + +test.user.dir=testuserdir +nb.run.validation=true +# Options to pass to NetBeans when starting it with "ant tryme": +build.compiler.debug=on +tryme.args=-J-Dnetbeans.full.hack=true + +# Information about branch of previous release +# needed to help us generate list of changes since then +previous.release.year=2009 +previous.release.month=12 +previous.release.day=10 + +# Useful for "always successful" build, when you don't care of some +# particular (and currently broken) modules +stop.when.broken.modules=true + +# resolve compile time dependencies and merge all dependent modules +# set to true and command `ant -Dmodules=javacvs` will build IDE +# with working module javacvs +merge.dependent.modules=true + +# usefull for NBM build. can set it to the list +# of successfuly built modules => can create NBM for them +# the most powerful combination is to set value to "modules" +# and set stop.when.broken.modules to false +built.modules.property= + +# resolve compile-time dependencies during cleaning working repository +# set it to true if you want to clean also modules, your module(s) depends on +resolve.clean.dependencies=false + +# stop, if the module have got wrong "clean" target +# if set to false, clean build never fail on calls of the clean targets. +stop.when.clean.error=true + +test.unit.cp=\ + ../libs.junit4/external/junit-4.8.jar:\ + netbeans/harness/modules/org-netbeans-modules-nbjunit.jar:\ + netbeans/harness/modules/org-netbeans-insane.jar:\ + ../o.apache.tools.ant.module/external/lib/ant-nodeps.jar:\ + ../o.apache.tools.ant.module/external/lib/ant-junit.jar:\ + ../o.apache.tools.ant.module/external/lib/ant-launcher.jar:\ + ../o.apache.tools.ant.module/external/lib/ant.jar:\ + nbantext.jar + +# make javadoc for these packages +# - the list will be shared for signature API tests! +# - for javadoc you may specify org.foo.*, the trailing ".*" +# will be stripped for signature API tests +javadoc.packages=\ + org.netbeans.api.*,\ + org.netbeans.spi.* + +# List of modules that provide stable javadoc +config.javadoc.stable=\ + api.annotations.common,\ + autoupdate.services,\ + core.ide,\ + openide.util,\ + openide.util.lookup,\ + openide.actions,\ + openide.awt,\ + openide.dialogs,\ + openide.nodes,\ + openide.explorer,\ + openide.filesystems,\ + openide.modules,\ + openide.text,\ + openide.windows,\ + openide.loaders,\ + openide.io,\ + api.progress,\ + sendopts,\ + settings,\ + javahelp,\ + keyring,\ + spi.palette,\ + options.api,\ + spi.tasklist,\ + openide.execution,\ + queries,\ + editor.codetemplates,\ + editor.errorstripe.api,\ + editor.mimelookup,\ + editor.settings,\ + spi.navigator,\ + diff,\ + projectapi,\ + projectuiapi,\ + project.libraries,\ + api.debugger,\ + spi.viewmodel,\ + spi.debugger.ui,\ + api.debugger.jpda,\ + project.ant,\ + api.visual,\ + api.java,\ + api.java.classpath,\ + java.platform,\ + java.project,\ + java.source,\ + java.sourceui,\ + editor.fold,\ + editor.completion,\ + lexer,\ + api.xml,\ + o.apache.tools.ant.module,\ + db,\ + spi.quicksearch,\ + print,\ + extexecution + +#FIXME: changes for retouche merge: +# editor/codetemplates,\ + +# List of javadocs under development +config.javadoc.devel=\ + nbjunit,\ + o.openidex.util,\ + core.netigso,\ + core.multiview,\ + o.n.swing.outline,\ + o.n.swing.tabcontrol,\ + editor.indent,\ + editor.lib2,\ + editor.bracesmatching,\ + editor.guards,\ + j2ee.metadata,\ + parsing.api,\ + refactoring.api,\ + refactoring.java,\ + server,\ + spi.editor.hints,\ + api.web.webmodule + +# List of javadocs dedicated just for friend usage +config.javadoc.friend=\ + o.n.bootstrap,\ + core.startup,\ + classfile,\ + o.n.swing.plaf,\ + editor.util,\ + editor.settings.storage,\ + editor.lib,\ + editor,\ + j2ee.dd,\ + j2eeserver,\ + java.api.common,\ + java.j2seproject,\ + junit,\ + uihandler,\ + lib.uihandler,\ + masterfs,\ + projectui + +# List of old and deprecated APIs for building complete javadoc + +config.javadoc.deprecated=\ + openide.compat,\ + openide.options,\ + openide.util.enumerations + +# List of all javadocs for development version +# is composed from the javadocs split by stability +# categories, for release it shall contain just stable ones +config.javadoc.all=\ + ${config.javadoc.stable} + +# list of modules for jnlp: +config.jnlp.stable=\ + ${nb.cluster.platform},\ + ${nb.cluster.ide},\ + ${nb.cluster.java} --- netbeans-6.9.orig/nbbuild/build.properties +++ netbeans-6.9/nbbuild/build.properties @@ -150,7 +150,6 @@ lexer,\ api.xml,\ o.apache.tools.ant.module,\ - db,\ spi.quicksearch,\ print,\ extexecution