[SCM] netbeans packaging branch, master, updated. debian/6.9-0ubuntu2-5-g707f34e
Andres Mejia
ceros-guest at alioth.debian.org
Sun Jan 23 23:37:41 UTC 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "netbeans packaging".
The branch, master has been updated
via 707f34ee0625f87ddedb694a5ee3e9446ce0fd65 (commit)
via cd44e0f1ea3b93bbc2a01206b1b79eecf80b9500 (commit)
from a5003acb704894c86131c87abd194b6888268e34 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 707f34ee0625f87ddedb694a5ee3e9446ce0fd65
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sun Jan 23 18:34:05 2011 -0500
Fix changes from bad merge of upstream source.
commit cd44e0f1ea3b93bbc2a01206b1b79eecf80b9500
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sun Jan 23 18:30:45 2011 -0500
Update packaging to get it ready for distribution with Debian.
* Update packaging to use 3.0 (quilt) source format.
* Update packaging to use dh with javahelper.
* Bump to Standards-Version 3.9.1.
* Refresh all patches.
* Use Java SwingWorker included in standard JDK distribution.
* Migrate to junit4.
* Migrate to libservlet2.5-java.
* Migrate to use Better Swing Application Framework.
* Use standard svnclientadapter from subclipse.
* Migrate to ini4j-0.5.2-SNAPSHOT.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 14 +-
debian/control | 62 +++---
debian/libnb-apisupport2-java.dirs | 1 -
debian/libnb-ide13-java.dirs | 1 -
debian/libnb-java4-java.dirs | 1 -
debian/netbeans.dirs | 5 -
debian/netbeans.manpages | 1 +
debian/patches/netbeans-6.9~00-updatecenters.patch | 10 +-
...netbeans-6.9~10-o.apache.tools.ant.module.patch | 10 +-
debian/patches/netbeans-6.9~30-build-xml.patch | 5 +-
debian/patches/netbeans-6.9~40-ide-launcher.patch | 5 +-
.../patches/netbeans-6.9~41-log4j-classpath.patch | 5 +-
debian/patches/netbeans-6.9~50-build-copy.patch | 125 ++++------
debian/patches/netbeans-6.9~60-nosvnkit.patch | 5 +-
.../netbeans-6.9~70-small-ide-cluster.patch | 32 +--
.../netbeans-6.9~71-cluster-properties.patch | 5 +-
debian/patches/netbeans-6.9~80-config.patch | 5 +-
.../patches/netbeans-6.9~90-junit-migration.patch | 30 +--
.../netbeans-6.9~autogenerated-changes.patch | 236 +++++++++++++++++
.../netbeans-6.9~ini4j-0.5.2-SNAPSHOT.patch | 81 ++++++
.../netbeans-6.9~original-svnclientadapter.patch | 116 ++++++++
debian/patches/netbeans-6.9~servlet-api-2.5.patch | 18 ++
debian/patches/series | 15 +
debian/rules | 277 ++++++++++----------
debian/source/format | 1 +
nbbuild/build.properties | 1 +
nbbuild/build.properties_orig | 218 ---------------
27 files changed, 742 insertions(+), 543 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7ad9394..1d5807e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,18 @@ netbeans (6.9-1) unstable; urgency=low
(Closes: #543907)
(Closes: #478762)
* Add Debian Java team as Maintainer, Yulia and myself as Uploaders.
-
- -- Andres Mejia <mcitadel at gmail.com> Fri, 07 Jan 2011 17:00:35 -0500
+ * Update packaging to use 3.0 (quilt) source format.
+ * Update packaging to use dh with javahelper.
+ * Bump to Standards-Version 3.9.1.
+ * Refresh all patches.
+ * Use Java SwingWorker included in standard JDK distribution.
+ * Migrate to junit4.
+ * Migrate to libservlet2.5-java.
+ * Migrate to use Better Swing Application Framework.
+ * Use standard svnclientadapter from subclipse.
+ * Migrate to ini4j-0.5.2-SNAPSHOT.
+
+ -- Andres Mejia <mcitadel at gmail.com> Sun, 23 Jan 2011 15:42:29 -0500
netbeans (6.9-0ubuntu2) maverick; urgency=low
diff --git a/debian/control b/debian/control
index 90a1979..7b05e90 100644
--- a/debian/control
+++ b/debian/control
@@ -1,28 +1,27 @@
Source: netbeans
-Section: contrib/devel
+Section: contrib/java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Yulia Novozhilova <Yulia.Novozhilova at sun.com>,
Andres Mejia <mcitadel at gmail.com>
-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,
- jruby (>=1.5.1), libswingx-java (>=0.9.5), libjzlib-java (>= 1.0.7), libservlet2.3-java, w3c-dtd-xhtml,
- libjvyamlb-java
-Standards-Version: 3.9.0
-Homepage: http://www.netbeans.org
+Build-Depends: debhelper (>= 7.0.50~), javahelper, ant (>= 1.7.0),
+ ant-optional (>= 1.7.0), default-jdk, javahelp2,
+ libswing-layout-java (>= 1.0.3), libnb-platform12-java (>= 6.9),
+ libnb-platform-devel-java (>= 6.9), libnb-javaparser-java (>= 6.9),
+ libsvnclientadapter-java, libfreemarker-java, libjsch-java (>= 0.1.42),
+ libxml-commons-resolver1.1-java (>= 1.2-3), libxerces2-java,
+ liblucene2-java (>= 2.4.1), libbetter-appframework-java, libbeansbinding-java,
+ junit4, libcommons-logging-java, libini4j-java (>=0.4.1), libsvn-java,
+ liboro-java, libcommons-net-java, jruby (>=1.5.1), libswingx-java (>=0.9.5),
+ libjzlib-java (>= 1.0.7), libservlet2.5-java, w3c-dtd-xhtml, libjvyamlb-java
+Standards-Version: 3.9.1
+Homepage: http://netbeans.org/
+Vcs-Browser: http://git.debian.org/?p=pkg-java/netbeans.git
+Vcs-Git: git://git.debian.org/git/pkg-java/netbeans.git
Package: netbeans
Architecture: all
-Section: contrib/devel
-Depends: ${misc:Depends}, libnb-platform12-java (>= 6.9),
+Depends: ${java:Depends}, ${misc:Depends}, libnb-platform12-java (>= 6.9),
libnb-ide13-java (= ${binary:Version}),
libnb-java4-java (= ${binary:Version}),
libnb-apisupport2-java (= ${binary:Version})
@@ -36,29 +35,30 @@ Description: Extensible Java IDE
Package: libnb-ide13-java
Architecture: all
-Section: contrib/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, jruby (>=1.5.1), libswingx-java (>=0.9.5),
- libjzlib-java (>= 1.0.7), libservlet2.3-java, liblog4j1.2-java
+Depends: ${java:Depends}, ${misc:Depends}, libnb-platform12-java (>= 6.9),
+ libfreemarker-java, libjsch-java (>=0.1.42),
+ libxml-commons-resolver1.1-java (>= 1.2-3), libsvnclientadapter-java,
+ libxerces2-java, libcommons-logging-java, libini4j-java (>=0.4.1),
+ liblucene2-java (>=2.3.2), libsvn-java, liboro-java, libcommons-net-java,
+ jruby (>=1.5.1), libswingx-java (>=0.9.5), libjzlib-java (>= 1.0.7),
+ libservlet2.5-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: contrib/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
+Depends: ${java:Depends}, ${misc:Depends}, default-jdk,
+ libnb-platform12-java (>= 6.9), libnb-ide13-java (= ${binary:Version}),
+ libnb-javaparser-java (>= 6.9), libbetter-appframework-java,
+ ant (>= 1.7.0), ant-optional (>= 1.7.0), libbeansbinding-java, junit4,
+ default-jdk-doc
Description: Common Java Related Libraries for NetBeans
Common libraries for the NetBeans Java IDE.
Package: libnb-apisupport2-java
Architecture: all
-Section: contrib/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})
+Depends: ${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.
diff --git a/debian/libnb-apisupport2-java.dirs b/debian/libnb-apisupport2-java.dirs
deleted file mode 100644
index 031af1b..0000000
--- a/debian/libnb-apisupport2-java.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/netbeans/apisupport2
diff --git a/debian/libnb-ide13-java.dirs b/debian/libnb-ide13-java.dirs
deleted file mode 100644
index 70d36b1..0000000
--- a/debian/libnb-ide13-java.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/netbeans/ide13
diff --git a/debian/libnb-java4-java.dirs b/debian/libnb-java4-java.dirs
deleted file mode 100644
index 8309dee..0000000
--- a/debian/libnb-java4-java.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/netbeans/java3
diff --git a/debian/netbeans.dirs b/debian/netbeans.dirs
deleted file mode 100644
index 6d5f480..0000000
--- a/debian/netbeans.dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-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
diff --git a/debian/netbeans.manpages b/debian/netbeans.manpages
new file mode 100644
index 0000000..31be3a6
--- /dev/null
+++ b/debian/netbeans.manpages
@@ -0,0 +1 @@
+debian/netbeans.1
diff --git a/debian/patches/netbeans-6.9~00-updatecenters.patch b/debian/patches/netbeans-6.9~00-updatecenters.patch
index 1e98447..f4edead 100644
--- a/debian/patches/netbeans-6.9~00-updatecenters.patch
+++ b/debian/patches/netbeans-6.9~00-updatecenters.patch
@@ -1,6 +1,5 @@
-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
+--- a/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
++++ b/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
@@ -53,9 +53,11 @@
Services/AutoupdateType/beta-update-provider.instance=NetBeans Beta
Services/AutoupdateType/thirdparty-update-provider.instance=3rd Party Plugins
@@ -13,9 +12,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/updatecenters/src/org/netbeans/module
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
+--- a/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
++++ b/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
@@ -55,7 +55,7 @@
<attr name="iconBase" stringvalue="org/netbeans/modules/updatecenters/resources/updateAction.gif"/>
<attr name="url" bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_Standard"/>
diff --git a/debian/patches/netbeans-6.9~10-o.apache.tools.ant.module.patch b/debian/patches/netbeans-6.9~10-o.apache.tools.ant.module.patch
index 1ef8cb7..82baabe 100644
--- a/debian/patches/netbeans-6.9~10-o.apache.tools.ant.module.patch
+++ b/debian/patches/netbeans-6.9~10-o.apache.tools.ant.module.patch
@@ -1,6 +1,5 @@
-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
+--- a/o.apache.tools.ant.module/build.xml
++++ b/o.apache.tools.ant.module/build.xml
@@ -78,6 +78,7 @@
</target>
@@ -17,9 +16,8 @@ diff -Nur netbeans-6.9/o.apache.tools.ant.module/build.xml netbeans-6.9.new/o.ap
</target>
<target name="test-build" depends="jar-bridge,projectized-common.test-build"/>
-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
+--- a/o.apache.tools.ant.module/external/build.xml
++++ b/o.apache.tools.ant.module/external/build.xml
@@ -45,7 +45,9 @@
-->
<project name="o.apache.tools.ant.module/external" default="unzip" basedir=".">
diff --git a/debian/patches/netbeans-6.9~30-build-xml.patch b/debian/patches/netbeans-6.9~30-build-xml.patch
index 7996727..b6f6ba1 100644
--- a/debian/patches/netbeans-6.9~30-build-xml.patch
+++ b/debian/patches/netbeans-6.9~30-build-xml.patch
@@ -1,6 +1,5 @@
-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
+--- a/nbbuild/build.xml
++++ b/nbbuild/build.xml
@@ -149,7 +149,6 @@
<target name="init-module-list" depends="bootstrap,init-tasks">
diff --git a/debian/patches/netbeans-6.9~40-ide-launcher.patch b/debian/patches/netbeans-6.9~40-ide-launcher.patch
index 9fccc93..6b4745e 100644
--- a/debian/patches/netbeans-6.9~40-ide-launcher.patch
+++ b/debian/patches/netbeans-6.9~40-ide-launcher.patch
@@ -1,6 +1,5 @@
-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
+--- a/ide/launcher/unix/netbeans
++++ b/ide/launcher/unix/netbeans
@@ -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.
diff --git a/debian/patches/netbeans-6.9~41-log4j-classpath.patch b/debian/patches/netbeans-6.9~41-log4j-classpath.patch
index 4941eb3..ac59cad 100644
--- a/debian/patches/netbeans-6.9~41-log4j-classpath.patch
+++ b/debian/patches/netbeans-6.9~41-log4j-classpath.patch
@@ -1,6 +1,5 @@
-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
+--- a/ide/launcher/unix/netbeans
++++ b/ide/launcher/unix/netbeans
@@ -211,6 +211,7 @@
--branding nb \
--clusters '"$netbeans_clusters"' \
diff --git a/debian/patches/netbeans-6.9~50-build-copy.patch b/debian/patches/netbeans-6.9~50-build-copy.patch
index 36d69e8..cf5225a 100644
--- a/debian/patches/netbeans-6.9~50-build-copy.patch
+++ b/debian/patches/netbeans-6.9~50-build-copy.patch
@@ -1,6 +1,5 @@
-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
+--- a/css.editor/nbproject/project.properties
++++ b/css.editor/nbproject/project.properties
@@ -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.
@@ -10,9 +9,8 @@ diff -Nur netbeans-6.9/css.editor/nbproject/project.properties netbeans-6.9.new/
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
+--- a/html.editor/nbproject/project.properties
++++ b/html.editor/nbproject/project.properties
@@ -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.
@@ -22,9 +20,8 @@ diff -Nur netbeans-6.9/html.editor/nbproject/project.properties netbeans-6.9.new
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
+--- a/junit/nbproject/project.properties
++++ b/junit/nbproject/project.properties
@@ -45,11 +45,11 @@
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
@@ -42,9 +39,8 @@ diff -Nur netbeans-6.9/junit/nbproject/project.properties netbeans-6.9.new/junit
# 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
+--- a/libs.bytelist/nbproject/project.properties
++++ b/libs.bytelist/nbproject/project.properties
@@ -41,5 +41,5 @@
# made subject to such option by the copyright holder.
@@ -52,9 +48,8 @@ diff -Nur netbeans-6.9/libs.bytelist/nbproject/project.properties netbeans-6.9.n
-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
+--- a/libs.commons_logging/nbproject/project.properties
++++ b/libs.commons_logging/nbproject/project.properties
@@ -41,5 +41,5 @@
# made subject to such option by the copyright holder.
@@ -62,9 +57,8 @@ diff -Nur netbeans-6.9/libs.commons_logging/nbproject/project.properties netbean
-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
+--- a/libs.commons_net/nbproject/project.properties
++++ b/libs.commons_net/nbproject/project.properties
@@ -41,5 +41,5 @@
# made subject to such option by the copyright holder.
@@ -72,9 +66,8 @@ diff -Nur netbeans-6.9/libs.commons_net/nbproject/project.properties netbeans-6.
-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
+--- a/libs.freemarker/nbproject/project.properties
++++ b/libs.freemarker/nbproject/project.properties
@@ -44,6 +44,6 @@
javac.compilerargs=-Xlint:unchecked
@@ -83,9 +76,8 @@ diff -Nur netbeans-6.9/libs.freemarker/nbproject/project.properties netbeans-6.9
+#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
+--- a/libs.ini4j/nbproject/project.properties
++++ b/libs.ini4j/nbproject/project.properties
@@ -41,7 +41,7 @@
# made subject to such option by the copyright holder.
@@ -95,9 +87,8 @@ diff -Nur netbeans-6.9/libs.ini4j/nbproject/project.properties netbeans-6.9.new/
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
+--- a/libs.jakarta_oro/nbproject/project.properties
++++ b/libs.jakarta_oro/nbproject/project.properties
@@ -41,5 +41,5 @@
# made subject to such option by the copyright holder.
@@ -105,9 +96,8 @@ diff -Nur netbeans-6.9/libs.jakarta_oro/nbproject/project.properties netbeans-6.
-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
+--- a/libs.javacapi/nbproject/project.properties
++++ b/libs.javacapi/nbproject/project.properties
@@ -47,6 +47,6 @@
nbm.homepage=http://jackpot.netbeans.org/
nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
@@ -116,9 +106,8 @@ diff -Nur netbeans-6.9/libs.javacapi/nbproject/project.properties netbeans-6.9.n
+#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
+--- a/libs.javacimpl/nbproject/project.properties
++++ b/libs.javacimpl/nbproject/project.properties
@@ -44,7 +44,7 @@
nbm.homepage=http://jackpot.netbeans.org/
nbm.module.author=Petr Hrebejk, Sun Microsystems, Inc.
@@ -128,18 +117,16 @@ diff -Nur netbeans-6.9/libs.javacimpl/nbproject/project.properties netbeans-6.9.
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
+--- a/libs.jna/nbproject/project.properties
++++ b/libs.jna/nbproject/project.properties
@@ -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
+--- a/libs.jsch/nbproject/project.properties
++++ b/libs.jsch/nbproject/project.properties
@@ -41,6 +41,6 @@
# made subject to such option by the copyright holder.
@@ -148,9 +135,8 @@ diff -Nur netbeans-6.9/libs.jsch/nbproject/project.properties netbeans-6.9.new/l
+#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
+--- a/libs.junit4/nbproject/project.properties
++++ b/libs.junit4/nbproject/project.properties
@@ -41,7 +41,7 @@
# made subject to such option by the copyright holder.
@@ -160,9 +146,8 @@ diff -Nur netbeans-6.9/libs.junit4/nbproject/project.properties netbeans-6.9.new
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
+--- a/libs.jvyamlb/nbproject/project.properties
++++ b/libs.jvyamlb/nbproject/project.properties
@@ -41,6 +41,6 @@
# made subject to such option by the copyright holder.
@@ -171,9 +156,8 @@ diff -Nur netbeans-6.9/libs.jvyamlb/nbproject/project.properties netbeans-6.9.ne
+#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
+--- a/libs.jzlib/nbproject/project.properties
++++ b/libs.jzlib/nbproject/project.properties
@@ -41,6 +41,6 @@
# made subject to such option by the copyright holder.
@@ -182,9 +166,8 @@ diff -Nur netbeans-6.9/libs.jzlib/nbproject/project.properties netbeans-6.9.new/
+#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
+--- a/libs.lucene/nbproject/project.properties
++++ b/libs.lucene/nbproject/project.properties
@@ -41,5 +41,5 @@
# made subject to such option by the copyright holder.
@@ -192,9 +175,8 @@ diff -Nur netbeans-6.9/libs.lucene/nbproject/project.properties netbeans-6.9.new
-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
+--- a/libs.svnClientAdapter/nbproject/project.properties
++++ b/libs.svnClientAdapter/nbproject/project.properties
@@ -43,8 +43,8 @@
is.autoload=true
@@ -206,9 +188,8 @@ diff -Nur netbeans-6.9/libs.svnClientAdapter/nbproject/project.properties netbea
# 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
+--- a/libs.swingx/nbproject/project.properties
++++ b/libs.swingx/nbproject/project.properties
@@ -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.
@@ -217,9 +198,8 @@ diff -Nur netbeans-6.9/libs.swingx/nbproject/project.properties netbeans-6.9.new
+#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
+--- a/libs.xerces/nbproject/project.properties
++++ b/libs.xerces/nbproject/project.properties
@@ -41,6 +41,6 @@
# made subject to such option by the copyright holder.
@@ -228,9 +208,8 @@ diff -Nur netbeans-6.9/libs.xerces/nbproject/project.properties netbeans-6.9.new
+#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
+--- a/o.apache.xml.resolver/nbproject/project.properties
++++ b/o.apache.xml.resolver/nbproject/project.properties
@@ -41,5 +41,5 @@
# made subject to such option by the copyright holder.
@@ -238,9 +217,8 @@ diff -Nur netbeans-6.9/o.apache.xml.resolver/nbproject/project.properties netbea
-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
+--- a/o.jdesktop.beansbinding/nbproject/project.properties
++++ b/o.jdesktop.beansbinding/nbproject/project.properties
@@ -41,7 +41,7 @@
# made subject to such option by the copyright holder.
@@ -251,9 +229,8 @@ diff -Nur netbeans-6.9/o.jdesktop.beansbinding/nbproject/project.properties netb
+#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
+--- a/o.jdesktop.layout/nbproject/project.properties
++++ b/o.jdesktop.layout/nbproject/project.properties
@@ -41,7 +41,7 @@
# made subject to such option by the copyright holder.
@@ -265,18 +242,16 @@ diff -Nur netbeans-6.9/o.jdesktop.layout/nbproject/project.properties netbeans-6
+#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
+--- a/servletapi/nbproject/project.properties
++++ b/servletapi/nbproject/project.properties
@@ -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
+--- a/swingapp/nbproject/project.properties
++++ b/swingapp/nbproject/project.properties
@@ -1,6 +1,6 @@
-extra.module.files=modules/ext/appframework-1.0.3.jar,\
- docs/appframework-1.0.3-doc.zip,\
diff --git a/debian/patches/netbeans-6.9~60-nosvnkit.patch b/debian/patches/netbeans-6.9~60-nosvnkit.patch
index 0fb275c..cf8d5e2 100644
--- a/debian/patches/netbeans-6.9~60-nosvnkit.patch
+++ b/debian/patches/netbeans-6.9~60-nosvnkit.patch
@@ -1,6 +1,5 @@
-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
+--- a/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java
++++ b/libs.svnClientAdapter/src/org/netbeans/libs/svnclientadapter/SvnClientAdapterFactory.java
@@ -48,7 +48,7 @@
import org.tigris.subversion.svnclientadapter.SVNClientException;
import org.tigris.subversion.svnclientadapter.javahl.JhlClientAdapter;
diff --git a/debian/patches/netbeans-6.9~70-small-ide-cluster.patch b/debian/patches/netbeans-6.9~70-small-ide-cluster.patch
index ce466d1..de27118 100644
--- a/debian/patches/netbeans-6.9~70-small-ide-cluster.patch
+++ b/debian/patches/netbeans-6.9~70-small-ide-cluster.patch
@@ -1,7 +1,6 @@
-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 @@
+--- a/apisupport.kit/nbproject/project.xml
++++ b/apisupport.kit/nbproject/project.xml
+@@ -12,41 +12,16 @@
</run-dependency>
</dependency>
<dependency>
@@ -34,20 +33,17 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/apisupport.kit/nbproject/project.xml
<run-dependency>
<specification-version>1.1</specification-version>
</run-dependency>
- </dependency>
- <dependency>
+- </dependency>
+- <dependency>
- <code-name-base>org.netbeans.modules.apisupport.paintapp</code-name-base>
- <run-dependency>
- <specification-version>1.1</specification-version>
- </run-dependency>
-- </dependency>
-- <dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.netbeans.modules.apisupport.project</code-name-base>
- <run-dependency>
- <release-version>1</release-version>
-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
+--- a/editor.kit/nbproject/project.xml
++++ b/editor.kit/nbproject/project.xml
@@ -6,13 +6,6 @@
<code-name-base>org.netbeans.modules.editor.kit</code-name-base>
<module-dependencies>
@@ -105,9 +101,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/editor.kit/nbproject/project.xml netb
</module-dependencies>
<public-packages/>
</data>
-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
+--- a/ide.kit/nbproject/project.xml
++++ b/ide.kit/nbproject/project.xml
@@ -129,6 +129,7 @@
<specification-version>1.11</specification-version>
</run-dependency>
@@ -139,9 +134,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/ide.kit/nbproject/project.xml netbean
</module-dependencies>
<test-dependencies>
<test-type>
-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
+--- a/java.kit/nbproject/project.xml
++++ b/java.kit/nbproject/project.xml
@@ -205,26 +205,6 @@
</run-dependency>
</dependency>
diff --git a/debian/patches/netbeans-6.9~71-cluster-properties.patch b/debian/patches/netbeans-6.9~71-cluster-properties.patch
index 1a1ace7..85ea9f4 100644
--- a/debian/patches/netbeans-6.9~71-cluster-properties.patch
+++ b/debian/patches/netbeans-6.9~71-cluster-properties.patch
@@ -1,6 +1,5 @@
-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
+--- a/nbbuild/cluster.properties
++++ b/nbbuild/cluster.properties
@@ -112,9 +112,7 @@
clusters.config.java.list=\
${clusters.config.platform.list},\
diff --git a/debian/patches/netbeans-6.9~80-config.patch b/debian/patches/netbeans-6.9~80-config.patch
index 174d780..d7c32d7 100644
--- a/debian/patches/netbeans-6.9~80-config.patch
+++ b/debian/patches/netbeans-6.9~80-config.patch
@@ -1,6 +1,5 @@
-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
+--- a/ide/launcher/netbeans.conf
++++ b/ide/launcher/netbeans.conf
@@ -3,7 +3,7 @@
# Options used by NetBeans launcher by default, can be overridden by explicit
diff --git a/debian/patches/netbeans-6.9~90-junit-migration.patch b/debian/patches/netbeans-6.9~90-junit-migration.patch
index 805f43d..c046af6 100644
--- a/debian/patches/netbeans-6.9~90-junit-migration.patch
+++ b/debian/patches/netbeans-6.9~90-junit-migration.patch
@@ -1,6 +1,5 @@
-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
+--- a/junit/src/org/netbeans/modules/junit/Bundle.properties
++++ b/junit/src/org/netbeans/modules/junit/Bundle.properties
@@ -399,7 +399,7 @@
#names of the JUnit libraries
@@ -10,9 +9,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/
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
+--- a/junit/src/org/netbeans/modules/junit/resources/junit_4_5_lib.xml
++++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
@@ -82,9 +80,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/
- <resource>http://repo1.maven.org/maven2/junit/junit/4.4/junit-4.4.pom</resource>
- </volume>
-</library>
-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
+--- /dev/null
++++ b/junit/src/org/netbeans/modules/junit/resources/junit_4_8_lib.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
@@ -152,9 +149,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/
+ <resource>http://repo1.maven.org/maven2/junit/junit/4.4/junit-4.4.pom</resource>
+ </volume>
+</library>
-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
+--- a/junit/src/org/netbeans/modules/junit/resources/layer.xml
++++ b/junit/src/org/netbeans/modules/junit/resources/layer.xml
@@ -50,7 +50,7 @@
<file name="junit-3.8.2.xml" url="junit_3_8_2_lib.xml">
<attr name="displayName" bundlevalue="org.netbeans.modules.junit.Bundle#junit"/>
@@ -164,9 +160,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/junit/src/org/netbeans/modules/junit/
<attr name="displayName" bundlevalue="org.netbeans.modules.junit.Bundle#junit_4"/>
</file>
</folder>
-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
+--- a/libs.junit4/nbproject/project.xml
++++ b/libs.junit4/nbproject/project.xml
@@ -63,8 +63,12 @@
<package>org.junit.runners</package>
</public-packages>
@@ -182,9 +177,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/libs.junit4/nbproject/project.xml net
</class-path-extension>
</data>
</configuration>
-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
+--- a/nbbuild/build.properties
++++ b/nbbuild/build.properties
@@ -79,7 +79,7 @@
stop.when.clean.error=true
diff --git a/debian/patches/netbeans-6.9~autogenerated-changes.patch b/debian/patches/netbeans-6.9~autogenerated-changes.patch
new file mode 100644
index 0000000..caeb107
--- /dev/null
+++ b/debian/patches/netbeans-6.9~autogenerated-changes.patch
@@ -0,0 +1,236 @@
+Description: Changes made by netbeans build system. These are not meant to be
+ forwared to upstream.
+Forwarded: not-needed
+Last-Update: 2011-01-23
+
+--- a/nbbuild/build.properties
++++ b/nbbuild/build.properties
+@@ -150,7 +150,6 @@
+ lexer,\
+ api.xml,\
+ o.apache.tools.ant.module,\
+- db,\
+ spi.quicksearch,\
+ print,\
+ extexecution
+--- /dev/null
++++ b/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. <nbmerge> 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}
diff --git a/debian/patches/netbeans-6.9~ini4j-0.5.2-SNAPSHOT.patch b/debian/patches/netbeans-6.9~ini4j-0.5.2-SNAPSHOT.patch
new file mode 100644
index 0000000..0745494
--- /dev/null
+++ b/debian/patches/netbeans-6.9~ini4j-0.5.2-SNAPSHOT.patch
@@ -0,0 +1,81 @@
+Description: Changes to get netbeans working with ini4j-0.5.2-SNAPSHOT. Patch
+ is based off of upstream hg commit.
+Author: Andres Mejia <mcitadel at gmail.com>
+Origin: upstream, http://hg.netbeans.org/main-silver?cmd=changeset;node=b52ba606f1ce
+Forwarded: not-needed
+Last-Update: 2011-01-23
+
+--- a/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/HudsonMercurialSCM.java
++++ b/hudson.mercurial/src/org/netbeans/modules/hudson/mercurial/HudsonMercurialSCM.java
+@@ -55,7 +55,7 @@
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+ import org.ini4j.Ini;
+-import org.ini4j.InvalidIniFormatException;
++import org.ini4j.InvalidFileFormatException;
+ import org.netbeans.modules.hudson.api.ConnectionBuilder;
+ import org.netbeans.modules.hudson.api.HudsonJob;
+ import org.netbeans.modules.hudson.spi.HudsonJobChangeItem;
+@@ -212,7 +212,7 @@
+ } finally {
+ is.close();
+ }
+- } catch (InvalidIniFormatException x) {
++ } catch (InvalidFileFormatException x) {
+ LOG.log(Level.FINE, "{0} was malformed, perhaps no workspace: {1}", new Object[] {hgrc, x});
+ return null;
+ } catch (FileNotFoundException x) {
+--- a/libs.ini4j/nbproject/project.xml
++++ b/libs.ini4j/nbproject/project.xml
+@@ -63,10 +63,11 @@
+ <friend>org.netbeans.modules.mercurial</friend>
+ <friend>org.netbeans.modules.subversion</friend>
+ <package>org.ini4j</package>
++ <package>org.ini4j.spi</package>
+ </friend-packages>
+ <class-path-extension>
+- <runtime-relative-path>ext/ini4j-0.4.1.jar</runtime-relative-path>
+- <binary-origin>external/ini4j-0.4.1.jar</binary-origin>
++ <runtime-relative-path>ext/ini4j-0.5.2-SNAPSHOT.jar</runtime-relative-path>
++ <binary-origin>external/ini4j-0.5.2-SNAPSHOT.jar</binary-origin>
+ </class-path-extension>
+ </data>
+ </configuration>
+--- a/mercurial/src/org/netbeans/modules/mercurial/config/HgConfigFiles.java
++++ b/mercurial/src/org/netbeans/modules/mercurial/config/HgConfigFiles.java
+@@ -56,7 +56,8 @@
+ import java.util.logging.Level;
+ import org.ini4j.Config;
+ import org.ini4j.Ini;
+-import org.ini4j.InvalidIniFormatException;
++import org.ini4j.InvalidFileFormatException;
++import org.ini4j.Profile.Section;
+ import org.netbeans.modules.mercurial.HgModuleConfig;
+ import org.netbeans.modules.mercurial.Mercurial;
+ import org.netbeans.modules.mercurial.util.HgRepositoryContextCache;
+@@ -96,7 +97,7 @@
+ private static final String WINDOWS_HG_RC_FILE = "Mercurial.ini"; // NOI18N
+ private static final String WINDOWS_DEFAULT_MECURIAL_INI_PATH = "C:\\Mercurial\\Mercurial.ini"; // NOI18N
+ private boolean bIsProjectConfig;
+- private InvalidIniFormatException initException;
++ private IOException initException;
+ /**
+ * fileName of the configuration file
+ */
+@@ -345,14 +346,14 @@
+ }
+ } catch (FileNotFoundException ex) {
+ // ignore
+- } catch (InvalidIniFormatException ex) {
++ } catch (InvalidFileFormatException ex) {
+ Mercurial.LOG.log(Level.INFO, "Cannot parse configuration file", ex); // NOI18N
+ initException = ex;
+ } catch (IOException ex) {
+ Mercurial.LOG.log(Level.INFO, null, ex);
+ } catch (Exception ex) {
+ Mercurial.LOG.log(Level.INFO, "Cannot parse configuration file", ex); // NOI18N
+- initException = new InvalidIniFormatException(ex);
++ initException = new IOException(ex);
+ } finally {
+ Thread.currentThread().setContextClassLoader(cl);
+ }
diff --git a/debian/patches/netbeans-6.9~original-svnclientadapter.patch b/debian/patches/netbeans-6.9~original-svnclientadapter.patch
new file mode 100644
index 0000000..98ee13e
--- /dev/null
+++ b/debian/patches/netbeans-6.9~original-svnclientadapter.patch
@@ -0,0 +1,116 @@
+Description: Patch to get netbeans building with original svnclientadapter which
+ is a part of subclipse project.
+Author: Andres Mejia <mcitadel at gmail.com>
+Forwarded: no
+Last-Update: 2011-01-23
+
+--- a/subversion/src/org/netbeans/modules/subversion/client/cli/CommandlineClient.java
++++ b/subversion/src/org/netbeans/modules/subversion/client/cli/CommandlineClient.java
+@@ -91,6 +91,7 @@
+ import org.tigris.subversion.svnclientadapter.ISVNClientAdapter;
+ import org.tigris.subversion.svnclientadapter.ISVNConflictResolver;
+ import org.tigris.subversion.svnclientadapter.ISVNDirEntry;
++import org.tigris.subversion.svnclientadapter.ISVNDirEntryWithLock;
+ import org.tigris.subversion.svnclientadapter.ISVNInfo;
+ import org.tigris.subversion.svnclientadapter.ISVNLogMessage;
+ import org.tigris.subversion.svnclientadapter.ISVNLogMessageCallback;
+@@ -105,6 +106,7 @@
+ import org.tigris.subversion.svnclientadapter.SVNKeywords;
+ import org.tigris.subversion.svnclientadapter.SVNNotificationHandler;
+ import org.tigris.subversion.svnclientadapter.SVNRevision;
++import org.tigris.subversion.svnclientadapter.SVNRevision.Kind;
+ import org.tigris.subversion.svnclientadapter.SVNRevision.Number;
+ import org.tigris.subversion.svnclientadapter.SVNRevisionRange;
+ import org.tigris.subversion.svnclientadapter.SVNScheduleKind;
+@@ -636,6 +638,10 @@
+ super.setIgnoredPatterns(file, l);
+ }
+
++ public String getRevProperty(SVNUrl path, SVNRevision.Number revisionNo, String propName) throws SVNClientException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
+ public ISVNAnnotations annotate(SVNUrl url, SVNRevision revStart, SVNRevision revEnd) throws SVNClientException {
+ return annotate(new BlameCommand(url, revStart, revEnd), new CatCommand(url, revEnd, null));
+ }
+@@ -692,6 +698,17 @@
+ return props.toArray(new ISVNProperty[props.size()]);
+ }
+
++ public ISVNProperty[] getProperties(SVNUrl url, SVNRevision revision, SVNRevision peg) throws SVNClientException {
++ ListPropertiesCommand cmd = new ListPropertiesCommand(url, false);
++ exec(cmd);
++ List<String> names = cmd.getPropertyNames();
++ List<ISVNProperty> props = new ArrayList<ISVNProperty>(names.size());
++ for (String name : names) {
++ props.add(propertyGet(url, revision, peg, name));
++ }
++ return props.toArray(new ISVNProperty[props.size()]);
++ }
++
+ public ISVNProperty[] getProperties(SVNUrl url) throws SVNClientException {
+ ListPropertiesCommand cmd = new ListPropertiesCommand(url, false);
+ exec(cmd);
+@@ -703,6 +720,10 @@
+ return props.toArray(new ISVNProperty[props.size()]);
+ }
+
++ public ISVNProperty[] getRevProperties(SVNUrl url, SVNRevision.Number revision) throws SVNClientException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
+ public void resolved(File file) throws SVNClientException {
+ ResolvedCommand cmd = new ResolvedCommand(file, false);
+ exec(cmd);
+@@ -1000,6 +1021,10 @@
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
++ public ISVNDirEntryWithLock[] getListWithLocks(SVNUrl arg0, SVNRevision arg1, SVNRevision arg2, boolean arg3) throws SVNClientException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
+ /**
+ * Copies all files from <code>files</code> to repository URL at <code>targetUrl</code>.
+ * @param files array of files which will be copied
+@@ -1029,6 +1054,10 @@
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
++ public void copy(SVNUrl arg0, File arg1, SVNRevision arg2, SVNRevision arg3, boolean arg4, boolean arg5) throws SVNClientException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
+ public long update(File arg0, SVNRevision arg1, int arg2, boolean arg3, boolean arg4, boolean arg5) throws SVNClientException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+@@ -1063,10 +1092,18 @@
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
++ public ISVNAnnotations annotate(SVNUrl arg0, SVNRevision arg1, SVNRevision arg2, SVNRevision arg3, boolean arg4, boolean arg5) throws SVNClientException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
+ public ISVNAnnotations annotate(File arg0, SVNRevision arg1, SVNRevision arg2, boolean arg3, boolean arg4) throws SVNClientException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
++ public ISVNAnnotations annotate(File arg0, SVNRevision arg1, SVNRevision arg2, SVNRevision arg3, boolean arg4, boolean arg5) throws SVNClientException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
+ public void resolve(File arg0, int arg1) throws SVNClientException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+@@ -1115,6 +1152,10 @@
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
++ public SVNDiffSummary[] diffSummarize(File arg0, SVNUrl arg1, SVNRevision arg2, boolean arg3) throws SVNClientException {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
++
+ public String[] suggestMergeSources(File arg0) throws SVNClientException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
diff --git a/debian/patches/netbeans-6.9~servlet-api-2.5.patch b/debian/patches/netbeans-6.9~servlet-api-2.5.patch
new file mode 100644
index 0000000..326eb9a
--- /dev/null
+++ b/debian/patches/netbeans-6.9~servlet-api-2.5.patch
@@ -0,0 +1,18 @@
+Description: Simple patch to build netbeans with servlet-api-2.5.jar.
+Author: Andres Mejia <mcitadel at gmail.com>
+Forwarded: no
+Last-Update: 2011-01-23
+
+--- a/servletapi/nbproject/project.xml
++++ b/servletapi/nbproject/project.xml
+@@ -54,8 +54,8 @@
+ <subpackages>javax.servlet</subpackages>
+ </public-packages>
+ <class-path-extension>
+- <runtime-relative-path>ext/servlet-2.2.jar</runtime-relative-path>
+- <binary-origin>external/servlet-2.2.jar</binary-origin>
++ <runtime-relative-path>ext/servlet-api-2.5.jar</runtime-relative-path>
++ <binary-origin>external/servlet-api-2.5.jar</binary-origin>
+ </class-path-extension>
+ </data>
+ </configuration>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5c4e325
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,15 @@
+netbeans-6.9~00-updatecenters.patch
+netbeans-6.9~10-o.apache.tools.ant.module.patch
+netbeans-6.9~30-build-xml.patch
+netbeans-6.9~40-ide-launcher.patch
+netbeans-6.9~41-log4j-classpath.patch
+netbeans-6.9~50-build-copy.patch
+netbeans-6.9~60-nosvnkit.patch
+netbeans-6.9~70-small-ide-cluster.patch
+netbeans-6.9~71-cluster-properties.patch
+netbeans-6.9~80-config.patch
+netbeans-6.9~90-junit-migration.patch
+netbeans-6.9~ini4j-0.5.2-SNAPSHOT.patch
+netbeans-6.9~original-svnclientadapter.patch
+netbeans-6.9~servlet-api-2.5.patch
+netbeans-6.9~autogenerated-changes.patch
diff --git a/debian/rules b/debian/rules
index 24f2518..5808be2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,7 @@
#!/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
@@ -37,7 +32,6 @@ 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
@@ -45,7 +39,9 @@ LINK := dh_link -p
NB_PLATFORM_BUILD_DIR := $(shell pwd)/nbbuild/netbeans/platform
-DEB_INSTALL_MANPAGES_$(pkg-nb) = $(DEB_SRCDIR)/debian/netbeans.1
+DEB_UPSTREAM_VERSION = $(shell dpkg-parsechangelog | \
+ grep -e '^Version' | \
+ perl -pi -e 's/^Version:\s+(.*)-\d+$$/$$1/')
# Defined function to be used to create symlinks
define symlink
@@ -53,56 +49,56 @@ define symlink
ln -sf $(1) $(2)
endef
-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
- mkdir -p $(DEB_SRCDIR)/nbbuild/external/xhtml1-dtds
- ln -sf /usr/share/xml/xhtml/schema/dtd/1.0/xhtml* $(DEB_SRCDIR)/nbbuild/external/xhtml1-dtds/
- ln -sf /usr/share/xml/entities/xhtml/xhtml* $(DEB_SRCDIR)/nbbuild/external/xhtml1-dtds
- $(call symlink, $(JAVADIR)/$(JSEARCH_JAR), $(DEB_SRCDIR)/apisupport.harness/external/$(NB_JSEARCH_JAR))
- $(call symlink, $(JAVADIR)/$(JH_JAR), $(DEB_SRCDIR)/javahelp/external/$(NB_JH_JAR))
- $(call symlink, $(JAVADIR)/$(SWINGL_JAR), $(DEB_SRCDIR)/o.jdesktop.layout/external/$(NB_SWINGL_JAR))
- $(call symlink, $(JAVADIR)/$(JAVAC_API_JAR), $(DEB_SRCDIR)/libs.javacapi/external/$(NB_JAVAC_API_JAR))
- $(call symlink, $(JAVADIR)/$(JAVAC_IMPL_JAR), $(DEB_SRCDIR)/libs.javacimpl/external/$(NB_JAVAC_IMPL_JAR))
-
- $(call symlink, /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)/jvyamlb.jar $(DEB_SRCDIR)/nbbuild/netbeans/ide/modules/ext/jvyamlb-0.2.3.jar
- ln -sf $(JAVADIR)/jruby.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/
+%:
+ dh $@ --with javahelper
+
+override_dh_auto_build:
+ mkdir -p nbbuild/netbeans
+ ln -sf $(NBDIR)/$(base-platform) nbbuild/netbeans/platform
+ ln -sf $(NBDIR)/harness nbbuild/netbeans/harness
+ mkdir -p nbbuild/external/xhtml1-dtds
+ ln -sf /usr/share/xml/xhtml/schema/dtd/1.0/xhtml* nbbuild/external/xhtml1-dtds/
+ ln -sf /usr/share/xml/entities/xhtml/xhtml* nbbuild/external/xhtml1-dtds
+ $(call symlink, $(JAVADIR)/$(JSEARCH_JAR), apisupport.harness/external/$(NB_JSEARCH_JAR))
+ $(call symlink, $(JAVADIR)/$(JH_JAR), javahelp/external/$(NB_JH_JAR))
+ $(call symlink, $(JAVADIR)/$(SWINGL_JAR), o.jdesktop.layout/external/$(NB_SWINGL_JAR))
+ $(call symlink, $(JAVADIR)/$(JAVAC_API_JAR), libs.javacapi/external/$(NB_JAVAC_API_JAR))
+ $(call symlink, $(JAVADIR)/$(JAVAC_IMPL_JAR), libs.javacimpl/external/$(NB_JAVAC_IMPL_JAR))
+
+ $(call symlink, /usr/share/ant/lib, o.apache.tools.ant.module/external/lib)
+
+ mkdir -p nbbuild/netbeans/ide/modules/ext
+ ln -sf $(JAVADIR)/jsch.jar nbbuild/netbeans/ide/modules/ext/jsch-0.1.41.jar
+ ln -sf $(JAVADIR)/xml-commons-resolver-1.1.jar nbbuild/netbeans/ide/modules/ext/resolver-1.2.jar
+ ln -sf $(JAVADIR)/ini4j.jar nbbuild/netbeans/ide/modules/ext/ini4j-0.5.2-SNAPSHOT.jar
+ ln -sf $(JAVADIR)/freemarker.jar nbbuild/netbeans/ide/modules/ext/freemarker-2.3.8.jar
+ ln -sf $(JAVADIR)/svnClientAdapter.jar nbbuild/netbeans/ide/modules/ext/svnClientAdapter-1.6.0.jar
+ ln -sf $(JAVADIR)/xercesImpl.jar nbbuild/netbeans/ide/modules/ext/xerces-2.8.0.jar
+ ln -sf $(JAVADIR)/lucene-core.jar nbbuild/netbeans/ide/modules/ext/lucene-core-2.4.1.jar
+ ln -sf $(JAVADIR)/commons-logging.jar nbbuild/netbeans/ide/modules/ext/commons-logging-1.1.jar
+ ln -sf $(JAVADIR)/svn-javahl.jar nbbuild/netbeans/ide/modules/ext/svnjavahl-1.6.0.jar
+ ln -sf $(JAVADIR)/commons-net.jar nbbuild/netbeans/ide/modules/ext/commons-net-1.4.1.jar
+ ln -sf $(JAVADIR)/oro.jar nbbuild/netbeans/ide/modules/ext/jakarta-oro-2.0.8.jar
+ ln -sf $(JAVADIR)/jvyamlb.jar nbbuild/netbeans/ide/modules/ext/jvyamlb-0.2.3.jar
+ ln -sf $(JAVADIR)/jruby.jar nbbuild/netbeans/ide/modules/ext/bytelist-0.1.jar
+ ln -sf $(JAVADIR)/swingx.jar nbbuild/netbeans/ide/modules/ext/swingx-0.9.5.jar
+ ln -sf $(JAVADIR)/jzlib.jar nbbuild/netbeans/ide/modules/ext/jzlib-1.0.7.jar
+ ln -sf $(JAVADIR)/servlet-api-2.5.jar nbbuild/netbeans/ide/modules/ext/servlet-api-2.5.jar
+
+ mkdir -p nbbuild/netbeans/java/modules/ext
+ ln -sf $(JAVADIR)/javac-api.jar nbbuild/netbeans/java/modules/ext/javac-api-nb-7.0-b07.jar
+ ln -sf $(JAVADIR)/javac-impl.jar nbbuild/netbeans/java/modules/ext/javac-impl-nb-7.0-b07.jar
+ ln -sf $(JAVA_HOME)/jre/lib/rt.jar nbbuild/netbeans/java/modules/ext/swing-worker-1.1.jar
+ ln -sf $(JAVADIR)/bsaf.jar nbbuild/netbeans/java/modules/ext/appframework-1.0.3.jar
+ ln -sf $(JAVADIR)/beansbinding.jar nbbuild/netbeans/java/modules/ext/beansbinding-1.2.1.jar
+ ln -sf $(JAVADIR)/junit4.jar nbbuild/netbeans/java/modules/ext/junit-3.8.2.jar
+
+ cp LICENSE.txt ide.branding/release-toplevel/
# Ensure certain directories exist in source tree
- mkdir -p $(DEB_SRCDIR)/o.jdesktop.beansbinding/external
- mkdir -p $(DEB_SRCDIR)/swingapp/external
-
+ mkdir -p o.jdesktop.beansbinding/external
+ mkdir -p swingapp/external
+
ant \
-Dpermit.jdk6.builds=true \
-Dbuild.compiler.deprecation=false \
@@ -119,110 +115,107 @@ stamp-build-$(pkg-nb):
-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
+ -d \
+ -f nbbuild/build.xml build-nozip
+
+ cd l10n && ant -v -f build.xml -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" build
+
+override_dh_auto_install:
+ # Install IDE package files
+ echo > nbbuild/netbeans/ide/.noautoupdate
+ echo > 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
+ rm -rf nbbuild/netbeans/$(base-ide)/modules/lib
+ $(INSTALL)$(pkg-ide) nbbuild/netbeans/ide/* $(NB_INSTALL_DIR)/$(base-ide)
+ $(INSTALL)$(pkg-ide) nbbuild/netbeans/ide/.noautoupdate $(NB_INSTALL_DIR)/$(base-ide)
+ $(INSTALL)$(pkg-ide) nbbuild/netbeans/ide/.lastModified $(NB_INSTALL_DIR)/$(base-ide)
+
+ # Install Java package files
+ echo > nbbuild/netbeans/java/.noautoupdate
+ echo > 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)
+ rm -rf nbbuild/netbeans/java/docs
+ $(INSTALL)$(pkg-java) nbbuild/netbeans/java/* $(NB_INSTALL_DIR)/$(base-java)
+ $(INSTALL)$(pkg-java) nbbuild/netbeans/java/.noautoupdate $(NB_INSTALL_DIR)/$(base-java)
+ $(INSTALL)$(pkg-java) 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)
+
+ # Install API support package files
+ echo > nbbuild/netbeans/apisupport/.noautoupdate
+ echo > nbbuild/netbeans/apisupport/.lastModified
+ $(INSTALL)$(pkg-apisupport) nbbuild/netbeans/apisupport/* $(NB_INSTALL_DIR)/$(base-apisupport)
+ $(INSTALL)$(pkg-apisupport) nbbuild/netbeans/apisupport/.noautoupdate $(NB_INSTALL_DIR)/$(base-apisupport)
+ $(INSTALL)$(pkg-apisupport) nbbuild/netbeans/apisupport/.lastModified $(NB_INSTALL_DIR)/$(base-apisupport)
+
+ # Install Netbeans package files
+ echo > nbbuild/netbeans/nb/.noautoupdate
+ $(INSTALL)$(pkg-nb) nbbuild/netbeans/nb/* $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/nb
+ $(INSTALL)$(pkg-nb) nbbuild/netbeans/nb/.lastModified $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/nb
+ $(INSTALL)$(pkg-nb) nbbuild/netbeans/nb/.noautoupdate $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/nb
+ $(INSTALL)$(pkg-nb) nbbuild/netbeans/bin/* $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/bin
+ $(INSTALL)$(pkg-nb) nbbuild/netbeans/CREDITS.html usr/share/$(pkg-nb)
+ $(INSTALL)$(pkg-nb) nbbuild/netbeans/README.html usr/share/$(pkg-nb)
+ $(INSTALL)$(pkg-nb) 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
-
+ echo > debian/license_accepted
+ $(INSTALL)$(pkg-nb) 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)$(pkg-nb) debian/productid $(NB_INSTALL_DIR)/$(DEB_UPSTREAM_VERSION)/nb/config
+
# Install netbeans.conf
- $(INSTALL)$(pkg-nb) $(DEB_SRCDIR)/nbbuild/netbeans/etc/netbeans.conf etc
+ $(INSTALL)$(pkg-nb) 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
+ $(INSTALL)$(pkg-nb) 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
-
+ #cp nbbuild/netbeans/etc/netbeans.conf nbbuild/netbeans/etc/netbeans.conf.orig
+ #$(INSTALL)$(pkg-nb) 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)$(pkg-nb) 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
- $(call symlink, $(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
+ $(INSTALL)$(pkg-nb) debian/netbeans.desktop usr/share/applications
+
+override_dh_auto_clean:
+ -rm -f stamp-build-$(pkg-nb)
+ -rm -f nbbuild/netbeans/platform
+ -rm -f nbbuild/netbeans/harness
+ -rm -f o.apache.tools.ant.module/external/lib
+ $(call symlink, $(JAVADIR)/$(JHALL_JAR), javahelp/external/$(NB_JH_JAR))
+ ant -Dpermit.jdk6.builds=true -f nbbuild/build.xml clean
+ -rm -f apisupport.harness/external/$(NB_JSEARCH_JAR)
+ -rm -f javahelp/external/$(NB_JH_JAR)
+ -rm -f o.jdesktop.layout/external/$(NB_SWINGL_JAR)
+ -rm -f libs.javacapi/external/$(NB_JAVAC_API_JAR)
+ -rm -f libs.javacimpl/external/$(NB_JAVAC_IMPL_JAR)
+ -rm -f 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
- -rm -rf $(DEB_SRCDIR)/o.jdesktop.beansbinding/external
- -rm -rf $(DEB_SRCDIR)/swingapp/external
-
-get-orig-source:
- uscan --verbose --rename --force-download
+ -rm -f schema2beans/anttask/s2banttask.jar
+ -rm -f swingapp/src/org/netbeans/modules/swingapp/resources/CRUDShellApp.zip
+ -rm -f swingapp/src/org/netbeans/modules/swingapp/resources/BasicShellApp.zip
+ -rm -f nbbuild/nbproject/private/scan-cache-standard.ser
+ -rm -f nbbuild/nbproject/private/scan-cache-full.ser
+ -rm -f gsf.api/anttask/gsfanttask.jar
+ -rm -f ide.branding/release-toplevel/LICENSE.txt
+ -rm -f nbbuild/external/xhtml1-dtds/*
+ -rm -rf l10n/build
+ -rm -f l10n/l10nantext.jar
+ -rm -f nbbuild/nbantext.jar
+ -rm -rf o.jdesktop.beansbinding/external
+ -rm -rf swingapp/external
+
+override_jh_depends:
+ # Skipping jh_depends run. See bug #610817.
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/nbbuild/build.properties b/nbbuild/build.properties
index 1dadd5f..446c2ef 100644
--- a/nbbuild/build.properties
+++ b/nbbuild/build.properties
@@ -150,6 +150,7 @@ config.javadoc.stable=\
lexer,\
api.xml,\
o.apache.tools.ant.module,\
+ db,\
spi.quicksearch,\
print,\
extexecution
diff --git a/nbbuild/build.properties_orig b/nbbuild/build.properties_orig
deleted file mode 100644
index c194f38..0000000
--- a/nbbuild/build.properties_orig
+++ /dev/null
@@ -1,218 +0,0 @@
-# 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. <nbmerge> 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}
hooks/post-receive
--
netbeans packaging
More information about the pkg-java-commits
mailing list