[SCM] jenkins-remoting packaging branch, master, updated. debian/2.16+dfsg-1-6-g3381843

James Page james.page at ubuntu.com
Sun Feb 17 17:45:15 UTC 2013


The following commit has been merged in the master branch:
commit 4b5e45c83d1c9196c618bd94520f48c21730cc79
Author: James Page <james.page at ubuntu.com>
Date:   Sun Feb 17 17:23:26 2013 +0000

    New upstream release.
    
    * New upstream release.
      - Refreshed patches.

diff --git a/debian/changelog b/debian/changelog
index f3d7b4e..f7c2724 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jenkins-remoting (2.22+dfsg-1~exp1) experimental; urgency=low
+
+  * New upstream release.
+    - Refreshed patches.
+
+ -- James Page <james.page at ubuntu.com>  Sun, 17 Feb 2013 17:20:47 +0000
+
 jenkins-remoting (2.16+dfsg-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/asm3-upgrade.patch b/debian/patches/asm3-upgrade.patch
index 642b548..195e055 100644
--- a/debian/patches/asm3-upgrade.patch
+++ b/debian/patches/asm3-upgrade.patch
@@ -4,11 +4,9 @@ Description: Upgrade of Jenkins codebase to use ASM3 rather than ASM2.
 Author: James Page <james.page at ubuntu.com>
 Forwarded: no
 
-Index: jenkins-remoting/src/test/java/hudson/remoting/ClassRemotingTest.java
-===================================================================
---- jenkins-remoting.orig/src/test/java/hudson/remoting/ClassRemotingTest.java	2012-07-27 14:04:00.079399967 +0100
-+++ jenkins-remoting/src/test/java/hudson/remoting/ClassRemotingTest.java	2012-07-27 14:04:12.839451744 +0100
-@@ -54,7 +54,7 @@
+--- a/src/test/java/hudson/remoting/ClassRemotingTest.java
++++ b/src/test/java/hudson/remoting/ClassRemotingTest.java
+@@ -57,7 +57,7 @@ public class ClassRemotingTest extends R
          // make sure the bytes are what we are expecting
          System.out.println("Resource is "+((byte[])r[1]).length+" bytes");
          ClassReader cr = new ClassReader((byte[])r[1]);
@@ -17,29 +15,8 @@ Index: jenkins-remoting/src/test/java/hudson/remoting/ClassRemotingTest.java
  
          // make sure cache is taking effect
          System.out.println(r[2]);
-Index: jenkins-remoting/src/test/java/hudson/remoting/DummyClassLoader.java
-===================================================================
---- jenkins-remoting.orig/src/test/java/hudson/remoting/DummyClassLoader.java	2012-07-27 14:04:00.079399967 +0100
-+++ jenkins-remoting/src/test/java/hudson/remoting/DummyClassLoader.java	2012-07-27 14:04:12.839451744 +0100
-@@ -64,12 +64,12 @@
- 
-         // rename a class
-         ClassReader cr = new ClassReader(in);
--        ClassWriter w = new ClassWriter(cr,true) {
-+        ClassWriter w = new ClassWriter(cr,0) {
-             public void visit(int version, int access, String _name, String sig, String superName, String[] interfaces) {
-                 super.visit(version, access, name.replace('.','/'), sig, superName, interfaces);
-             }
-         };
--        cr.accept(w,false);
-+        cr.accept(w,0);
- 
-         return w.toByteArray();
-     }
-Index: jenkins-remoting/src/test/java/hudson/remoting/PrefetchTest.java
-===================================================================
---- jenkins-remoting.orig/src/test/java/hudson/remoting/PrefetchTest.java	2012-07-27 14:04:00.079399967 +0100
-+++ jenkins-remoting/src/test/java/hudson/remoting/PrefetchTest.java	2012-07-27 14:04:12.839451744 +0100
+--- a/src/test/java/hudson/remoting/PrefetchTest.java
++++ b/src/test/java/hudson/remoting/PrefetchTest.java
 @@ -24,7 +24,7 @@
  package hudson.remoting;
  
@@ -49,7 +26,7 @@ Index: jenkins-remoting/src/test/java/hudson/remoting/PrefetchTest.java
  
  import java.io.IOException;
  
-@@ -42,8 +42,8 @@
+@@ -42,8 +42,8 @@ public class PrefetchTest extends RmiTes
  
      private static class VerifyTask implements Callable<String,IOException> {
          public String call() throws IOException {
diff --git a/debian/patches/sign-jar.patch b/debian/patches/sign-jar.patch
index 533cef8..076f385 100644
--- a/debian/patches/sign-jar.patch
+++ b/debian/patches/sign-jar.patch
@@ -3,11 +3,9 @@ Description: Use maven-jar-plugin to sign jar as maven-jarsigner-plugin
 Author: James Page <james.page at ubuntu.com>
 Forwarded: not-needed
 
-Index: jenkins-remoting/pom.xml
-===================================================================
---- jenkins-remoting.orig/pom.xml	2012-07-27 14:04:00.019399723 +0100
-+++ jenkins-remoting/pom.xml	2012-07-27 14:04:13.155453026 +0100
-@@ -163,6 +163,18 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -165,6 +165,18 @@ THE SOFTWARE.
              </manifestEntries>
            </archive>
          </configuration>

-- 
jenkins-remoting packaging



More information about the pkg-java-commits mailing list