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 0a53bbbac5fc7db13822e2edecf3ceff2f22b6d1 (commit)
from 2205f8858eb60ca622817dcc98d165d6658070a2 (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 0a53bbbac5fc7db13822e2edecf3ceff2f22b6d1
Author: Andrew Ross <ubu...@rossfamily.co.uk>
Date: Sat Sep 10 12:24:37 2011 +0100
Use swingx1 and build the db modules.
-----------------------------------------------------------------------
Summary of changes:
debian/control | 12 +++--
debian/linked-jars | 4 +-
debian/patches/netbeans~cluster-properties.patch | 60 ++++++---------------
debian/patches/netbeans~db.patch | 42 +++++++++++++++
debian/patches/series | 1 +
5 files changed, 70 insertions(+), 49 deletions(-)
diff --git a/debian/control b/debian/control
index 24cbca2..2316a5c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Yulia Novozhilova <yulia.novozhil...@sun.com>,
Andres Mejia <mcita...@gmail.com>, Andrew Ross <ubu...@rossfamily.co.uk>
Build-Depends: debhelper (>= 7.0.50~), javahelper, ant (>= 1.7.0),
ant-optional (>= 1.7.0), default-jdk, mingw32, maven-repo-helper,
- w3c-dtd-xhtml,
+ w3c-dtd-xhtml, javacc,
libjemmy2-java, javahelp2, libbindex-java,
libswing-layout-java (>= 1.0.3), libjna-java (>= 3.2.7-2~),
libfelix-framework-java, libfelix-main-java, libequinox-osgi-java,
@@ -17,8 +17,9 @@ Build-Depends: debhelper (>= 7.0.50~), javahelper, ant (>=
1.7.0),
libjvyamlb-java (>= 0.2.5-2~), libjzlib-java (>= 1.0.7),
liblucene2-java (>= 2.4.1), libxml-commons-resolver1.1-java (>= 1.2-3),
libsac-java, libservlet2.5-java, libsvnclientadapter-java, libsvn-java,
- libsvnkit-java, libswingx-java (>=0.9.5), libtrilead-ssh2-java,
- libsimple-validation-java, libxerces2-java,
+ libsvnkit-java, libswingx1-java, libtrilead-ssh2-java,
+ libsimple-validation-java, libxerces2-java, libpg-java,
+ libmysql-java,
libbetter-appframework-java, libbeansbinding-java, libcglib-java,
libnb-javaparser-java (>= 7.0.1~)
Standards-Version: 3.9.2
@@ -123,8 +124,9 @@ Depends: ${java:Depends}, ${misc:Depends},
libnb-platform13-java (>= 7.0),
libjzlib-java (>= 1.0.7), liblucene2-java (>= 2.4.1),
libxml-commons-resolver1.1-java (>= 1.2-3), libsac-java,
libservlet2.5-java, libsvnclientadapter-java, libsvn-java,
- libsvnkit-java, libswingx-java (>=0.9.5), libtrilead-ssh2-java,
- libsimple-validation-java, libxerces2-java
+ libsvnkit-java, libswingx1-java, libtrilead-ssh2-java,
+ libsimple-validation-java, libxerces2-java, libpg-java,
+ libmysql-java
Description: Common Integrated Development Environment Libraries for NetBeans
The NetBeans Platform is a set of modules, each providing their own
APIs and working together or in a standalone mode. This package contains
diff --git a/debian/linked-jars b/debian/linked-jars
index e9ed3b4..ab02977 100644
--- a/debian/linked-jars
+++ b/debian/linked-jars
@@ -34,10 +34,12 @@ $JAVADIR/svnClientAdapter.jar
libs.svnClientAdapter/external ide/modules/ext svn
$JAVADIR/svn-javahl.jar libs.svnClientAdapter.javahl/external ide/modules/ext
svnjavahl-1.6.0.jar
$JAVADIR/svnkit.jar libs.svnClientAdapter.svnkit/external ide/modules/ext
svnkit-1.3.4.jar
$JAVADIR/svnkit-javahl.jar libs.svnClientAdapter.svnkit/external
ide/modules/ext svnkit-javahl.jar
-$JAVADIR/swingx.jar libs.swingx/external ide/modules/ext swingx-0.9.5.jar
+$JAVADIR/swingx1.jar libs.swingx/external ide/modules/ext swingx-0.9.5.jar
$JAVADIR/trilead-ssh2.jar libs.svnClientAdapter.svnkit/external
ide/modules/ext trilead.jar
$JAVADIR/simple-validation.jar swing.validation/external ide/modules/ext
ValidationAPI.jar
$JAVADIR/xercesImpl.jar libs.xerces/external ide/modules/ext xerces-2.8.0.jar
+$JAVADIR/postgresql-jdbc3.jar db.drivers/external ide/modules/ext
postgresql-8.3-603.jdbc3.jar
+$JAVADIR/mysql-connector-java.jar db.drivers/external ide/modules/ext
mysql-connector-java-5.1.13-bin.jar
$JAVADIR/bsaf.jar swingapp/external java/modules/ext appframework-1.0.3.jar
$JAVADIR/beansbinding.jar o.jdesktop.beansbinding/external java/modules/ext
beansbinding-1.2.1.jar
diff --git a/debian/patches/netbeans~cluster-properties.patch
b/debian/patches/netbeans~cluster-properties.patch
index 828574c..8908580 100644
--- a/debian/patches/netbeans~cluster-properties.patch
+++ b/debian/patches/netbeans~cluster-properties.patch
@@ -2,8 +2,8 @@ Modify the list of modules included in the Debian package.
Index: netbeans/nbbuild/cluster.properties
===================================================================
---- netbeans.orig/nbbuild/cluster.properties 2011-08-27 23:01:51.690452903
+0100
-+++ netbeans/nbbuild/cluster.properties 2011-08-27 23:06:54.480457554
+0100
+--- netbeans.orig/nbbuild/cluster.properties 2011-09-10 11:16:30.140862511
+0100
++++ netbeans/nbbuild/cluster.properties 2011-09-10 11:17:31.649195606
+0100
@@ -95,9 +95,7 @@
clusters.config.java.list=\
${clusters.config.platform.list},\
@@ -14,7 +14,7 @@ Index: netbeans/nbbuild/cluster.properties
nb.cluster.nb
clusters.config.enterprise.list=\
-@@ -218,23 +216,13 @@
+@@ -218,9 +216,6 @@
api.debugger,\
api.java.classpath,\
api.xml,\
@@ -24,21 +24,7 @@ Index: netbeans/nbbuild/cluster.properties
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,\
-@@ -266,7 +254,6 @@
+@@ -266,7 +261,6 @@
editor.util,\
extbrowser,\
extexecution,\
@@ -46,7 +32,7 @@ Index: netbeans/nbbuild/cluster.properties
glassfish.common,\
gototest,\
gsf.codecoverage,\
-@@ -275,18 +262,11 @@
+@@ -275,18 +269,11 @@
html.editor,\
html.editor.lib,\
html.lexer,\
@@ -65,7 +51,7 @@ Index: netbeans/nbbuild/cluster.properties
jellytools.ide,\
jumpto,\
languages,\
-@@ -298,8 +278,6 @@
+@@ -298,8 +285,6 @@
lib.cvsclient,\
lib.terminalemulator,\
libs.antlr3.runtime,\
@@ -74,7 +60,7 @@ Index: netbeans/nbbuild/cluster.properties
libs.bytelist,\
libs.commons_codec,\
libs.commons_logging,\
-@@ -307,12 +285,10 @@
+@@ -307,12 +292,10 @@
libs.freemarker,\
libs.ini4j,\
libs.jakarta_oro,\
@@ -87,7 +73,7 @@ Index: netbeans/nbbuild/cluster.properties
libs.svnClientAdapter,\
libs.svnClientAdapter.javahl,\
libs.svnClientAdapter.svnkit,\
-@@ -321,7 +297,6 @@
+@@ -321,7 +304,6 @@
localhistory,\
mercurial,\
o.apache.xml.resolver,\
@@ -95,7 +81,7 @@ Index: netbeans/nbbuild/cluster.properties
o.n.swing.dirchooser,\
o.openidex.util,\
options.editor,\
-@@ -344,7 +319,6 @@
+@@ -344,7 +326,6 @@
spellchecker.apimodule,\
spellchecker.bindings.htmlxml,\
spellchecker.bindings.properties,\
@@ -103,7 +89,7 @@ Index: netbeans/nbbuild/cluster.properties
spellchecker.kit,\
spi.debugger.ui,\
spi.editor.hints,\
-@@ -373,7 +347,6 @@
+@@ -373,7 +354,6 @@
xml.axi,\
xml.catalog,\
xml.core,\
@@ -111,7 +97,7 @@ Index: netbeans/nbbuild/cluster.properties
xml.lexer,\
xml.multiview,\
xml.retriever,\
-@@ -393,7 +366,6 @@
+@@ -393,7 +373,6 @@
nb.cluster.java.depends=\
nb.cluster.ide,\
nb.cluster.platform,\
@@ -119,7 +105,7 @@ Index: netbeans/nbbuild/cluster.properties
nb.cluster.harness
nb.cluster.java=\
ant.browsetask,\
-@@ -413,23 +385,14 @@
+@@ -413,23 +392,14 @@
form,\
form.j2ee,\
form.kit,\
@@ -143,7 +129,7 @@ Index: netbeans/nbbuild/cluster.properties
java.api.common,\
java.debug,\
java.editor,\
-@@ -459,34 +422,13 @@
+@@ -459,34 +429,13 @@
libs.cglib,\
libs.javacapi,\
libs.javacimpl,\
@@ -178,7 +164,7 @@ Index: netbeans/nbbuild/cluster.properties
xml.tools.java
validation.nb.cluster.java=\
java.kit
-@@ -500,15 +442,11 @@
+@@ -500,15 +449,11 @@
nb.cluster.apisupport=\
apisupport.ant,\
apisupport.crudsample,\
@@ -195,7 +181,7 @@ Index: netbeans/nbbuild/cluster.properties
nb.cluster.enterprise.dir=enterprise
nb.cluster.enterprise.depends=\
-@@ -632,7 +570,6 @@
+@@ -632,7 +577,6 @@
nb.cluster.harness
nb.cluster.nb=\
autoupdate.pluginimporter,\
@@ -203,7 +189,7 @@ Index: netbeans/nbbuild/cluster.properties
ide.branding,\
ide.branding.kit,\
lib.uihandler,\
-@@ -917,7 +854,6 @@
+@@ -917,7 +861,6 @@
nb.cluster.stableuc=\
apisupport.apidocs,\
apisupport.tc.cobertura,\
@@ -211,7 +197,7 @@ Index: netbeans/nbbuild/cluster.properties
db.mysql.sakila,\
j2ee.sun.appsrv81,\
jconsole,\
-@@ -926,7 +862,6 @@
+@@ -926,7 +869,6 @@
jmx.common,\
junitlib,\
kenai,\
@@ -219,15 +205,3 @@ Index: netbeans/nbbuild/cluster.properties
kenai.ui,\
libs.jira,\
libs.svnjavahlwin32,\
-Index: netbeans/nbbuild/build.properties
-===================================================================
---- netbeans.orig/nbbuild/build.properties 2011-08-27 22:37:46.530452798
+0100
-+++ netbeans/nbbuild/build.properties 2011-08-27 23:01:51.940453101 +0100
-@@ -153,7 +153,6 @@
- lexer,\
- api.xml,\
- o.apache.tools.ant.module,\
-- db,\
- spi.quicksearch,\
- print,\
- extexecution
diff --git a/debian/patches/netbeans~db.patch b/debian/patches/netbeans~db.patch
new file mode 100644
index 0000000..5643afd
--- /dev/null
+++ b/debian/patches/netbeans~db.patch
@@ -0,0 +1,42 @@
+Build the db modules against swingx1 and using the packaged javacc.
+
+Index:
netbeans/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
+===================================================================
+---
netbeans.orig/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
2011-09-10 11:21:52.311695694 +0100
++++
netbeans/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetJXTable.java
2011-09-10 11:23:22.239194373 +0100
+@@ -70,6 +70,7 @@
+ import org.jdesktop.swingx.renderer.CheckBoxProvider;
+ import org.jdesktop.swingx.renderer.FormatStringValue;
+ import org.jdesktop.swingx.renderer.JRendererCheckBox;
++import org.jdesktop.swingx.renderer.StringValues;
+ import org.jdesktop.swingx.table.DatePickerCellEditor;
+ import org.netbeans.modules.db.dataview.meta.DBColumn;
+ import org.netbeans.modules.db.dataview.output.DataView;
+@@ -141,9 +142,9 @@
+ protected void setDefaultCellRenderers() {
+ setDefaultRenderer(Object.class, new ResultSetCellRenderer());
+ setDefaultRenderer(String.class, new ResultSetCellRenderer());
+- setDefaultRenderer(Number.class, new
ResultSetCellRenderer(FormatStringValue.NUMBER_TO_STRING, JLabel.RIGHT));
++ setDefaultRenderer(Number.class, new
ResultSetCellRenderer(StringValues.NUMBER_TO_STRING, JLabel.RIGHT));
+ setDefaultRenderer(Boolean.class, new ResultSetCellRenderer(new
CheckBoxProvider()));
+- setDefaultRenderer(java.sql.Date.class, new
ResultSetCellRenderer(FormatStringValue.DATE_TO_STRING));
++ setDefaultRenderer(java.sql.Date.class, new
ResultSetCellRenderer(StringValues.DATE_TO_STRING));
+ setDefaultRenderer(java.sql.Time.class, new
ResultSetCellRenderer(ResultSetCellRenderer.TIME_TO_STRING));
+ setDefaultRenderer(java.sql.Timestamp.class, new
ResultSetCellRenderer(ResultSetCellRenderer.DATETIME_TO_STRING));
+ setDefaultRenderer(java.util.Date.class, new
ResultSetCellRenderer(ResultSetCellRenderer.DATETIME_TO_STRING));
+Index: netbeans/db.sql.visualeditor/build.xml
+===================================================================
+--- netbeans.orig/db.sql.visualeditor/build.xml 2011-09-10
11:29:36.230029068 +0100
++++ netbeans/db.sql.visualeditor/build.xml 2011-09-10 11:31:49.299196227
+0100
+@@ -16,9 +16,9 @@
+
+ <target name="sql">
+ <mkdir dir="build"/>
+- <copy file="external/javacc-3.2.jar" tofile="build/javacc.jar"/>
++<!-- <copy file="external/javacc-3.2.jar" tofile="build/javacc.jar"/>-->
+ <javacc
target="src/org/netbeans/modules/db/sql/visualeditor/parser/SQLParser.jj"
+- javacchome="build">
++ javacchome="/usr/share/java/">
+ </javacc>
+ </target>
+
diff --git a/debian/patches/series b/debian/patches/series
index 99ea0d8..679a67a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ netbeans~small-ide.patch
#netbeans~old-java-modules.patch
netbeans~debugger.jpda.ui.patch
netbeans~xsl.patch
+netbeans~db.patch
hooks/post-receive
--
netbeans packaging
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
