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 a71c2be9372c057e04c14bd13c112dc3272a1496 (commit)
via b546ae9cf0b6b750b3f4d3a48ae3a9063941d74d (commit)
via 835255581ef3d52e81678bb3d4260f30647db2db (commit)
from bffc68b2f1f25a86272aa007687c10fc7a24168b (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 a71c2be9372c057e04c14bd13c112dc3272a1496
Author: Andrew Ross <ubu...@rossfamily.co.uk>
Date: Mon Aug 29 14:51:33 2011 +0100
Rename XSL patch.
commit b546ae9cf0b6b750b3f4d3a48ae3a9063941d74d
Author: Andrew Ross <ubu...@rossfamily.co.uk>
Date: Mon Aug 29 14:47:15 2011 +0100
Avoid using the httpserver from the xsl module.
commit 835255581ef3d52e81678bb3d4260f30647db2db
Author: Andrew Ross <ubu...@rossfamily.co.uk>
Date: Sat Aug 27 22:24:24 2011 +0100
Re-added some modules to the build.
-----------------------------------------------------------------------
Summary of changes:
debian/patches/netbeans~cluster-properties.patch | 63 ++++++---------
debian/patches/netbeans~small-ide.patch | 93 ++++------------------
debian/patches/netbeans~xsl.patch | 24 ++++++
debian/patches/series | 1 +
4 files changed, 63 insertions(+), 118 deletions(-)
diff --git a/debian/patches/netbeans~cluster-properties.patch
b/debian/patches/netbeans~cluster-properties.patch
index fa69e9e..828574c 100644
--- a/debian/patches/netbeans~cluster-properties.patch
+++ b/debian/patches/netbeans~cluster-properties.patch
@@ -1,9 +1,9 @@
Modify the list of modules included in the Debian package.
-Index: netbeans-7.0.1+dfsg1/nbbuild/cluster.properties
+Index: netbeans/nbbuild/cluster.properties
===================================================================
---- netbeans-7.0.1+dfsg1.orig/nbbuild/cluster.properties 2011-08-02
23:37:32.884164057 +0100
-+++ netbeans-7.0.1+dfsg1/nbbuild/cluster.properties 2011-08-02
23:49:51.693331403 +0100
+--- 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
@@ -95,9 +95,7 @@
clusters.config.java.list=\
${clusters.config.platform.list},\
@@ -14,7 +14,7 @@ Index: netbeans-7.0.1+dfsg1/nbbuild/cluster.properties
nb.cluster.nb
clusters.config.enterprise.list=\
-@@ -218,29 +216,17 @@
+@@ -218,23 +216,13 @@
api.debugger,\
api.java.classpath,\
api.xml,\
@@ -38,13 +38,7 @@ Index: netbeans-7.0.1+dfsg1/nbbuild/cluster.properties
dbapi,\
defaults,\
derby,\
- diff,\
-- dlight.nativeexecution,\
-- dlight.terminal,\
- editor,\
- editor.actions,\
- editor.bookmarks,\
-@@ -266,7 +252,6 @@
+@@ -266,7 +254,6 @@
editor.util,\
extbrowser,\
extexecution,\
@@ -52,7 +46,7 @@ Index: netbeans-7.0.1+dfsg1/nbbuild/cluster.properties
glassfish.common,\
gototest,\
gsf.codecoverage,\
-@@ -275,18 +260,11 @@
+@@ -275,18 +262,11 @@
html.editor,\
html.editor.lib,\
html.lexer,\
@@ -71,7 +65,7 @@ Index: netbeans-7.0.1+dfsg1/nbbuild/cluster.properties
jellytools.ide,\
jumpto,\
languages,\
-@@ -298,8 +276,6 @@
+@@ -298,8 +278,6 @@
lib.cvsclient,\
lib.terminalemulator,\
libs.antlr3.runtime,\
@@ -80,7 +74,7 @@ Index: netbeans-7.0.1+dfsg1/nbbuild/cluster.properties
libs.bytelist,\
libs.commons_codec,\
libs.commons_logging,\
-@@ -307,12 +283,10 @@
+@@ -307,12 +285,10 @@
libs.freemarker,\
libs.ini4j,\
libs.jakarta_oro,\
@@ -93,7 +87,7 @@ Index: netbeans-7.0.1+dfsg1/nbbuild/cluster.properties
libs.svnClientAdapter,\
libs.svnClientAdapter.javahl,\
libs.svnClientAdapter.svnkit,\
-@@ -321,7 +295,6 @@
+@@ -321,7 +297,6 @@
localhistory,\
mercurial,\
o.apache.xml.resolver,\
@@ -101,7 +95,7 @@ Index: netbeans-7.0.1+dfsg1/nbbuild/cluster.properties
o.n.swing.dirchooser,\
o.openidex.util,\
options.editor,\
-@@ -344,7 +317,6 @@
+@@ -344,7 +319,6 @@
spellchecker.apimodule,\
spellchecker.bindings.htmlxml,\
spellchecker.bindings.properties,\
@@ -109,7 +103,7 @@ Index: netbeans-7.0.1+dfsg1/nbbuild/cluster.properties
spellchecker.kit,\
spi.debugger.ui,\
spi.editor.hints,\
-@@ -373,7 +345,6 @@
+@@ -373,7 +347,6 @@
xml.axi,\
xml.catalog,\
xml.core,\
@@ -117,17 +111,7 @@ Index: netbeans-7.0.1+dfsg1/nbbuild/cluster.properties
xml.lexer,\
xml.multiview,\
xml.retriever,\
-@@ -384,8 +355,7 @@
- xml.tools,\
- xml.wsdl.model,\
- xml.xam,\
-- xml.xdm,\
-- xsl
-+ xml.xdm
- validation.nb.cluster.ide=\
- ide.kit
-
-@@ -393,7 +363,6 @@
+@@ -393,7 +366,6 @@
nb.cluster.java.depends=\
nb.cluster.ide,\
nb.cluster.platform,\
@@ -135,7 +119,7 @@ Index: netbeans-7.0.1+dfsg1/nbbuild/cluster.properties
nb.cluster.harness
nb.cluster.java=\
ant.browsetask,\
-@@ -413,23 +382,14 @@
+@@ -413,23 +385,14 @@
form,\
form.j2ee,\
form.kit,\
@@ -159,7 +143,7 @@ Index: netbeans-7.0.1+dfsg1/nbbuild/cluster.properties
java.api.common,\
java.debug,\
java.editor,\
-@@ -459,34 +419,13 @@
+@@ -459,34 +422,13 @@
libs.cglib,\
libs.javacapi,\
libs.javacimpl,\
@@ -194,17 +178,16 @@ Index: netbeans-7.0.1+dfsg1/nbbuild/cluster.properties
xml.tools.java
validation.nb.cluster.java=\
java.kit
-@@ -499,16 +438,10 @@
- nb.cluster.harness
+@@ -500,15 +442,11 @@
nb.cluster.apisupport=\
apisupport.ant,\
-- apisupport.crudsample,\
+ apisupport.crudsample,\
- apisupport.feedreader,\
- apisupport.installer,\
- apisupport.installer.maven,\
apisupport.kit,\
apisupport.osgidemo,\
-- apisupport.paintapp,\
+ apisupport.paintapp,\
apisupport.project,\
- apisupport.refactoring,\
- maven.apisupport
@@ -212,7 +195,7 @@ Index: netbeans-7.0.1+dfsg1/nbbuild/cluster.properties
nb.cluster.enterprise.dir=enterprise
nb.cluster.enterprise.depends=\
-@@ -632,7 +565,6 @@
+@@ -632,7 +570,6 @@
nb.cluster.harness
nb.cluster.nb=\
autoupdate.pluginimporter,\
@@ -220,7 +203,7 @@ Index: netbeans-7.0.1+dfsg1/nbbuild/cluster.properties
ide.branding,\
ide.branding.kit,\
lib.uihandler,\
-@@ -917,7 +849,6 @@
+@@ -917,7 +854,6 @@
nb.cluster.stableuc=\
apisupport.apidocs,\
apisupport.tc.cobertura,\
@@ -228,7 +211,7 @@ Index: netbeans-7.0.1+dfsg1/nbbuild/cluster.properties
db.mysql.sakila,\
j2ee.sun.appsrv81,\
jconsole,\
-@@ -926,7 +857,6 @@
+@@ -926,7 +862,6 @@
jmx.common,\
junitlib,\
kenai,\
@@ -236,10 +219,10 @@ Index: netbeans-7.0.1+dfsg1/nbbuild/cluster.properties
kenai.ui,\
libs.jira,\
libs.svnjavahlwin32,\
-Index: netbeans-7.0.1+dfsg1/nbbuild/build.properties
+Index: netbeans/nbbuild/build.properties
===================================================================
---- netbeans-7.0.1+dfsg1.orig/nbbuild/build.properties 2011-07-28
20:46:12.000000000 +0100
-+++ netbeans-7.0.1+dfsg1/nbbuild/build.properties 2011-08-02
23:48:27.903331654 +0100
+--- 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,\
diff --git a/debian/patches/netbeans~small-ide.patch
b/debian/patches/netbeans~small-ide.patch
index 59bab4f..d330fd1 100644
--- a/debian/patches/netbeans~small-ide.patch
+++ b/debian/patches/netbeans~small-ide.patch
@@ -1,9 +1,9 @@
Don't include all modules in the build.
-Index: netbeans-7.0.1+dfsg1/java.kit/nbproject/project.xml
+Index: netbeans/java.kit/nbproject/project.xml
===================================================================
---- netbeans-7.0.1+dfsg1.orig/java.kit/nbproject/project.xml 2011-08-02
23:52:03.033331621 +0100
-+++ netbeans-7.0.1+dfsg1/java.kit/nbproject/project.xml 2011-08-02
23:52:42.223337975 +0100
+--- netbeans.orig/java.kit/nbproject/project.xml 2011-08-27
22:37:46.272952697 +0100
++++ netbeans/java.kit/nbproject/project.xml 2011-08-27 23:01:51.960452704
+0100
@@ -204,7 +204,7 @@
<specification-version>1.13.1</specification-version>
</run-dependency>
@@ -22,20 +22,18 @@ Index: netbeans-7.0.1+dfsg1/java.kit/nbproject/project.xml
<dependency>
<code-name-base>org.netbeans.modules.xml.tools.java</code-name-base>
<run-dependency>
-Index: netbeans-7.0.1+dfsg1/apisupport.kit/nbproject/project.xml
+Index: netbeans/apisupport.kit/nbproject/project.xml
===================================================================
---- netbeans-7.0.1+dfsg1.orig/apisupport.kit/nbproject/project.xml
2011-07-28 20:44:52.000000000 +0100
-+++ netbeans-7.0.1+dfsg1/apisupport.kit/nbproject/project.xml 2011-08-02
23:54:10.473330573 +0100
-@@ -11,7 +11,7 @@
- <specification-version>2.43.1</specification-version>
+--- netbeans.orig/apisupport.kit/nbproject/project.xml 2011-08-27
22:37:46.252952709 +0100
++++ netbeans/apisupport.kit/nbproject/project.xml 2011-08-27
23:05:21.720452799 +0100
+@@ -17,25 +17,25 @@
+ <specification-version>1.6.1</specification-version>
</run-dependency>
</dependency>
- <dependency>
+<!-- <dependency>
-
<code-name-base>org.netbeans.modules.apisupport.crudsample</code-name-base>
+
<code-name-base>org.netbeans.modules.apisupport.feedreader</code-name-base>
<run-dependency>
- <specification-version>1.6.1</specification-version>
-@@ -23,31 +23,31 @@
<release-version>1</release-version>
<specification-version>1.17.1</specification-version>
</run-dependency>
@@ -58,40 +56,10 @@ Index:
netbeans-7.0.1+dfsg1/apisupport.kit/nbproject/project.xml
<dependency>
<code-name-base>org.netbeans.modules.apisupport.osgidemo</code-name-base>
<run-dependency>
- <specification-version>1.6.1</specification-version>
- </run-dependency>
- </dependency>
-- <dependency>
-+<!-- <dependency>
-
<code-name-base>org.netbeans.modules.apisupport.paintapp</code-name-base>
- <run-dependency>
- <specification-version>1.14.1</specification-version>
- </run-dependency>
-- </dependency>
-+ </dependency>-->
- <dependency>
-
<code-name-base>org.netbeans.modules.apisupport.project</code-name-base>
- <run-dependency>
-Index: netbeans-7.0.1+dfsg1/editor.kit/nbproject/project.xml
+Index: netbeans/editor.kit/nbproject/project.xml
===================================================================
---- netbeans-7.0.1+dfsg1.orig/editor.kit/nbproject/project.xml 2011-08-02
23:54:24.404164300 +0100
-+++ netbeans-7.0.1+dfsg1/editor.kit/nbproject/project.xml 2011-08-02
23:56:08.223331516 +0100
-@@ -5,13 +5,13 @@
- <data xmlns="http://www.netbeans.org/ns/nb-module-project/3";>
- <code-name-base>org.netbeans.modules.editor.kit</code-name-base>
- <module-dependencies>
-- <dependency>
-+<!-- <dependency>
-
<code-name-base>org.netbeans.modules.css.visual</code-name-base>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>2.17.1</specification-version>
- </run-dependency>
-- </dependency>
-+ </dependency>-->
- <dependency>
-
<code-name-base>org.netbeans.modules.editor.actions</code-name-base>
- <run-dependency>
+--- netbeans.orig/editor.kit/nbproject/project.xml 2011-08-27
22:37:46.312952678 +0100
++++ netbeans/editor.kit/nbproject/project.xml 2011-08-27 23:01:51.970452725
+0100
@@ -33,7 +33,7 @@
<specification-version>1.36.1</specification-version>
</run-dependency>
@@ -126,41 +94,10 @@ Index:
netbeans-7.0.1+dfsg1/editor.kit/nbproject/project.xml
<dependency>
<code-name-base>org.netbeans.modules.languages.diff</code-name-base>
<run-dependency>
-@@ -126,13 +126,13 @@
- <specification-version>1.26.1</specification-version>
- </run-dependency>
- </dependency>
-- <dependency>
-+<!-- <dependency>
- <code-name-base>org.netbeans.modules.xsl</code-name-base>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.26.1</specification-version>
- </run-dependency>
-- </dependency>
-+ </dependency>-->
- </module-dependencies>
- <public-packages/>
- </data>
-Index: netbeans-7.0.1+dfsg1/ide.kit/nbproject/project.xml
+Index: netbeans/ide.kit/nbproject/project.xml
===================================================================
---- netbeans-7.0.1+dfsg1.orig/ide.kit/nbproject/project.xml 2011-08-02
23:56:22.374164685 +0100
-+++ netbeans-7.0.1+dfsg1/ide.kit/nbproject/project.xml 2011-08-02
23:57:00.373332636 +0100
-@@ -25,12 +25,12 @@
- <specification-version>1.15.1</specification-version>
- </run-dependency>
- </dependency>
-- <dependency>
-+<!-- <dependency>
-
<code-name-base>org.netbeans.modules.dlight.terminal</code-name-base>
- <run-dependency>
- <specification-version>1.6.1.1</specification-version>
- </run-dependency>
-- </dependency>
-+ </dependency>-->
- <dependency>
-
<code-name-base>org.netbeans.modules.editor.bookmarks</code-name-base>
- <run-dependency>
+--- netbeans.orig/ide.kit/nbproject/project.xml 2011-08-27
22:37:46.292952513 +0100
++++ netbeans/ide.kit/nbproject/project.xml 2011-08-27 23:01:51.970452725
+0100
@@ -135,13 +135,13 @@
<specification-version>1.23.1</specification-version>
</run-dependency>
diff --git a/debian/patches/netbeans~xsl.patch
b/debian/patches/netbeans~xsl.patch
new file mode 100644
index 0000000..bf494a3
--- /dev/null
+++ b/debian/patches/netbeans~xsl.patch
@@ -0,0 +1,24 @@
+Index: netbeans/xsl/manifest.mf
+===================================================================
+--- netbeans.orig/xsl/manifest.mf 2011-08-29 13:15:37.285484472 +0100
++++ netbeans/xsl/manifest.mf 2011-08-29 13:15:41.123817710 +0100
+@@ -2,6 +2,5 @@
+ OpenIDE-Module: org.netbeans.modules.xsl/1
+ OpenIDE-Module-Localizing-Bundle:
org/netbeans/modules/xsl/resources/Bundle.properties
+ OpenIDE-Module-Layer: org/netbeans/modules/xsl/resources/mf-layer.xml
+-OpenIDE-Module-Requires: org.openide.util.HttpServer$Impl
+ AutoUpdate-Show-In-Client: false
+ OpenIDE-Module-Specification-Version: 1.26.1
+Index: netbeans/xsl/src/org/netbeans/modules/xsl/ui/TransformPanel.java
+===================================================================
+--- netbeans.orig/xsl/src/org/netbeans/modules/xsl/ui/TransformPanel.java
2011-08-29 14:29:34.304651065 +0100
++++ netbeans/xsl/src/org/netbeans/modules/xsl/ui/TransformPanel.java
2011-08-29 14:32:52.243817699 +0100
+@@ -352,7 +352,7 @@
+ }
+
+ private void initOutputComboBox(Object defaultOutput) {
+- outputComboBox.setModel(new DefaultComboBoxModel(new Object[] {
defaultOutput, JUST_PREVIEW }));
++ outputComboBox.setModel(new DefaultComboBoxModel(new Object[] {
defaultOutput }));
+ }
+
+
diff --git a/debian/patches/series b/debian/patches/series
index 80907e5..91b3fa0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ netbeans~small-ide.patch
#netbeans~old-java.source-module.patch
#netbeans~old-java-modules.patch
netbeans~debugger.jpda.ui.patch
+netbeans~xsl.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
