[SCM] jenkins-remoting packaging branch, master, updated. debian/2.11+dfsg-1-5-gdc21f5f
James Page
james.page at ubuntu.com
Wed Sep 19 10:32:43 UTC 2012
The following commit has been merged in the master branch:
commit dbc8ceaea58e5c44447a9b9560d865f0898d91ee
Merge: 4b451576ab0bd0c8d7ec13a3340ec8387d6a3ee3 a4e33b03deaac8dde20f31fa0cecb7c38e8deb79
Author: James Page <james.page at ubuntu.com>
Date: Fri Jul 27 15:27:37 2012 +0100
Imported Debian patch 2.16+dfsg-0ubuntu1
diff --combined debian/changelog
index 4ec974b,0000000..72b7772
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,0 +1,26 @@@
++jenkins-remoting (2.16+dfsg-0ubuntu1) quantal; urgency=low
++
++ * New upstream release.
++ - Refreshed patches.
++
++ -- James Page <james.page at ubuntu.com> Fri, 27 Jul 2012 15:27:37 +0100
++
+jenkins-remoting (2.11+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Bumped Standards-Version: 3.9.3:
+ - d/copyright: Updated Format field to refer to v1.0 of spec.
+ * d/control: Tidied linitian warning about Description.
+
+ -- James Page <james.page at ubuntu.com> Thu, 26 Apr 2012 09:21:27 +0100
+
+jenkins-remoting (2.4+dfsg-1) unstable; urgency=low
+
+ [James Page]
+ * Initial release (Closes: #654858).
+
+ [tony mancill]
+ * Set DMUA flag.
+ * Tweak d/copyright.
+
+ -- James Page <james.page at ubuntu.com> Fri, 06 Jan 2012 10:15:43 +0000
diff --combined debian/control
index b6c0964,0000000..f795135
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,51 -1,0 +1,52 @@@
+Source: jenkins-remoting
+Section: java
+Priority: optional
- Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
++Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
++XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: James Page <james.page at ubuntu.com>
+DM-Upload-Allowed: yes
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep:
+ default-jdk-doc,
+ jenkins-test-annotations,
+ junit (>= 3.8),
+ libanimal-sniffer-java,
+ libanimal-sniffer-java-doc,
+ libargs4j-java,
+ libargs4j-java-doc,
+ libasm3-java,
+ libcommons-codec-java,
+ libcommons-codec-java-doc,
+ libcommons-io-java,
+ libcommons-io-java-doc,
+ libmaven-dependency-plugin-java,
+ libmaven-javadoc-plugin-java
+Standards-Version: 3.9.3
+Vcs-Git: git://git.debian.org/git/pkg-java/jenkins-remoting.git
+Vcs-Browser: http://git.debian.org/?p=pkg-java/jenkins-remoting.git
+Homepage: http://jenkins-ci.org
+
+Package: libjenkins-remoting-java
+Architecture: all
+Depends: ${maven:Depends}, ${misc:Depends}
+Recommends: ${maven:OptionalDepends}
+Suggests: libjenkins-remoting-java-doc
+Description: Bridge separate JVMs into a single semi-shared space
+ Allows separate JVMs to be bridged into a single semi-shared space.
+ .
+ This package is primarily used by Jenkins for slave node management but
+ has potential re-use outside of this project.
+
+Package: libjenkins-remoting-java-doc
+Architecture: all
+Section: doc
+Depends: ${maven:DocDepends}, ${misc:Depends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libjenkins-remoting-java
+Description: Documentation for jenkins-remoting
+ Allows separate JVMs to be bridged into a single semi-shared space.
+ .
+ This package is primarily used by Jenkins for slave node management but
+ has potential re-use outside of this project.
+ .
+ This package contains the API documentation of jenkins-remoting.
diff --combined debian/patches/asm3-upgrade.patch
index 6f23341,0000000..642b548
mode 100644,000000..100644
--- a/debian/patches/asm3-upgrade.patch
+++ b/debian/patches/asm3-upgrade.patch
@@@ -1,62 -1,0 +1,62 @@@
+Description: Upgrade of Jenkins codebase to use ASM3 rather than ASM2.
+ This is required because Ubuntu/Debian builds against later versions
+ of libraries which have already transitioned.
+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 2011-11-22 08:20:17.199239028 +0000
- +++ jenkins-remoting/src/test/java/hudson/remoting/ClassRemotingTest.java 2011-11-22 08:20:36.675223199 +0000
- @@ -48,7 +48,7 @@
++--- 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 @@
+ // 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]);
+- cr.accept(new EmptyVisitor(),false);
++ cr.accept(new EmptyVisitor(),0);
+
+ // 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 2011-11-22 08:20:17.151239067 +0000
- +++ jenkins-remoting/src/test/java/hudson/remoting/DummyClassLoader.java 2011-11-22 08:20:36.675223199 +0000
++--- 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 2011-11-22 08:20:17.167239054 +0000
- +++ jenkins-remoting/src/test/java/hudson/remoting/PrefetchTest.java 2011-11-22 08:20:36.675223199 +0000
++--- 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
+@@ -24,7 +24,7 @@
+ package hudson.remoting;
+
+ import org.objectweb.asm.ClassReader;
+-import org.objectweb.asm.attrs.StackMapAttribute;
++import org.objectweb.asm.Label;
+
+ import java.io.IOException;
+
+@@ -42,8 +42,8 @@
+
+ private static class VerifyTask implements Callable<String,IOException> {
+ public String call() throws IOException {
+- StackMapAttribute sma = new StackMapAttribute();
+- return Which.jarFile(sma.getClass()).getPath();
++ Label l = new Label();
++ return Which.jarFile(l.getClass()).getPath();
+ }
+ }
+ }
diff --combined debian/patches/sign-jar.patch
index c19d5cc,0000000..533cef8
mode 100644,000000..100644
--- a/debian/patches/sign-jar.patch
+++ b/debian/patches/sign-jar.patch
@@@ -1,28 -1,0 +1,28 @@@
+Description: Use maven-jar-plugin to sign jar as maven-jarsigner-plugin
+ is not yet packaged for debian.
+Author: James Page <james.page at ubuntu.com>
+Forwarded: not-needed
+
+Index: jenkins-remoting/pom.xml
+===================================================================
- --- jenkins-remoting.orig/pom.xml 2012-01-06 11:24:05.503380716 +0000
- +++ jenkins-remoting/pom.xml 2012-01-06 11:37:16.508294293 +0000
- @@ -160,6 +160,18 @@
- </manifest>
++--- 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 @@
++ </manifestEntries>
+ </archive>
+ </configuration>
++ <executions>
++ <execution>
++ <goals>
++ <goal>sign</goal>
++ </goals>
++ <configuration>
++ <alias>${hudson.sign.alias}</alias>
++ <storepass>${hudson.sign.storepass}</storepass>
++ <keystore>${hudson.sign.keystore}</keystore>
++ </configuration>
++ </execution>
++ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jarsigner-plugin</artifactId>
--
jenkins-remoting packaging
More information about the pkg-java-commits
mailing list