[pkg-java] r13898 - in trunk/libjtharness-java/debian: . patches
Guillaume Mazoyer
gmazoyer-guest at alioth.debian.org
Mon Aug 1 16:53:25 UTC 2011
Author: gmazoyer-guest
Date: 2011-08-01 16:53:24 +0000 (Mon, 01 Aug 2011)
New Revision: 13898
Added:
trunk/libjtharness-java/debian/patches/01_imports.patch
trunk/libjtharness-java/debian/patches/02_dependencies.patch
Removed:
trunk/libjtharness-java/debian/patches/dependencies.diff
trunk/libjtharness-java/debian/patches/rxtx.diff
Modified:
trunk/libjtharness-java/debian/changelog
trunk/libjtharness-java/debian/control
trunk/libjtharness-java/debian/patches/series
Log:
jtharness: New upstream release, updated patches.
Modified: trunk/libjtharness-java/debian/changelog
===================================================================
--- trunk/libjtharness-java/debian/changelog 2011-07-30 13:40:58 UTC (rev 13897)
+++ trunk/libjtharness-java/debian/changelog 2011-08-01 16:53:24 UTC (rev 13898)
@@ -1,3 +1,12 @@
+jtharness (4.4.0-MR1-Rel-b19-1) unstable; urgency=low
+
+ * New upstream relase.
+ * debian/control: Add Vcs-Svn field.
+ * debian/patches/01_imports.patch: Update patch.
+ * debian/patches/02_dependencies.patch: Update patch.
+
+ -- Guillaume Mazoyer <respawneral at gmail.com> Mon, 01 Aug 2011 17:45:44 +0200
+
jtharness (4.3.0-MR1-Rel-b23-1) unstable; urgency=low
* Initial release (Closes: #628857).
Modified: trunk/libjtharness-java/debian/control
===================================================================
--- trunk/libjtharness-java/debian/control 2011-07-30 13:40:58 UTC (rev 13897)
+++ trunk/libjtharness-java/debian/control 2011-08-01 16:53:24 UTC (rev 13898)
@@ -14,6 +14,7 @@
libservlet3.0-java
Standards-Version: 3.9.2
Homepage: http://jtharness.java.net/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjtharness/
Package: libjtharness-java
Architecture: all
Added: trunk/libjtharness-java/debian/patches/01_imports.patch
===================================================================
--- trunk/libjtharness-java/debian/patches/01_imports.patch (rev 0)
+++ trunk/libjtharness-java/debian/patches/01_imports.patch 2011-08-01 16:53:24 UTC (rev 13898)
@@ -0,0 +1,75 @@
+## Description: Replace imports.
+## Origin/Author: Tom Marble
+## Bug: bug URL
+Index: jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest/agent/SerialPortAgentCommand.java
+===================================================================
+--- jtharness-4.4.0-MR1-Rel-b19.orig/src/com/sun/javatest/agent/SerialPortAgentCommand.java 2011-08-01 18:16:11.692070426 +0200
++++ jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest/agent/SerialPortAgentCommand.java 2011-08-01 18:13:11.619177489 +0200
+@@ -28,8 +28,8 @@
+
+ import java.io.IOException;
+ import java.io.PrintWriter;
+-import javax.comm.NoSuchPortException;
+-import javax.comm.PortInUseException;
++import gnu.io.NoSuchPortException;
++import gnu.io.PortInUseException;
+
+ import com.sun.javatest.Command;
+ import com.sun.javatest.ProductInfo;
+Index: jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest/agent/SerialPortConnection.java
+===================================================================
+--- jtharness-4.4.0-MR1-Rel-b19.orig/src/com/sun/javatest/agent/SerialPortConnection.java 2011-08-01 18:16:11.824071075 +0200
++++ jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest/agent/SerialPortConnection.java 2011-08-01 18:15:32.479875987 +0200
+@@ -31,13 +31,13 @@
+ import java.io.InputStream;
+ import java.io.OutputStream;
+ import java.util.TooManyListenersException;
+-import javax.comm.CommPortIdentifier;
+-import javax.comm.NoSuchPortException;
+-import javax.comm.PortInUseException;
+-import javax.comm.SerialPort;
+-import javax.comm.SerialPortEvent;
+-import javax.comm.SerialPortEventListener;
+-import javax.comm.UnsupportedCommOperationException;
++import gnu.io.CommPortIdentifier;
++import gnu.io.NoSuchPortException;
++import gnu.io.PortInUseException;
++import gnu.io.SerialPort;
++import gnu.io.SerialPortEvent;
++import gnu.io.SerialPortEventListener;
++import gnu.io.UnsupportedCommOperationException;
+
+ /**
+ * A connection via a serial port.
+Index: jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest/agent/SerialPortConnectionFactory.java
+===================================================================
+--- jtharness-4.4.0-MR1-Rel-b19.orig/src/com/sun/javatest/agent/SerialPortConnectionFactory.java 2011-08-01 18:16:12.188072889 +0200
++++ jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest/agent/SerialPortConnectionFactory.java 2011-08-01 18:13:47.755356687 +0200
+@@ -27,9 +27,9 @@
+ package com.sun.javatest.agent;
+
+ import java.io.IOException;
+-import javax.comm.CommPortIdentifier;
+-import javax.comm.NoSuchPortException;
+-import javax.comm.PortInUseException;
++import gnu.io.CommPortIdentifier;
++import gnu.io.NoSuchPortException;
++import gnu.io.PortInUseException;
+
+ /**
+ * A factory for creating connections to be used by agents communicating
+Index: jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest/agent/SerialPortModeOptions.java
+===================================================================
+--- jtharness-4.4.0-MR1-Rel-b19.orig/src/com/sun/javatest/agent/SerialPortModeOptions.java 2011-08-01 18:16:12.324073559 +0200
++++ jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest/agent/SerialPortModeOptions.java 2011-08-01 18:16:09.832061201 +0200
+@@ -31,8 +31,8 @@
+ import java.awt.Label;
+ import java.util.Enumeration;
+ import java.util.Vector;
+-import javax.comm.CommPortIdentifier;
+-import javax.comm.NoSuchPortException;
++import gnu.io.CommPortIdentifier;
++import gnu.io.NoSuchPortException;
+
+
+ // The functionality of SerialPortModeOptions is split in two, to cope
Added: trunk/libjtharness-java/debian/patches/02_dependencies.patch
===================================================================
--- trunk/libjtharness-java/debian/patches/02_dependencies.patch (rev 0)
+++ trunk/libjtharness-java/debian/patches/02_dependencies.patch 2011-08-01 16:53:24 UTC (rev 13898)
@@ -0,0 +1,39 @@
+## Description: Locate JAR on the system.
+## Origin/Author: Guillaume Mazoyer
+## Bug: bug URL
+Index: jtharness-4.4.0-MR1-Rel-b19/build/local.properties
+===================================================================
+--- jtharness-4.4.0-MR1-Rel-b19.orig/build/local.properties 2011-08-01 18:04:57.592727744 +0200
++++ jtharness-4.4.0-MR1-Rel-b19/build/local.properties 2011-08-01 18:04:56.056720129 +0200
+@@ -26,24 +26,24 @@
+ #
+
+ #Please specify location of jhall.jar here - for compilation
+-jhalljar = jhall.jar
++jhalljar = /usr/share/java/jhall.jar
+
+ # needed only at runtime
+-jhjar = jh.jar
++jhjar = /usr/share/java/jh.jar
+
+ # location of jar with with implementation of java serial communications API
+-jcommjar = comm.jar
++jcommjar = /usr/share/java/RXTXcomm.jar
+
+ # location of jar with servlet API implementation
+-servletjar = servlet-api.jar
++servletjar = /usr/share/java/tomcat-servlet-api-3.0.jar
+
+ # bytecode library (BCEL or ASM)
+ # these are not interchangable
+-bytecodelib = asm-3.1.jar:asm-commons-3.1.jar
++bytecodelib = /usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar
+
+ # JUnit Library - Version 4 currently used to compile 3 and 4 support
+-junitlib = junit-4.4.jar
++junitlib = /usr/share/java/junit4.jar
+
+ # Please specify location where the build distribution (output) will be created
+-BUILD_DIR = ../JTHarness-build
++BUILD_DIR = ./jar-build
+
Deleted: trunk/libjtharness-java/debian/patches/dependencies.diff
===================================================================
--- trunk/libjtharness-java/debian/patches/dependencies.diff 2011-07-30 13:40:58 UTC (rev 13897)
+++ trunk/libjtharness-java/debian/patches/dependencies.diff 2011-08-01 16:53:24 UTC (rev 13898)
@@ -1,39 +0,0 @@
-## Description: Locate JAR on the file systems
-## Origin/Author: Guillaume Mazoyer
-## Bug: bug URL
-Index: jtharness-4.3.0-MR1-Rel-b23/build/local.properties
-===================================================================
---- jtharness-4.3.0-MR1-Rel-b23.orig/build/local.properties 2011-06-06 15:26:02.064143117 -0500
-+++ jtharness-4.3.0-MR1-Rel-b23/build/local.properties 2011-06-06 15:26:02.224143117 -0500
-@@ -26,24 +26,24 @@
- #
-
- #Please specify location of jhall.jar here - for compilation
--jhalljar = /Users/work/lib/jhall.jar
-+jhalljar = /usr/share/java/jhall.jar
-
- # needed only at runtime
--jhjar = /Users/work/lib/jh.jar
-+jhjar = /usr/share/java/jh.jar
-
- # location of jar with with implementation of java serial communications API
--jcommjar = /Users/work/lib/comm.jar
-+jcommjar = /usr/share/java/RXTXcomm.jar
-
- # location of jar with servlet API implementation
--servletjar = /Users/work/lib/servlet-api.jar
-+servletjar = /usr/share/java/tomcat-servlet-api-3.0.jar
-
- # bytecode library (BCEL or ASM)
- # these are not interchangable
--bytecodelib = /Users/work/lib/asm-3.1.jar:/Users/work/lib/asm-commons-3.1.jar
-+bytecodelib = /usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar
-
- # JUnit Library - Version 4 currently used to compile 3 and 4 support
--junitlib = /Users/work/lib/junit-4.4.jar
-+junitlib = /usr/share/java/junit4.jar
-
- # Please specify location where the build distribution (output) will be created
--BUILD_DIR = ../JTHarness-build
-+BUILD_DIR = ./jar-build
-
Deleted: trunk/libjtharness-java/debian/patches/rxtx.diff
===================================================================
--- trunk/libjtharness-java/debian/patches/rxtx.diff 2011-07-30 13:40:58 UTC (rev 13897)
+++ trunk/libjtharness-java/debian/patches/rxtx.diff 2011-08-01 16:53:24 UTC (rev 13898)
@@ -1,68 +0,0 @@
-diff -Naur jtharness-4.3.0-MR1-Rel-b23/src/com/sun/javatest/agent/SerialPortAgentCommand.java jtharness-4.3.0-MR1-Rel-b23.rxtx/src/com/sun/javatest/agent/SerialPortAgentCommand.java
---- jtharness-4.3.0-MR1-Rel-b23/src/com/sun/javatest/agent/SerialPortAgentCommand.java 2011-05-30 11:44:46.000000000 -0500
-+++ jtharness-4.3.0-MR1-Rel-b23.rxtx/src/com/sun/javatest/agent/SerialPortAgentCommand.java 2011-05-31 12:50:30.042113241 -0500
-@@ -28,8 +28,8 @@
-
- import java.io.IOException;
- import java.io.PrintWriter;
--import javax.comm.NoSuchPortException;
--import javax.comm.PortInUseException;
-+import gnu.io.NoSuchPortException;
-+import gnu.io.PortInUseException;
-
- import com.sun.javatest.Command;
- import com.sun.javatest.ProductInfo;
-diff -Naur jtharness-4.3.0-MR1-Rel-b23/src/com/sun/javatest/agent/SerialPortConnectionFactory.java jtharness-4.3.0-MR1-Rel-b23.rxtx/src/com/sun/javatest/agent/SerialPortConnectionFactory.java
---- jtharness-4.3.0-MR1-Rel-b23/src/com/sun/javatest/agent/SerialPortConnectionFactory.java 2011-05-30 11:44:46.000000000 -0500
-+++ jtharness-4.3.0-MR1-Rel-b23.rxtx/src/com/sun/javatest/agent/SerialPortConnectionFactory.java 2011-05-31 12:49:56.442113234 -0500
-@@ -27,9 +27,9 @@
- package com.sun.javatest.agent;
-
- import java.io.IOException;
--import javax.comm.CommPortIdentifier;
--import javax.comm.NoSuchPortException;
--import javax.comm.PortInUseException;
-+import gnu.io.CommPortIdentifier;
-+import gnu.io.NoSuchPortException;
-+import gnu.io.PortInUseException;
-
- /**
- * A factory for creating connections to be used by agents communicating
-diff -Naur jtharness-4.3.0-MR1-Rel-b23/src/com/sun/javatest/agent/SerialPortConnection.java jtharness-4.3.0-MR1-Rel-b23.rxtx/src/com/sun/javatest/agent/SerialPortConnection.java
---- jtharness-4.3.0-MR1-Rel-b23/src/com/sun/javatest/agent/SerialPortConnection.java 2011-05-30 11:44:46.000000000 -0500
-+++ jtharness-4.3.0-MR1-Rel-b23.rxtx/src/com/sun/javatest/agent/SerialPortConnection.java 2011-05-31 12:50:15.502113238 -0500
-@@ -31,13 +31,13 @@
- import java.io.InputStream;
- import java.io.OutputStream;
- import java.util.TooManyListenersException;
--import javax.comm.CommPortIdentifier;
--import javax.comm.NoSuchPortException;
--import javax.comm.PortInUseException;
--import javax.comm.SerialPort;
--import javax.comm.SerialPortEvent;
--import javax.comm.SerialPortEventListener;
--import javax.comm.UnsupportedCommOperationException;
-+import gnu.io.CommPortIdentifier;
-+import gnu.io.NoSuchPortException;
-+import gnu.io.PortInUseException;
-+import gnu.io.SerialPort;
-+import gnu.io.SerialPortEvent;
-+import gnu.io.SerialPortEventListener;
-+import gnu.io.UnsupportedCommOperationException;
-
- /**
- * A connection via a serial port.
-diff -Naur jtharness-4.3.0-MR1-Rel-b23/src/com/sun/javatest/agent/SerialPortModeOptions.java jtharness-4.3.0-MR1-Rel-b23.rxtx/src/com/sun/javatest/agent/SerialPortModeOptions.java
---- jtharness-4.3.0-MR1-Rel-b23/src/com/sun/javatest/agent/SerialPortModeOptions.java 2011-05-30 11:44:46.000000000 -0500
-+++ jtharness-4.3.0-MR1-Rel-b23.rxtx/src/com/sun/javatest/agent/SerialPortModeOptions.java 2011-05-31 12:49:36.710113228 -0500
-@@ -31,8 +31,8 @@
- import java.awt.Label;
- import java.util.Enumeration;
- import java.util.Vector;
--import javax.comm.CommPortIdentifier;
--import javax.comm.NoSuchPortException;
-+import gnu.io.CommPortIdentifier;
-+import gnu.io.NoSuchPortException;
-
-
- // The functionality of SerialPortModeOptions is split in two, to cope
Modified: trunk/libjtharness-java/debian/patches/series
===================================================================
--- trunk/libjtharness-java/debian/patches/series 2011-07-30 13:40:58 UTC (rev 13897)
+++ trunk/libjtharness-java/debian/patches/series 2011-08-01 16:53:24 UTC (rev 13898)
@@ -1,2 +1,2 @@
-rxtx.diff
-dependencies.diff
+01_imports.patch
+02_dependencies.patch
More information about the pkg-java-commits
mailing list