[jtharness] 21/24: Refreshed the patches

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jtharness.

commit 674b644978cc7838c25666d8d2e627b0bc92a676
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jun 18 17:09:26 2015 +0200

    Refreshed the patches
---
 debian/changelog                     |  4 +++-
 debian/patches/01_imports.patch      | 26 +++++++++-----------------
 debian/patches/02_dependencies.patch |  8 ++++----
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b720bf8..87bfa00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-jtharness (4.4.1-2) UNRELEASED; urgency=medium
+jtharness (4.6-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream relase
+    - Refreshed the patches
   * Moved the package to Git
   * debian/control:
     - Updated the Homepage field
diff --git a/debian/patches/01_imports.patch b/debian/patches/01_imports.patch
index e4a8724..2d1abd0 100644
--- a/debian/patches/01_imports.patch
+++ b/debian/patches/01_imports.patch
@@ -1,10 +1,8 @@
 ## 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
+--- a/src/com/sun/javatest/agent/SerialPortAgentCommand.java
++++ b/src/com/sun/javatest/agent/SerialPortAgentCommand.java
 @@ -28,8 +28,8 @@
  
  import java.io.IOException;
@@ -16,10 +14,8 @@ Index: jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest/agent/SerialPortAgentCom
  
  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
+--- a/src/com/sun/javatest/agent/SerialPortConnection.java
++++ b/src/com/sun/javatest/agent/SerialPortConnection.java
 @@ -31,13 +31,13 @@
  import java.io.InputStream;
  import java.io.OutputStream;
@@ -39,12 +35,10 @@ Index: jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest/agent/SerialPortConnecti
 +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
+--- a/src/com/sun/javatest/agent/SerialPortConnectionFactory.java
++++ b/src/com/sun/javatest/agent/SerialPortConnectionFactory.java
 @@ -27,9 +27,9 @@
  package com.sun.javatest.agent;
  
@@ -58,10 +52,8 @@ Index: jtharness-4.4.0-MR1-Rel-b19/src/com/sun/javatest/agent/SerialPortConnecti
  
  /**
   * 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
+--- a/src/com/sun/javatest/agent/SerialPortModeOptions.java
++++ b/src/com/sun/javatest/agent/SerialPortModeOptions.java
 @@ -31,8 +31,8 @@
  import java.awt.Label;
  import java.util.Enumeration;
diff --git a/debian/patches/02_dependencies.patch b/debian/patches/02_dependencies.patch
index e1eef1d..8c1d5f9 100644
--- a/debian/patches/02_dependencies.patch
+++ b/debian/patches/02_dependencies.patch
@@ -3,8 +3,8 @@
 ## Bug: bug URL
 --- a/build/local.properties
 +++ b/build/local.properties
-@@ -25,24 +25,24 @@
- # questions.
+@@ -26,24 +26,24 @@
+ #
  
  #Please specify location of jhall.jar here - for compilation
 -jhalljar = jhall.jar
@@ -24,11 +24,11 @@
  
  # bytecode library (BCEL or ASM)
  # these are not interchangable
--bytecodelib = asm-3.2.jar:asm-commons-3.2.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 = junit.jar
+-junitlib = junit-4.4.jar
 +junitlib = /usr/share/java/junit4.jar
  
  # Please specify location where the build distribution (output) will be created

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jtharness.git