This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jtharness.
commit 2667cc96271f34fa3b3a9598122e52aa119e5c15 Author: Guillaume Mazoyer <[email protected]> Date: Mon Aug 1 16:53:24 2011 +0000 jtharness: New upstream release, updated patches. --- debian/changelog | 9 +++ debian/control | 1 + debian/patches/01_imports.patch | 75 ++++++++++++++++++++++ .../{dependencies.diff => 02_dependencies.patch} | 20 +++--- debian/patches/rxtx.diff | 68 -------------------- debian/patches/series | 4 +- 6 files changed, 97 insertions(+), 80 deletions(-) diff --git a/debian/changelog b/debian/changelog index c5a4706..6c43b6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <[email protected]> Mon, 01 Aug 2011 17:45:44 +0200 + jtharness (4.3.0-MR1-Rel-b23-1) unstable; urgency=low * Initial release (Closes: #628857). diff --git a/debian/control b/debian/control index bdd7517..1000b38 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends-Indep: default-jdk, 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 diff --git a/debian/patches/01_imports.patch b/debian/patches/01_imports.patch new file mode 100644 index 0000000..e4a8724 --- /dev/null +++ b/debian/patches/01_imports.patch @@ -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 diff --git a/debian/patches/dependencies.diff b/debian/patches/02_dependencies.patch similarity index 62% rename from debian/patches/dependencies.diff rename to debian/patches/02_dependencies.patch index 6bfd27b..20bc85b 100644 --- a/debian/patches/dependencies.diff +++ b/debian/patches/02_dependencies.patch @@ -1,36 +1,36 @@ -## Description: Locate JAR on the file systems +## Description: Locate JAR on the system. ## Origin/Author: Guillaume Mazoyer ## Bug: bug URL -Index: jtharness-4.3.0-MR1-Rel-b23/build/local.properties +Index: jtharness-4.4.0-MR1-Rel-b19/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 +--- 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 = /Users/work/lib/jhall.jar +-jhalljar = jhall.jar +jhalljar = /usr/share/java/jhall.jar # needed only at runtime --jhjar = /Users/work/lib/jh.jar +-jhjar = 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 = comm.jar +jcommjar = /usr/share/java/RXTXcomm.jar # location of jar with servlet API implementation --servletjar = /Users/work/lib/servlet-api.jar +-servletjar = 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 = 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 = /Users/work/lib/junit-4.4.jar +-junitlib = junit-4.4.jar +junitlib = /usr/share/java/junit4.jar # Please specify location where the build distribution (output) will be created diff --git a/debian/patches/rxtx.diff b/debian/patches/rxtx.diff deleted file mode 100644 index 04eafd0..0000000 --- a/debian/patches/rxtx.diff +++ /dev/null @@ -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 diff --git a/debian/patches/series b/debian/patches/series index c19a03c..c62e561 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ -rxtx.diff -dependencies.diff +01_imports.patch +02_dependencies.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jtharness.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
