[pkg-java] r15949 - in trunk/pirl/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Sat Apr 14 14:34:10 UTC 2012
Author: malat
Date: 2012-04-14 14:34:10 +0000 (Sat, 14 Apr 2012)
New Revision: 15949
Added:
trunk/pirl/debian/patches/all.patch
Removed:
trunk/pirl/debian/patches/1.patch
trunk/pirl/debian/patches/2.patch
trunk/pirl/debian/patches/3.patch
trunk/pirl/debian/patches/6.patch
trunk/pirl/debian/patches/7.patch
trunk/pirl/debian/patches/fixjcmloc.patch
Modified:
trunk/pirl/debian/README.source
trunk/pirl/debian/copyright
trunk/pirl/debian/patches/series
Log:
update copyright license. Use DEP3
Modified: trunk/pirl/debian/README.source
===================================================================
--- trunk/pirl/debian/README.source 2012-04-14 14:25:05 UTC (rev 15948)
+++ trunk/pirl/debian/README.source 2012-04-14 14:34:10 UTC (rev 15949)
@@ -3,4 +3,8 @@
the debian package reflect that. No effort has been made to split the LGPL files
from the GPL one. The whole package is thus distributed under a GPL-2 license
+The original files from PIRL/TreeTable have been removed and replaced with newer
+file from the official java.sun.com website, see orig-tar.sh script.
+This allow using a BSD license within the code instead of the old sun license.
+
-- Mathieu Malaterre <malat at debian.org> Wed, 04 Apr 2012 22:13:54 +0200
Modified: trunk/pirl/debian/copyright
===================================================================
--- trunk/pirl/debian/copyright 2012-04-14 14:25:05 UTC (rev 15948)
+++ trunk/pirl/debian/copyright 2012-04-14 14:34:10 UTC (rev 15949)
@@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: PIRL packages
-Upstream-Contact: Bradford Castalia Castalia at Arizona.edu
+Upstream-Contact: Bradford Castalia <Castalia at Arizona.edu>
Source: http://pirlwww.lpl.arizona.edu/software/PIRL_Java_Packages.shtml
Files: *
@@ -21,6 +21,43 @@
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+Files: PIRL/TreeTable/*.java
+Copyright: 1997, 2000 Sun Microsystems, Inc. All Rights Reserved.
+License:
+ Redistribution and use in source and binary forms, with or
+ without modification, are permitted provided that the following
+ conditions are met:
+ .
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ - Redistribution in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials
+ provided with the distribution.
+ .
+ Neither the name of Sun Microsystems, Inc. or the names of
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+ .
+ This software is provided "AS IS," without a warranty of any
+ kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
+ WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
+ EXCLUDED. SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY
+ DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT OF OR
+ RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE OR
+ ITS DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE
+ FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT,
+ SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER
+ CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF
+ THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS
+ BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ .
+ You acknowledge that this software is not designed, licensed or
+ intended for use in the design, construction, operation or
+ maintenance of any nuclear facility.
+
Files: debian/*
Copyright: 2012, Mathieu Malaterre <malat at debian.org>
License: GPL-2
Deleted: trunk/pirl/debian/patches/1.patch
===================================================================
--- trunk/pirl/debian/patches/1.patch 2012-04-14 14:25:05 UTC (rev 15948)
+++ trunk/pirl/debian/patches/1.patch 2012-04-14 14:34:10 UTC (rev 15949)
@@ -1,41 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- pirl (2.3.4.dfsg-1) unstable; urgency=low
- .
- * Initial release (Closes: #668603)
-Author: Mathieu Malaterre <malat at debian.org>
-Bug-Debian: http://bugs.debian.org/668603
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- pirl-2.3.4.dfsg.orig/PIRL/TreeTable/AbstractTreeTableModel.java
-+++ pirl-2.3.4.dfsg/PIRL/TreeTable/AbstractTreeTableModel.java
-@@ -38,8 +38,10 @@
- * maintenance of any nuclear facility.
- */
-
--import com.sun.java.swing.tree.*;
--import com.sun.java.swing.event.*;
-+package PIRL.TreeTable;
-+
-+import javax.swing.tree.*;
-+import javax.swing.event.*;
-
- /**
- * An abstract implementation of the TreeTableModel interface, handling
Deleted: trunk/pirl/debian/patches/2.patch
===================================================================
--- trunk/pirl/debian/patches/2.patch 2012-04-14 14:25:05 UTC (rev 15948)
+++ trunk/pirl/debian/patches/2.patch 2012-04-14 14:34:10 UTC (rev 15949)
@@ -1,36 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- pirl (2.3.4.dfsg-1) unstable; urgency=low
- .
- * Initial release (Closes: #668603)
-Author: Mathieu Malaterre <malat at debian.org>
-Bug-Debian: http://bugs.debian.org/668603
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- pirl-2.3.4.dfsg.orig/PIRL/TreeTable/TreeTableModel.java
-+++ pirl-2.3.4.dfsg/PIRL/TreeTable/TreeTableModel.java
-@@ -38,7 +38,6 @@
- * maintenance of any nuclear facility.
- */
-
--import com.sun.java.swing.tree.TreeModel;
-
- /**
- * TreeTableModel is the model used by a JTreeTable. It extends TreeModel
Deleted: trunk/pirl/debian/patches/3.patch
===================================================================
--- trunk/pirl/debian/patches/3.patch 2012-04-14 14:25:05 UTC (rev 15948)
+++ trunk/pirl/debian/patches/3.patch 2012-04-14 14:34:10 UTC (rev 15949)
@@ -1,38 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- pirl (2.3.4.dfsg-1) unstable; urgency=low
- .
- * Initial release (Closes: #668603)
-Author: Mathieu Malaterre <malat at debian.org>
-Bug-Debian: http://bugs.debian.org/668603
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- pirl-2.3.4.dfsg.orig/PIRL/TreeTable/TreeTableModel.java
-+++ pirl-2.3.4.dfsg/PIRL/TreeTable/TreeTableModel.java
-@@ -37,7 +37,9 @@
- * intended for use in the design, construction, operation or
- * maintenance of any nuclear facility.
- */
-+package PIRL.TreeTable;
-
-+import javax.swing.tree.TreeModel;
-
- /**
- * TreeTableModel is the model used by a JTreeTable. It extends TreeModel
Deleted: trunk/pirl/debian/patches/6.patch
===================================================================
--- trunk/pirl/debian/patches/6.patch 2012-04-14 14:25:05 UTC (rev 15948)
+++ trunk/pirl/debian/patches/6.patch 2012-04-14 14:34:10 UTC (rev 15949)
@@ -1,50 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- pirl (2.3.4.dfsg-1) unstable; urgency=low
- .
- * Initial release (Closes: #668603)
-Author: Mathieu Malaterre <malat at debian.org>
-Bug-Debian: http://bugs.debian.org/668603
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- pirl-2.3.4.dfsg.orig/PIRL/TreeTable/TreeTableModelAdapter.java
-+++ pirl-2.3.4.dfsg/PIRL/TreeTable/TreeTableModelAdapter.java
-@@ -37,12 +37,16 @@
- * intended for use in the design, construction, operation or
- * maintenance of any nuclear facility.
- */
-+package PIRL.TreeTable;
-
--import com.sun.java.swing.table.AbstractTableModel;
--import com.sun.java.swing.JTree;
--import com.sun.java.swing.tree.TreePath;
--import com.sun.java.swing.event.TreeExpansionEvent;
--import com.sun.java.swing.event.TreeExpansionListener;
-+import javax.swing.JTree;
-+import javax.swing.SwingUtilities;
-+import javax.swing.table.AbstractTableModel;
-+import javax.swing.tree.TreePath;
-+import javax.swing.event.TreeExpansionEvent;
-+import javax.swing.event.TreeExpansionListener;
-+import javax.swing.event.TreeModelEvent;
-+import javax.swing.event.TreeModelListener;
-
- /**
- * This is a wrapper class takes a TreeTableModel and implements
Deleted: trunk/pirl/debian/patches/7.patch
===================================================================
--- trunk/pirl/debian/patches/7.patch 2012-04-14 14:25:05 UTC (rev 15948)
+++ trunk/pirl/debian/patches/7.patch 2012-04-14 14:34:10 UTC (rev 15949)
@@ -1,44 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- pirl (2.3.4.dfsg-1) unstable; urgency=low
- .
- * Initial release (Closes: #668603)
-Author: Mathieu Malaterre <malat at debian.org>
-Bug-Debian: http://bugs.debian.org/668603
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- pirl-2.3.4.dfsg.orig/PIRL/TreeTable/AbstractCellEditor.java
-+++ pirl-2.3.4.dfsg/PIRL/TreeTable/AbstractCellEditor.java
-@@ -37,12 +37,13 @@
- * intended for use in the design, construction, operation or
- * maintenance of any nuclear facility.
- */
-+package PIRL.TreeTable;
-
- import java.awt.Component;
- import java.awt.event.*;
- import java.awt.AWTEvent;
--import com.sun.java.swing.*;
--import com.sun.java.swing.event.*;
-+import javax.swing.*;
-+import javax.swing.event.*;
- import java.util.EventObject;
- import java.io.Serializable;
-
Added: trunk/pirl/debian/patches/all.patch
===================================================================
--- trunk/pirl/debian/patches/all.patch (rev 0)
+++ trunk/pirl/debian/patches/all.patch 2012-04-14 14:34:10 UTC (rev 15949)
@@ -0,0 +1,84 @@
+Description: PIRL is using code directly from the java website
+ need to tweak the code to compile within the package.
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: not-needed
+Last-Update: 2012-04-14
+
+Index: pirl-2.3.4/PIRL/TreeTable/AbstractTreeTableModel.java
+===================================================================
+--- pirl-2.3.4.orig/PIRL/TreeTable/AbstractTreeTableModel.java 2012-04-14 16:27:42.000000000 +0200
++++ pirl-2.3.4/PIRL/TreeTable/AbstractTreeTableModel.java 2012-04-14 16:28:09.000000000 +0200
+@@ -38,8 +38,10 @@
+ * maintenance of any nuclear facility.
+ */
+
+-import com.sun.java.swing.tree.*;
+-import com.sun.java.swing.event.*;
++package PIRL.TreeTable;
++
++import javax.swing.tree.*;
++import javax.swing.event.*;
+
+ /**
+ * An abstract implementation of the TreeTableModel interface, handling
+Index: pirl-2.3.4/PIRL/TreeTable/TreeTableModel.java
+===================================================================
+--- pirl-2.3.4.orig/PIRL/TreeTable/TreeTableModel.java 2012-04-14 16:27:42.000000000 +0200
++++ pirl-2.3.4/PIRL/TreeTable/TreeTableModel.java 2012-04-14 16:28:09.000000000 +0200
+@@ -37,8 +37,9 @@
+ * intended for use in the design, construction, operation or
+ * maintenance of any nuclear facility.
+ */
++package PIRL.TreeTable;
+
+-import com.sun.java.swing.tree.TreeModel;
++import javax.swing.tree.TreeModel;
+
+ /**
+ * TreeTableModel is the model used by a JTreeTable. It extends TreeModel
+Index: pirl-2.3.4/PIRL/TreeTable/TreeTableModelAdapter.java
+===================================================================
+--- pirl-2.3.4.orig/PIRL/TreeTable/TreeTableModelAdapter.java 2012-04-14 16:27:41.000000000 +0200
++++ pirl-2.3.4/PIRL/TreeTable/TreeTableModelAdapter.java 2012-04-14 16:28:09.000000000 +0200
+@@ -37,12 +37,16 @@
+ * intended for use in the design, construction, operation or
+ * maintenance of any nuclear facility.
+ */
++package PIRL.TreeTable;
+
+-import com.sun.java.swing.table.AbstractTableModel;
+-import com.sun.java.swing.JTree;
+-import com.sun.java.swing.tree.TreePath;
+-import com.sun.java.swing.event.TreeExpansionEvent;
+-import com.sun.java.swing.event.TreeExpansionListener;
++import javax.swing.JTree;
++import javax.swing.SwingUtilities;
++import javax.swing.table.AbstractTableModel;
++import javax.swing.tree.TreePath;
++import javax.swing.event.TreeExpansionEvent;
++import javax.swing.event.TreeExpansionListener;
++import javax.swing.event.TreeModelEvent;
++import javax.swing.event.TreeModelListener;
+
+ /**
+ * This is a wrapper class takes a TreeTableModel and implements
+Index: pirl-2.3.4/PIRL/TreeTable/AbstractCellEditor.java
+===================================================================
+--- pirl-2.3.4.orig/PIRL/TreeTable/AbstractCellEditor.java 2012-04-14 16:27:41.000000000 +0200
++++ pirl-2.3.4/PIRL/TreeTable/AbstractCellEditor.java 2012-04-14 16:28:09.000000000 +0200
+@@ -37,12 +37,13 @@
+ * intended for use in the design, construction, operation or
+ * maintenance of any nuclear facility.
+ */
++package PIRL.TreeTable;
+
+ import java.awt.Component;
+ import java.awt.event.*;
+ import java.awt.AWTEvent;
+-import com.sun.java.swing.*;
+-import com.sun.java.swing.event.*;
++import javax.swing.*;
++import javax.swing.event.*;
+ import java.util.EventObject;
+ import java.io.Serializable;
+
Deleted: trunk/pirl/debian/patches/fixjcmloc.patch
===================================================================
--- trunk/pirl/debian/patches/fixjcmloc.patch 2012-04-14 14:25:05 UTC (rev 15948)
+++ trunk/pirl/debian/patches/fixjcmloc.patch 2012-04-14 14:34:10 UTC (rev 15949)
@@ -1,138 +0,0 @@
-Index: PIRL-2.3.4/Build/Makefile
-===================================================================
---- PIRL-2.3.4.orig/Build/Makefile 2011-07-27 04:51:29.000000000 +0000
-+++ PIRL-2.3.4/Build/Makefile 2012-04-13 08:33:52.509438365 +0000
-@@ -10,7 +10,7 @@
-
-
- # Installation location for the application wrappers.
--INSTALL_DIR ?= /opt/local/sh
-+INSTALL_DIR ?= $(DESTDIR)
-
- # The order of packages matters: put packages after their dependencies.
- PACKAGES := Utilities \
-@@ -48,13 +48,13 @@
- PostgreSQL := $(PostgreSQL_JDBC_DIR)/$(PostgreSQL_JDBC_JAR)
-
- # The location of the Java Components for Mathematics.
--JCM_DIR ?= /opt/java/jcm
--JCM_DATA_JAR ?= jcm_data.jar
-+JCM_DIR ?= /usr/share/java
-+JCM_DATA_JAR ?= jcm.jar
- JCM := $(JCM_DIR)/$(JCM_DATA_JAR)
-
- # The location of the SwingLabs Swing Component Extensions.
--SwingX_DIR ?= /opt/java/SwingX
--SwingX_JAR ?= swingx.jar
-+SwingX_DIR ?= /user/share/java
-+SwingX_JAR ?= swingx1.jar
- SwingX := $(SwingX_DIR)/$(SwingX_JAR)
-
- # The location of the Apache Commons Comand Line Interface package.
-@@ -166,6 +166,7 @@
- install:
- @echo
- @echo "=== Installing application wrappers in $(INSTALL_DIR)"
-+ mkdir $(INSTALL_DIR)
- cp -f $(addprefix ../,$(APPLICATIONS)) $(INSTALL_DIR)
-
-
-@@ -219,8 +220,6 @@
- @if [ ! -d staging_area/PIRL/Build ]; then \
- echo ; \
- echo "--- Assembling the package files" ; \
-- mkdir -p staging_area/PIRL ; \
-- Release -dir staging_area/PIRL -no_make Build $(PACKAGES) ; \
- fi
- @echo
- $(MAKE) -C staging_area/PIRL/Build
-Index: PIRL-2.3.4/Utilities/Makefile
-===================================================================
---- PIRL-2.3.4.orig/Utilities/Makefile 2009-07-21 00:09:48.000000000 +0000
-+++ PIRL-2.3.4/Utilities/Makefile 2012-04-13 08:15:07.965935926 +0000
-@@ -5,7 +5,7 @@
- # gmake syntax
-
- # Location of the Java Classes for Mathematics.
--JCM ?= /opt/java/jcm
-+JCM ?= /usr/share/java/jcm.jar
-
- JPATH ?= ../..:$(JCM)
- JC ?= javac
-Index: PIRL-2.3.4/Conductor/Makefile
-===================================================================
---- PIRL-2.3.4.orig/Conductor/Makefile 2012-01-25 23:12:08.000000000 +0000
-+++ PIRL-2.3.4/Conductor/Makefile 2012-04-13 08:15:07.965935926 +0000
-@@ -13,13 +13,13 @@
-
-
- # Location of the Java Classes for Mathematics.
--JCM ?= /opt/java/jcm
-+JCM ?= /usr/share/java/jcm.jar
-
- # Location of SwingX Classes.
--SwingX ?= /opt/java/SwingX/swingx.jar
-+SwingX ?= /usr/share/java/swingx1.jar
-
- # Location of the JavaMail Classes (used by Notify).
--JavaMail ?= /opt/java/javamail/mail.jar
-+JavaMail ?= /usr/share/java/gnumail.jar
-
- JPATH ?= ../..:$(JCM):$(SwingX):$(JavaMail)
- JC ?= javac
-@@ -65,7 +65,7 @@
- ARCH := $(subst $(space),_,$(shell uname -m))
-
- # Java installation location.
--JNI_ROOT ?= /usr/java
-+JNI_ROOT ?= /usr/lib/jvm/default-java
-
- # Compiler.
- CC = gcc
-Index: PIRL-2.3.4/Conductor/Maestro/Makefile
-===================================================================
---- PIRL-2.3.4.orig/Conductor/Maestro/Makefile 2008-09-09 05:48:07.000000000 +0000
-+++ PIRL-2.3.4/Conductor/Maestro/Makefile 2012-04-13 08:15:07.965935926 +0000
-@@ -13,7 +13,7 @@
- JCM ?= /opt/java/jcm
-
- # Location of SwingX Classes.
--SwingX ?= /opt/java/SwingX/swingx.jar
-+SwingX ?= /usr/share/java/swingx1.jar
-
- JPATH ?= ../../..:$(JCM):$(SwingX)
- JC ?= javac
-Index: PIRL-2.3.4/Conductor/Pipeline_Configuration/Makefile
-===================================================================
---- PIRL-2.3.4.orig/Conductor/Pipeline_Configuration/Makefile 2011-06-02 06:24:06.000000000 +0000
-+++ PIRL-2.3.4/Conductor/Pipeline_Configuration/Makefile 2012-04-13 08:15:07.965935926 +0000
-@@ -9,7 +9,7 @@
- SCRIPTS_DIR ?= /opt/local/sh
-
- # Location of commons-cli classes
--Commons_CLI ?= /opt/java/commons-cli/commons-cli.jar
-+Commons_CLI ?= /usr/share/java/commons-cli.jar
-
-
- JPATH ?= ../../..:$(Commons_CLI)
-Index: PIRL-2.3.4/PVL/Makefile
-===================================================================
---- PIRL-2.3.4.orig/PVL/Makefile 2011-07-27 05:10:07.000000000 +0000
-+++ PIRL-2.3.4/PVL/Makefile 2012-04-13 08:46:48.697453081 +0000
-@@ -5,13 +5,13 @@
- # gmake syntax
-
- # Location of the Java Classes for Mathematics.
--JCM ?= /opt/java/jcm
-+JCM ?= /usr/share/java/jcm.jar
-
- # Location of SwingX Classes.
--SwingX ?= /opt/java/SwingX/swingx.jar
-+SwingX ?= /usr/share/java/swingx1.jar
-
- # Location of the JavaMail Classes (used by Notify; cross-dependency).
--JavaMail ?= /opt/java/javamail/mail.jar
-+JavaMail ?= /usr/share/java/gnumail.jar
-
- JPATH ?= ../..:$(JCM):$(SwingX):$(JavaMail)
- JC ?= javac
Modified: trunk/pirl/debian/patches/series
===================================================================
--- trunk/pirl/debian/patches/series 2012-04-14 14:25:05 UTC (rev 15948)
+++ trunk/pirl/debian/patches/series 2012-04-14 14:34:10 UTC (rev 15949)
@@ -1,5 +1 @@
-1.patch
-2.patch
-3.patch
-6.patch
-7.patch
+all.patch
More information about the pkg-java-commits
mailing list