[pkg-java] r3832 - in trunk/rhino/debian: . patches src_from_treetable_article_see_bug409629
paulcager-guest at alioth.debian.org
paulcager-guest at alioth.debian.org
Sun Jul 15 00:55:30 UTC 2007
Author: paulcager-guest
Date: 2007-07-15 00:55:30 +0000 (Sun, 15 Jul 2007)
New Revision: 3832
Added:
trunk/rhino/debian/patches/02-without-xmlimpl.patch
Modified:
trunk/rhino/debian/README.Debian
trunk/rhino/debian/changelog
trunk/rhino/debian/control
trunk/rhino/debian/rules
trunk/rhino/debian/src_from_treetable_article_see_bug409629/AbstractCellEditor.java
trunk/rhino/debian/src_from_treetable_article_see_bug409629/JTreeTable.java
trunk/rhino/debian/src_from_treetable_article_see_bug409629/TreeTableModel.java
trunk/rhino/debian/src_from_treetable_article_see_bug409629/TreeTableModelAdapter.java
Log:
rhino (1.6.R5-3) unstable; urgency=low
* Removed Wolfgang Baer from Uploaders and added myself.
* Fixed FTBFS: java.net.ConnectException: Connection refused.
Was trying to download xmlbeans Jar, which is not allowed. As
this Jar is not (yet) in Debian, rhino has been built with XML
implementation disabled.
A bug in 1.6.R5-2 meant that it was still trying to download the
"treetable" source. This has been fixed in debian/rules by copying the
sample source code into the "downloaded" directory (the sample source code
had to be modified).
(Closes: #424466)
* Moved "-doc" package to doc section.
Modified: trunk/rhino/debian/README.Debian
===================================================================
--- trunk/rhino/debian/README.Debian 2007-07-15 00:40:39 UTC (rev 3831)
+++ trunk/rhino/debian/README.Debian 2007-07-15 00:55:30 UTC (rev 3832)
@@ -1,11 +1,10 @@
rhino for Debian
----------------
- rhino debian package doesn't support
- toolsrc/org/mozilla/javascript/tools/debugger classes because they use
- SUN's code (accuratea, when compile rhino, SUN's code is downloaded
- and included js.jar) and I should not include it in rhino.
+ The Debian rhino package doesn't support xml implementation, as
+ the xmlbeans Jar is not available in Debian.
- This package provide /usr/bin/js which is wrapper for excuting rhino.
+ This package provide /usr/bin/rhino which is wrapper for excuting rhino.
-- Takashi Okamoto <tora at debian.org>, Fri, 16 Nov 2001 23:51:38 +0900
+ -- Paul Cager <paul-debian at home.paulcager.org> Sun, 15 Jul 2007 00:32:12 +0100
Modified: trunk/rhino/debian/changelog
===================================================================
--- trunk/rhino/debian/changelog 2007-07-15 00:40:39 UTC (rev 3831)
+++ trunk/rhino/debian/changelog 2007-07-15 00:55:30 UTC (rev 3832)
@@ -1,3 +1,19 @@
+rhino (1.6.R5-3) unstable; urgency=low
+
+ * Removed Wolfgang Baer from Uploaders and added myself.
+ * Fixed FTBFS: java.net.ConnectException: Connection refused.
+ Was trying to download xmlbeans Jar, which is not allowed. As
+ this Jar is not (yet) in Debian, rhino has been built with XML
+ implementation disabled.
+ A bug in 1.6.R5-2 meant that it was still trying to download the
+ "treetable" source. This has been fixed in debian/rules by copying the
+ sample source code into the "downloaded" directory (the sample source code
+ had to be modified).
+ (Closes: #424466)
+ * Moved "-doc" package to doc section.
+
+ -- Paul Cager <paul-debian at home.paulcager.org> Sun, 15 Jul 2007 00:32:12 +0100
+
rhino (1.6.R5-2) unstable; urgency=low
* added java classes from a tutorial from Sun (BSD license as mentionned
Modified: trunk/rhino/debian/control
===================================================================
--- trunk/rhino/debian/control 2007-07-15 00:40:39 UTC (rev 3831)
+++ trunk/rhino/debian/control 2007-07-15 00:55:30 UTC (rev 3832)
@@ -2,7 +2,7 @@
Section: interpreters
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Paul Cager <paul-debian at home.paulcager.org>
Build-Depends: debhelper (>= 4.2.30), cdbs
Build-Depends-Indep: ant, java-gcj-compat-dev
Standards-Version: 3.7.2
@@ -17,6 +17,7 @@
to provide scripting to end users.
Package: rhino-doc
+Section: doc
Architecture: all
Suggests: rhino
Description: Documentation for rhino Java Script Engine
Added: trunk/rhino/debian/patches/02-without-xmlimpl.patch
===================================================================
--- trunk/rhino/debian/patches/02-without-xmlimpl.patch (rev 0)
+++ trunk/rhino/debian/patches/02-without-xmlimpl.patch 2007-07-15 00:55:30 UTC (rev 3832)
@@ -0,0 +1,11 @@
+diff -Nur rhino-1.6.R5/build.properties rhino-1.6.R5.new/build.properties
+--- rhino-1.6.R5/build.properties 2006-11-18 14:46:20.000000000 +0000
++++ rhino-1.6.R5.new/build.properties 2007-07-15 00:22:53.000000000 +0100
+@@ -59,6 +59,7 @@
+ jar-compression: true
+
+ # optional external packages
++without-xmlimpl: true
+ xmlbeans: .
+ xbean.jar: ${xmlbeans}/lib/xbean.jar
+ jsr173.jar: ${xmlbeans}/lib/jsr173_1.0_api.jar
Modified: trunk/rhino/debian/rules
===================================================================
--- trunk/rhino/debian/rules 2007-07-15 00:40:39 UTC (rev 3831)
+++ trunk/rhino/debian/rules 2007-07-15 00:55:30 UTC (rev 3832)
@@ -16,8 +16,19 @@
VERSION=1.6R5
clean::
+ rm -rf toolsrc/org/mozilla/javascript/tools/debugger/downloaded/*
rm -rf build
+# The upstream build file (toolsrc/org/mozilla/javascript/tools/debugger/build.xml) downloads
+# a ZIP file containing some sample swing code, which is then modified and used as part of the
+# debugger. This is obviously not permitted during a Debian build.
+# Fortunately the sample code is DFSG-free, so it has been included in the debian directory (in
+# its modified format). Copying it to the "downloaded" directory prevents the upstream
+# build.xml from attempting to download it.
+configure/rhino::
+ mkdir -p toolsrc/org/mozilla/javascript/tools/debugger/downloaded
+ cp debian/src_from_treetable_article_see_bug409629/{AbstractCellEditor.java,JTreeTable.java,TreeTableModel.java,TreeTableModelAdapter.java} toolsrc/org/mozilla/javascript/tools/debugger/downloaded/
+
install/rhino::
rm -f build/rhino1*/docs/apidocs/package-list
install -m 644 ${JARFILE} debian/rhino/usr/share/java/${PNAME}-${VERSION}.jar
Modified: trunk/rhino/debian/src_from_treetable_article_see_bug409629/AbstractCellEditor.java
===================================================================
--- trunk/rhino/debian/src_from_treetable_article_see_bug409629/AbstractCellEditor.java 2007-07-15 00:40:39 UTC (rev 3831)
+++ trunk/rhino/debian/src_from_treetable_article_see_bug409629/AbstractCellEditor.java 2007-07-15 00:55:30 UTC (rev 3832)
@@ -1,4 +1,7 @@
-import java.awt.Component;
+
+ package org.mozilla.javascript.tools.debugger.downloaded;
+ import java.awt.Component;
+
import java.awt.event.*;
import java.awt.AWTEvent;
import javax.swing.*;
Modified: trunk/rhino/debian/src_from_treetable_article_see_bug409629/JTreeTable.java
===================================================================
--- trunk/rhino/debian/src_from_treetable_article_see_bug409629/JTreeTable.java 2007-07-15 00:40:39 UTC (rev 3831)
+++ trunk/rhino/debian/src_from_treetable_article_see_bug409629/JTreeTable.java 2007-07-15 00:55:30 UTC (rev 3832)
@@ -12,7 +12,10 @@
* you entered into with Sun.
*/
-import javax.swing.*;
+
+ package org.mozilla.javascript.tools.debugger.downloaded;
+ import javax.swing.*;
+
import javax.swing.event.*;
import javax.swing.tree.*;
import javax.swing.table.*;
@@ -258,7 +261,7 @@
* a change in the ListSelectionModel happens, the paths are updated
* in the DefaultTreeSelectionModel.
*/
- class ListToTreeSelectionModelWrapper extends DefaultTreeSelectionModel {
+ public class ListToTreeSelectionModelWrapper extends DefaultTreeSelectionModel {
/** Set to true when we are updating the ListSelectionModel. */
protected boolean updatingListSelectionModel;
@@ -273,7 +276,7 @@
* listens for changes to this model and updates the selected paths
* accordingly.
*/
- ListSelectionModel getListSelectionModel() {
+ public ListSelectionModel getListSelectionModel() {
return listSelectionModel;
}
Modified: trunk/rhino/debian/src_from_treetable_article_see_bug409629/TreeTableModel.java
===================================================================
--- trunk/rhino/debian/src_from_treetable_article_see_bug409629/TreeTableModel.java 2007-07-15 00:40:39 UTC (rev 3831)
+++ trunk/rhino/debian/src_from_treetable_article_see_bug409629/TreeTableModel.java 2007-07-15 00:55:30 UTC (rev 3832)
@@ -18,8 +18,11 @@
*
*/
-import javax.swing.tree.TreeModel;
+ package org.mozilla.javascript.tools.debugger.downloaded;
+ import javax.swing.tree.TreeModel;
+
+
/**
* TreeTableModel is the model used by a JTreeTable. It extends TreeModel
* to add methods for getting inforamtion about the set of columns each
Modified: trunk/rhino/debian/src_from_treetable_article_see_bug409629/TreeTableModelAdapter.java
===================================================================
--- trunk/rhino/debian/src_from_treetable_article_see_bug409629/TreeTableModelAdapter.java 2007-07-15 00:40:39 UTC (rev 3831)
+++ trunk/rhino/debian/src_from_treetable_article_see_bug409629/TreeTableModelAdapter.java 2007-07-15 00:55:30 UTC (rev 3832)
@@ -12,7 +12,10 @@
* you entered into with Sun.
*/
-import javax.swing.JTree;
+
+ package org.mozilla.javascript.tools.debugger.downloaded;
+ import javax.swing.JTree;
+
import javax.swing.SwingUtilities;
import javax.swing.table.AbstractTableModel;
import javax.swing.tree.TreePath;
More information about the pkg-java-commits
mailing list