Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: apache-log4j1.2

apache-log4j1.2 (1.2.17-7ubuntu1) xenial; urgency=low * Merge from Debian unstable. Remaining changes: - d/{rules,control}: Remove dependency on bnd and don't add OSGi headers to jar file. - d/liblog4j1.2.manifest,control,rules: Add OSGi manifest for log4j using javahelper. - d/control,rules: Switch libmail-java -> libgnumail-java to avoid Maven in Ubuntu main. -- James Page <james.page@ubuntu.com> Mon, 07 Mar 2016 15:29:00 +0000

Modifications :
  1. Download patch debian/rules

    --- 1.2.17-7/debian/rules 2015-11-17 17:22:57.000000000 +0000 +++ 1.2.17-7ubuntu1/debian/rules 2016-03-07 14:58:35.000000000 +0000 @@ -1,13 +1,14 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/javahelper.mk include /usr/share/cdbs/1/class/ant.mk PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) JAVA_HOME := /usr/lib/jvm/default-java ANT_HOME := /usr/share/ant -DEB_JARS := javax.mail +DEB_JARS := gnumail DEB_ANT_BUILD_TARGET := jar javadoc DEB_ANT_ARGS := -Dversion=$(VERSION) @@ -19,13 +20,6 @@ clean:: mh_clean common-build-indep:: - cat debian/log4j.bnd | sed s/VERSION/$(VERSION)/ > debian/.log4j-versioned.bnd - java -jar /usr/share/java/bnd.jar wrap --properties debian/.log4j-versioned.bnd dist/lib/log4j-$(VERSION).jar - java -jar /usr/share/java/bnd.jar wrap --properties debian/.log4j-versioned.bnd \ - --classpath /usr/share/java/javax.mail.jar \ - --output log4j.jar dist/lib/log4j-$(VERSION).jar - rm debian/.log4j-versioned.bnd dist/lib/log4j-$(VERSION).jar - mv log4j.jar dist/lib/log4j-$(VERSION).jar cp pom.xml dist/lib/log4j.javadoc.pom jar cvf dist/lib/log4j.javadoc.jar -C docs/api/ .
  2. Download patch debian/control

    --- 1.2.17-7/debian/control 2015-11-17 17:22:57.000000000 +0000 +++ 1.2.17-7ubuntu1/debian/control 2016-03-07 14:58:20.000000000 +0000 @@ -1,19 +1,20 @@ Source: apache-log4j1.2 Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Varun Hiremath <varun@debian.org>, Torsten Werner <twerner@debian.org>, Ludovic Claude <ludovic.claude@laposte.net>, Jakub Adam <jakub.adam@ktknet.cz>, Emmanuel Bourg <ebourg@apache.org> Build-Depends: ant, - bnd (>= 2.1.0), cdbs, debhelper (>= 9), default-jdk, default-jdk-doc, - libmail-java, + javahelper, + libgnumail-java, maven-repo-helper Standards-Version: 3.9.6 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/apache-log4j1.2 @@ -23,7 +24,7 @@ Homepage: http://logging.apache.org/log4 Package: liblog4j1.2-java Architecture: all Depends: ${misc:Depends} -Suggests: libmail-java, liblog4j1.2-java-doc +Suggests: libgnumail-java, liblog4j1.2-java-doc Description: Logging library for java log4j is a tool to help the programmer output log statements to a variety of output targets.
  3. Download patch debian/liblog4j1.2-java.manifest

    --- 1.2.17-7/debian/liblog4j1.2-java.manifest 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.17-7ubuntu1/debian/liblog4j1.2-java.manifest 2014-03-25 09:25:45.000000000 +0000 @@ -0,0 +1,9 @@ +/usr/share/java/log4j-1.2.jar: + Bundle-SymbolicName: org.apache.log4j + Bundle-ManifestVersion: 2 + Bundle-Name: Apache Log4j + Bundle-Version: 1.2.17 + Bundle-Vendor: Apache Software Foundation + Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt + Export-Package: org.apache.log4j.net;uses:="org.apache.log4j,org.apache.log4j.spi,javax.mail,org.apache.log4j.helpers,org.apache.log4j.xml,javax.mail.internet",org.apache.log4j.jmx;uses:="org.apache.log4j,javax.management,org.apache.log4j.helpers,org.apache.log4j.spi",org.apache.log4j.jdbc;uses:="org.apache.log4j,org.apache.log4j.spi",org.apache.log4j.config;uses:="org.apache.log4j.helpers,org.apache.log4j,org.apache.log4j.spi",org.apache.log4j.helpers;uses:="org.apache.log4j,org.apache.log4j.spi",org.apache.log4j;uses:="org.apache.log4j.spi,org.apache.log4j.helpers,org.apache.log4j.or,org.apache.log4j.config",org.apache.log4j.nt;uses:="org.apache.log4j.helpers,org.apache.log4j,org.apache.log4j.spi",org.apache.log4j.or.sax;uses:="org.apache.log4j.or",org.apache.log4j.spi;uses:="org.apache.log4j,org.apache.log4j.helpers,com.ibm.uvm.tools,org.apache.log4j.or",org.apache.log4j.or;uses:="org.apache.log4j.helpers,org.apache.log4j.spi,org.apache.log4j",org.apache.log4j.xml;uses:="org.apache.log4j.config,org.apache.log4j.helpers,org.apache.log4j,org.apache.log4j.spi,org.apache.log4j.or",org.apache.log4j.varia;uses:="org.apache.log4j.spi,org.apache.log4j,org.apache.log4j.helpers" + Import-Package: com.ibm.uvm.tools;resolution:=optional,javax.mail;resolution:=optional,javax.mail.internet;resolution:=optional,javax.management;resolution:=optional,javax.naming;resolution:=optional,javax.swing;resolution:=optional,javax.swing.border;resolution:=optional,javax.swing.event;resolution:=optional,javax.swing.table;resolution:=optional,javax.swing.text;resolution:=optional,javax.swing.tree;resolution:=optional

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: commons-configuration

commons-configuration (1.10-4ubuntu1) xenial; urgency=medium * Merge from Debian unstable. Remaining changes: - Build-depend on libmaven-scm-java to fix FTBFS. * Build-depend on libmaven-scm-providers-java as well. -- Logan Rosen <logan@ubuntu.com> Thu, 17 Dec 2015 19:14:01 -0500

Modifications :
  1. Download patch debian/control

    --- 1.10-4/debian/control 2015-12-17 07:59:53.000000000 +0000 +++ 1.10-4ubuntu1/debian/control 2015-12-18 00:19:58.000000000 +0000 @@ -1,7 +1,8 @@ Source: commons-configuration Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Torsten Werner <twerner@debian.org>, Damien Raude-Morvan <drazzib@debian.org>, Emmanuel Bourg <ebourg@apache.org> @@ -33,6 +34,8 @@ Build-Depends-Indep: ant, libcommons-vfs-java-doc, libjavacc-maven-plugin-java, libmaven-javadoc-plugin-java, + libmaven-scm-java, + libmaven-scm-providers-java, libservlet3.1-java Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/commons-configuration.git

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: derby

derby (10.13.1.1-2ubuntu1) zesty; urgency=medium * Add transitional packages to take over unmaintained sun-javadb * Add Breaks/Replaces against sun-javadb packages that shipped the same filenames (LP: #1276353) -- Jeremy Bicha <jbicha@ubuntu.com> Tue, 20 Dec 2016 12:22:52 -0500

Modifications :
  1. Download patch debian/control

    --- 10.13.1.1-2/debian/control 2016-12-19 01:13:07.000000000 +0000 +++ 10.13.1.1-2ubuntu1/debian/control 2016-12-20 17:22:52.000000000 +0000 @@ -1,7 +1,8 @@ Source: derby Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Tim Booth <tbooth@ceh.ac.uk>, Emmanuel Bourg <ebourg@apache.org> Build-Depends: ant (>= 1.7), debhelper (>= 9), @@ -21,6 +22,8 @@ Homepage: http://db.apache.org/derby/ Package: libderbyclient-java Architecture: all Depends: ${misc:Depends} +Breaks: sun-javadb-client (<< 10.13.1.1) +Replaces: sun-javadb-client (<< 10.13.1.1) Suggests: derby-doc, derby-tools Description: Apache Derby Client JDBC Driver The Derby network client provides network connectivity to the Derby Network @@ -35,6 +38,8 @@ Description: Apache Derby Client JDBC Dr Package: libderby-java Architecture: all Depends: ${misc:Depends} +Breaks: sun-javadb-core (<< 10.13.1.1) +Replaces: sun-javadb-core (<< 10.13.1.1) Suggests: derby-doc Description: Apache Derby Database Engine and Embedded JDBC Driver Apache Derby is an open source relational database implemented entirely @@ -94,3 +99,43 @@ Description: Apache Derby API documentat . This package contains a Javadoc documenting the API and demo software for Apache Derby. + +Package: sun-javadb-client +Depends: libderbyclient-java, ${misc:Depends} +Architecture: all +Priority: extra +Section: oldlibs +Description: Apache Derby Client JDBC Driver (transitional package) + This is a transitional package and can safely be removed. + +Package: sun-javadb-core +Depends: libderby-java, derby-tools, ${misc:Depends} +Architecture: all +Priority: extra +Section: oldlibs +Description: Apache Derby Database Engine (transitional package) + This is a transitional package and can safely be removed. + +Package: sun-javadb-demo +Depends: derby-doc, ${misc:Depends} +Architecture: all +Priority: extra +Section: oldlibs +Description: Apache Derby API documentation and examples (transitional pkg) + This is a transitional package and can safely be removed. + +Package: sun-javadb-doc +Depends: derby-doc, ${misc:Depends} +Architecture: all +Priority: extra +Section: oldlibs +Description: Apache Derby API documentation and examples (transitional pkg) + This is a transitional package and can safely be removed. + +Package: sun-javadb-javadoc +Depends: derby-doc, ${misc:Depends} +Architecture: all +Priority: extra +Section: oldlibs +Description: Apache Derby API documentation and examples (transitional pkg) + This is a transitional package and can safely be removed.

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: dom4j

dom4j (1.6.1+dfsg.3-2ubuntu1) saucy; urgency=low * Drop support for XSD; this requires libmsv-java which is built using maven2 which is not in main: - d/control: Remove dependencies on libmsv-java. - d/rules: Don't include xsdlib on build classpath. - d/p/07_disable_xsd_support.patch: Patch out compilation and testing of XSD support features. -- James Page <james.page@ubuntu.com> Tue, 02 Jul 2013 13:27:34 +0100

Modifications :
  1. Download patch debian/rules

    --- 1.6.1+dfsg.3-2/debian/rules 2013-06-26 21:29:09.000000000 +0000 +++ 1.6.1+dfsg.3-2ubuntu1/debian/rules 2013-07-02 12:01:53.000000000 +0000 @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java DEB_JARS := ant ant-launcher xpp2 xpp3 jaxen \ - xalan2 xercesImpl ant-junit junit junitperf xsdlib + xalan2 xercesImpl ant-junit junit junitperf DEB_ANT_BUILD_TARGET := package release-javadoc DEB_ANT_CHECK_TARGET := test
  2. Download patch debian/control

    --- 1.6.1+dfsg.3-2/debian/control 2013-06-26 21:12:47.000000000 +0000 +++ 1.6.1+dfsg.3-2ubuntu1/debian/control 2013-07-02 12:06:11.000000000 +0000 @@ -1,12 +1,12 @@ Source: dom4j Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Marcus Better <marcus@better.se>, Emmanuel Bourg <ebourg@apache.org> Build-Depends: debhelper (>= 7), ant-optional, default-jdk, maven-repo-helper, cdbs Build-Depends-Indep: antlr, libjaxen-java, libxpp2-java, libxpp3-java, - libxerces2-java, libxalan2-java (>= 2.7.0), junit, libjunitperf-java, libmsv-java, - librelaxng-datatype-java + libxerces2-java, libxalan2-java (>= 2.7.0), junit, libjunitperf-java Standards-Version: 3.9.4 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/dom4j Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/dom4j @@ -14,7 +14,7 @@ Homepage: http://sourceforge.net/project Package: libdom4j-java Architecture: all -Depends: ${misc:Depends}, libjaxen-java, libmsv-java, libxpp2-java, libxpp3-java +Depends: ${misc:Depends}, libjaxen-java, libxpp2-java, libxpp3-java Suggests: libdom4j-java-doc Description: flexible XML framework for Java dom4j is a library for working with XML, XPath and XSLT on the Java
  3. Download patch .pc/applied-patches

    --- 1.6.1+dfsg.3-2/.pc/applied-patches 2013-07-02 14:36:06.519509241 +0000 +++ 1.6.1+dfsg.3-2ubuntu1/.pc/applied-patches 2013-07-02 14:36:06.931519849 +0000 @@ -4,3 +4,4 @@ 04_headless-test.patch 05_java7-compat.patch 06_dom-level3-support.patch +07_disable_xsd_support.patch
  4. Download patch debian/patches/series

    --- 1.6.1+dfsg.3-2/debian/patches/series 2013-06-26 19:35:23.000000000 +0000 +++ 1.6.1+dfsg.3-2ubuntu1/debian/patches/series 2013-07-02 12:20:07.000000000 +0000 @@ -4,3 +4,4 @@ 04_headless-test.patch 05_java7-compat.patch 06_dom-level3-support.patch +07_disable_xsd_support.patch
  5. Download patch build.xml

    --- 1.6.1+dfsg.3-2/build.xml 2013-07-02 14:36:06.000000000 +0000 +++ 1.6.1+dfsg.3-2ubuntu1/build.xml 2013-07-02 14:36:06.000000000 +0000 @@ -155,6 +155,9 @@ source="1.3" deprecation="${deprecation}" classpathref="compile.classpath"> + <exclude name="org/dom4j/datatype/**"/> + <exclude name="org/dom4j/io/STAXEventReader.java"/> + <exclude name="org/dom4j/io/STAXEventWriter.java"/> </javac> </target> @@ -169,6 +172,8 @@ optimize="${optimize}" deprecation="${deprecation}" classpathref="test.classpath"> + <exclude name="org/dom4j/datatype/**"/> + <exclude name="org/dom4j/io/StaxTest.java"/> </javac> </target> @@ -292,6 +297,7 @@ <fileset dir="${test.dir}"> <include name="**/*Test.java" /> <exclude name="**/AllTests.java,**/Abstract*.java,**/TestCase.java" /> + <exclude name="**/StaxTest.java,**/datatype/*Test.java" /> </fileset> </batchtest> </junit>
  6. Download patch debian/patches/07_disable_xsd_support.patch

    --- 1.6.1+dfsg.3-2/debian/patches/07_disable_xsd_support.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.6.1+dfsg.3-2ubuntu1/debian/patches/07_disable_xsd_support.patch 2013-07-02 12:22:34.000000000 +0000 @@ -0,0 +1,29 @@ +--- a/build.xml ++++ b/build.xml +@@ -155,6 +155,9 @@ + source="1.3" + deprecation="${deprecation}" + classpathref="compile.classpath"> ++ <exclude name="org/dom4j/datatype/**"/> ++ <exclude name="org/dom4j/io/STAXEventReader.java"/> ++ <exclude name="org/dom4j/io/STAXEventWriter.java"/> + </javac> + </target> + +@@ -169,6 +172,8 @@ + optimize="${optimize}" + deprecation="${deprecation}" + classpathref="test.classpath"> ++ <exclude name="org/dom4j/datatype/**"/> ++ <exclude name="org/dom4j/io/StaxTest.java"/> + </javac> + </target> + +@@ -292,6 +297,7 @@ + <fileset dir="${test.dir}"> + <include name="**/*Test.java" /> + <exclude name="**/AllTests.java,**/Abstract*.java,**/TestCase.java" /> ++ <exclude name="**/StaxTest.java,**/datatype/*Test.java" /> + </fileset> + </batchtest> + </junit>
  7. Download patch .pc/07_disable_xsd_support.patch/build.xml

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: excalibur-logkit

excalibur-logkit (2.0-11ubuntu2) xenial; urgency=medium * Switch back to Servlet API 3.1 (LP: #1539903) -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 22 Feb 2016 15:19:27 +0100 excalibur-logkit (2.0-11ubuntu1) vivid; urgency=medium * Update for continued main inclusion in Ubuntu: - d/control: Switch libmail-java -> libgnumail-java. - d/control,rules: Switch Servlet API 3.1 -> 3.0; this should be revisited when work begins on Tomcat 7->8 transition in Ubuntu main. -- James Page <james.page@ubuntu.com> Tue, 25 Nov 2014 16:39:11 +0000

Modifications :
  1. Download patch debian/control

    --- 2.0-11/debian/control 2014-10-22 08:57:03.000000000 +0000 +++ 2.0-11ubuntu2/debian/control 2016-02-22 14:19:26.000000000 +0000 @@ -1,12 +1,13 @@ Source: excalibur-logkit Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Onkar Shinde <onkarshinde@ubuntu.com>, Emmanuel Bourg <ebourg@apache.org> Build-Depends: debhelper (>= 9), cdbs, javahelper, ant Build-Depends-Indep: default-jdk, default-jdk-doc, ant-optional, junit, - libgeronimo-jms-1.1-spec-java, libmail-java, liblog4j1.2-java, libservlet3.1-java, - libmail-java-doc, liblog4j1.2-java-doc, libservlet3.1-java-doc, maven-repo-helper + libgeronimo-jms-1.1-spec-java, libgnumail-java, liblog4j1.2-java, libservlet3.1-java, + libgnumail-java-doc, liblog4j1.2-java-doc, libservlet3.1-java-doc, maven-repo-helper Standards-Version: 3.9.6 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/excalibur-logkit/ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/excalibur-logkit/

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: geronimo-jacc-1.1-spec

geronimo-jacc-1.1-spec (1.0.1-2fakesync1ubuntu1) yakkety; urgency=medium * Fake sync due to mismatching tarball. -- Matthias Klose <doko@ubuntu.com> Wed, 05 Oct 2016 11:12:00 +0200

Modifications :
  1. Download patch src/main/java/javax/security/jacc/WebResourcePermission.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/WebResourcePermission.java 2008-01-23 08:45:36.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/WebResourcePermission.java 2008-01-23 08:45:36.000000000 +0000 @@ -36,7 +36,7 @@ import java.util.Enumeration; import javax.servlet.http.HttpServletRequest; /** - * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (Mi, 23 Jan 2008) $ + * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (mer. 23 janv. 2008) $ */ public final class WebResourcePermission extends Permission implements Serializable { private transient int cachedHashCode = 0;
  2. Download patch src/test/java/javax/security/jacc/WebRoleRefPermissionTest.java

    --- 1.0.1-2/src/test/java/javax/security/jacc/WebRoleRefPermissionTest.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/test/java/javax/security/jacc/WebRoleRefPermissionTest.java 2006-10-25 04:01:51.000000000 +0000 @@ -28,7 +28,7 @@ package javax.security.jacc; import junit.framework.TestCase; /** - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public class WebRoleRefPermissionTest extends TestCase {
  3. Download patch .pc/02-servlet-3.1-compatibility.patch/src/test/java/javax/security/jacc/MockHttpServletRequest.java

    --- 1.0.1-2/.pc/02-servlet-3.1-compatibility.patch/src/test/java/javax/security/jacc/MockHttpServletRequest.java 2008-01-23 08:45:36.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/.pc/02-servlet-3.1-compatibility.patch/src/test/java/javax/security/jacc/MockHttpServletRequest.java 2008-01-23 08:45:36.000000000 +0000 @@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpSession; /** - * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (Mi, 23 Jan 2008) $ + * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (mer. 23 janv. 2008) $ */ public class MockHttpServletRequest implements HttpServletRequest {
  4. Download patch src/test/java/javax/security/jacc/MockHttpServletRequest.java

    --- 1.0.1-2/src/test/java/javax/security/jacc/MockHttpServletRequest.java 2016-10-05 12:39:28.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/test/java/javax/security/jacc/MockHttpServletRequest.java 2016-10-05 12:39:28.000000000 +0000 @@ -43,7 +43,7 @@ import javax.servlet.http.HttpUpgradeHan import javax.servlet.http.Part; /** - * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (Mi, 23 Jan 2008) $ + * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (mer. 23 janv. 2008) $ */ public class MockHttpServletRequest implements HttpServletRequest {
  5. Download patch src/test/java/javax/security/jacc/WebResourcePermissionTest.java

    --- 1.0.1-2/src/test/java/javax/security/jacc/WebResourcePermissionTest.java 2008-01-23 08:45:36.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/test/java/javax/security/jacc/WebResourcePermissionTest.java 2008-01-23 08:45:36.000000000 +0000 @@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletReq import junit.framework.TestCase; /** - * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (Mi, 23 Jan 2008) $ + * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (mer. 23 janv. 2008) $ */ public class WebResourcePermissionTest extends TestCase {
  6. Download patch debian/control

    --- 1.0.1-2/debian/control 2016-05-30 10:33:54.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/debian/control 2016-10-05 09:12:00.000000000 +0000 @@ -1,7 +1,8 @@ Source: geronimo-jacc-1.1-spec Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Chris Grzegorczyk <grze@eucalyptus.com>, Graziano Obertelli <graziano@eucalyptus.com>, Kyo Lee <kyo.lee@eucalyptus.com> Build-Depends: default-jdk, debhelper (>= 9), maven-debian-helper, libservlet3.1-java, junit Standards-Version: 3.9.8
  7. Download patch src/main/java/javax/security/jacc/PolicyContextException.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/PolicyContextException.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/PolicyContextException.java 2006-10-25 04:01:51.000000000 +0000 @@ -26,7 +26,7 @@ package javax.security.jacc; /** - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public class PolicyContextException extends Exception {
  8. Download patch src/main/java/javax/security/jacc/PolicyContextHandler.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/PolicyContextHandler.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/PolicyContextHandler.java 2006-10-25 04:01:51.000000000 +0000 @@ -36,7 +36,7 @@ package javax.security.jacc; * activated via the <code>PolicyContext</code> class must implement the * <code>PolicyContextHandler</code> interface. * - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public interface PolicyContextHandler {
  9. Download patch src/main/java/javax/security/jacc/WebRoleRefPermission.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/WebRoleRefPermission.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/WebRoleRefPermission.java 2006-10-25 04:01:51.000000000 +0000 @@ -29,7 +29,7 @@ import java.io.Serializable; import java.security.Permission; /** - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public final class WebRoleRefPermission extends Permission implements Serializable { private transient int cachedHashCode = 0;
  10. Download patch src/main/java/javax/security/jacc/PolicyConfigurationFactory.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/PolicyConfigurationFactory.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/PolicyConfigurationFactory.java 2006-10-25 04:01:51.000000000 +0000 @@ -43,7 +43,7 @@ import java.security.SecurityPermission; * @see PolicyConfiguration * @see PolicyContextException * - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public abstract class PolicyConfigurationFactory {
  11. Download patch src/main/java/javax/security/jacc/WebUserDataPermission.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/WebUserDataPermission.java 2008-01-23 08:45:36.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/WebUserDataPermission.java 2008-01-23 08:45:36.000000000 +0000 @@ -43,7 +43,7 @@ import javax.servlet.http.HttpServletReq * The name of a WebUserDataPermission (also referred to as the target name) * identifies a Web resource by its context path relative URL pattern. * - * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (Mi, 23 Jan 2008) $ + * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (mer. 23 janv. 2008) $ * * @see java.security.Permission */
  12. Download patch debian/patches/02-servlet-3.1-compatibility.patch

    --- 1.0.1-2/debian/patches/02-servlet-3.1-compatibility.patch 2016-05-30 10:54:32.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/debian/patches/02-servlet-3.1-compatibility.patch 2016-10-05 09:12:00.000000000 +0000 @@ -1,9 +1,11 @@ Description: Fix the compatibility with the Servlet API 3.1 Author: Emmanuel Bourg <ebourg@apache.org> Forwarded: no +Index: b/src/test/java/javax/security/jacc/MockHttpServletRequest.java +=================================================================== --- a/src/test/java/javax/security/jacc/MockHttpServletRequest.java +++ b/src/test/java/javax/security/jacc/MockHttpServletRequest.java -@@ -23,14 +23,24 @@ +@@ -23,14 +23,24 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.security.Principal; @@ -27,8 +29,8 @@ Forwarded: no +import javax.servlet.http.Part; /** - * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (Mi, 23 Jan 2008) $ -@@ -268,4 +278,64 @@ + * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (mer. 23 janv. 2008) $ +@@ -268,4 +278,64 @@ public class MockHttpServletRequest impl public int getLocalPort() { return 0; }
  13. Download patch src/test/java/javax/security/jacc/EJBMethodPermissionCollectionTest.java

    --- 1.0.1-2/src/test/java/javax/security/jacc/EJBMethodPermissionCollectionTest.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/test/java/javax/security/jacc/EJBMethodPermissionCollectionTest.java 2006-10-25 04:01:51.000000000 +0000 @@ -31,7 +31,7 @@ import java.security.PermissionCollectio /** - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public class EJBMethodPermissionCollectionTest extends TestCase {
  14. Download patch src/test/java/javax/security/jacc/WebUserDataPermissionTest.java

    --- 1.0.1-2/src/test/java/javax/security/jacc/WebUserDataPermissionTest.java 2008-01-23 08:45:36.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/test/java/javax/security/jacc/WebUserDataPermissionTest.java 2008-01-23 08:45:36.000000000 +0000 @@ -35,7 +35,7 @@ import java.security.Permission; import junit.framework.TestCase; /** - * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (Mi, 23 Jan 2008) $ + * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (mer. 23 janv. 2008) $ */ public class WebUserDataPermissionTest extends TestCase {
  15. Download patch src/main/java/javax/security/jacc/URLPatternSpec.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/URLPatternSpec.java 2007-01-20 19:29:22.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/URLPatternSpec.java 2007-01-20 19:29:22.000000000 +0000 @@ -31,7 +31,7 @@ import java.util.LinkedList; import javax.servlet.http.HttpServletRequest; /** - * @version $Rev: 498156 $ $Date: 2007-01-20 20:29:22 +0100 (Sa, 20 Jan 2007) $ + * @version $Rev: 498156 $ $Date: 2007-01-20 20:29:22 +0100 (sam. 20 janv. 2007) $ */ final class URLPatternSpec {
  16. Download patch .pc/01-missing-dependencies.patch/pom.xml

    --- 1.0.1-2/.pc/01-missing-dependencies.patch/pom.xml 2008-02-01 10:32:54.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/.pc/01-missing-dependencies.patch/pom.xml 2008-02-01 10:32:54.000000000 +0000 @@ -18,7 +18,7 @@ under the License. --> -<!-- $Rev: 617430 $ $Date: 2008-02-01 11:32:54 +0100 (Fr, 01 Feb 2008) $ --> +<!-- $Rev: 617430 $ $Date: 2008-02-01 11:32:54 +0100 (ven. 01 févr. 2008) $ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  17. Download patch src/test/java/javax/security/jacc/EJBMethodPermissionTest.java

    --- 1.0.1-2/src/test/java/javax/security/jacc/EJBMethodPermissionTest.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/test/java/javax/security/jacc/EJBMethodPermissionTest.java 2006-10-25 04:01:51.000000000 +0000 @@ -34,7 +34,7 @@ import java.io.ByteArrayInputStream; import java.io.ObjectInputStream; /** - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public class EJBMethodPermissionTest extends TestCase { protected Method method;
  18. Download patch src/site/site.xml

    --- 1.0.1-2/src/site/site.xml 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/site/site.xml 2006-10-25 04:01:51.000000000 +0000 @@ -18,7 +18,7 @@ under the License. --> -<!-- $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ --> +<!-- $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ --> <project name="${project.name}">
  19. Download patch pom.xml

    --- 1.0.1-2/pom.xml 2016-10-05 12:39:28.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/pom.xml 2016-10-05 12:39:28.000000000 +0000 @@ -18,7 +18,7 @@ under the License. --> -<!-- $Rev: 617430 $ $Date: 2008-02-01 11:32:54 +0100 (Fr, 01 Feb 2008) $ --> +<!-- $Rev: 617430 $ $Date: 2008-02-01 11:32:54 +0100 (ven. 01 févr. 2008) $ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  20. Download patch src/test/java/javax/security/jacc/EJBRoleRefPermissionTest.java

    --- 1.0.1-2/src/test/java/javax/security/jacc/EJBRoleRefPermissionTest.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/test/java/javax/security/jacc/EJBRoleRefPermissionTest.java 2006-10-25 04:01:51.000000000 +0000 @@ -28,7 +28,7 @@ package javax.security.jacc; import junit.framework.TestCase; /** - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public class EJBRoleRefPermissionTest extends TestCase {
  21. Download patch src/main/java/javax/security/jacc/PolicyConfiguration.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/PolicyConfiguration.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/PolicyConfiguration.java 2006-10-25 04:01:51.000000000 +0000 @@ -29,7 +29,7 @@ import java.security.Permission; import java.security.PermissionCollection; /** - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public interface PolicyConfiguration {
  22. Download patch src/main/java/javax/security/jacc/EJBMethodPermission.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/EJBMethodPermission.java 2007-03-23 09:18:38.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/EJBMethodPermission.java 2007-03-23 09:18:38.000000000 +0000 @@ -40,7 +40,7 @@ import java.util.Enumeration; import java.util.Collections; /** - * @version $Rev: 521639 $ $Date: 2007-03-23 10:18:38 +0100 (Fr, 23 Mär 2007) $ + * @version $Rev: 521639 $ $Date: 2007-03-23 10:18:38 +0100 (ven. 23 mars 2007) $ */ public final class EJBMethodPermission extends Permission implements Serializable {
  23. Download patch src/main/java/javax/security/jacc/EJBRoleRefPermission.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/EJBRoleRefPermission.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/EJBRoleRefPermission.java 2006-10-25 04:01:51.000000000 +0000 @@ -40,7 +40,7 @@ import java.security.Permission; * which the permission applies. An EJBRoleRefPermission is checked to * determine if the subject is a member of the role identified by the reference. * - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public final class EJBRoleRefPermission extends Permission implements Serializable {
  24. Download patch src/main/java/javax/security/jacc/PolicyContext.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/PolicyContext.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/PolicyContext.java 2006-10-25 04:01:51.000000000 +0000 @@ -31,7 +31,7 @@ import java.util.Set; /** - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public final class PolicyContext {
  25. Download patch src/main/java/javax/security/jacc/HTTPMethodSpec.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/HTTPMethodSpec.java 2006-12-01 00:37:43.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/HTTPMethodSpec.java 2006-12-01 00:37:43.000000000 +0000 @@ -33,7 +33,7 @@ import java.util.regex.Pattern; /** - * @version $Rev: 481119 $ $Date: 2006-12-01 01:37:43 +0100 (Fr, 01 Dez 2006) $ + * @version $Rev: 481119 $ $Date: 2006-12-01 01:37:43 +0100 (ven. 01 déc. 2006) $ */ final class HTTPMethodSpec {

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: geronimo-jta-1.1-spec

geronimo-jta-1.1-spec (1.1.1-3ubuntu1) saucy; urgency=low * Merge from Debian unstable. Remaining changes: - Switch build system to ant to support continued inclusion in Ubuntu main: + d/control: Drop Build-Depends on maven-debian-helper, add Build-Depends on ant + maven-{ant,repo}-helper, removed ${maven:*}. + d/rules: Switch back to ant build system. + d/ant.properties: Define extra configuration for maven-ant-helper. -- James Page <james.page@ubuntu.com> Tue, 21 May 2013 12:39:45 +0100

Modifications :
  1. Download patch debian/rules

    --- 1.1.1-3/debian/rules 2013-05-18 17:04:59.000000000 +0000 +++ 1.1.1-3ubuntu1/debian/rules 2013-05-18 21:39:39.000000000 +0000 @@ -1,9 +1,16 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk +include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java +UPSTREAM_NAME := geronimo-jta_1.1_spec +DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml +DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE) + +binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java:: + mh_installpoms -plib$(DEB_SOURCE_PACKAGE)-java + mh_installjar -plib$(DEB_SOURCE_PACKAGE)-java --java-lib pom.xml build/$(UPSTREAM_NAME)-$(DEB_UPSTREAM_VERSION).jar get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
  2. Download patch debian/control

    --- 1.1.1-3/debian/control 2013-05-18 17:04:59.000000000 +0000 +++ 1.1.1-3ubuntu1/debian/control 2013-05-21 11:35:55.000000000 +0000 @@ -1,10 +1,11 @@ Source: geronimo-jta-1.1-spec Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Torsten Werner <twerner@debian.org> -Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) -Build-Depends-Indep: default-jdk-doc, libmaven-javadoc-plugin-java +Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant +Build-Depends-Indep: default-jdk-doc, maven-ant-helper, maven-repo-helper Standards-Version: 3.9.4 Homepage: http://geronimo.apache.org Vcs-Git: git://anonscm.debian.org/git/pkg-java/geronimo-jta-1.1-spec.git @@ -12,8 +13,7 @@ Vcs-Browser: http://anonscm.debian.org/g Package: libgeronimo-jta-1.1-spec-java Architecture: all -Depends: ${misc:Depends}, ${maven:Depends} -Recommends: ${maven:OptionalDepends} +Depends: ${misc:Depends} Suggests: libgeronimo-jta-java-doc Conflicts: libgeronimo-jta-1.0.1b-spec-java Replaces: libgeronimo-jta-1.0.1b-spec-java @@ -31,8 +31,7 @@ Description: Geronimo API implementation Package: libgeronimo-jta-1.1-spec-java-doc Architecture: all Section: doc -Depends: ${misc:Depends}, ${maven:DocDepends} -Recommends: ${maven:DocOptionalDepends} +Depends: ${misc:Depends} Suggests: libgeronimo-jta-java Description: Documentation for the JTA 1.1 spec The goal of the Geronimo project is to produce a server runtime framework
  3. Download patch debian/ant.properties

    --- 1.1.1-3/debian/ant.properties 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.1-3ubuntu1/debian/ant.properties 2011-11-24 19:18:09.000000000 +0000 @@ -0,0 +1,3 @@ +javadoc.generate=true +maven.test.skip=true +javadoc.dir=target/apidocs

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: java-common

java-common (0.57ubuntu1) yakkety; urgency=medium * Merge with Debian; remaining changes: - default-jre: Lower recommends of default-java-plugin to a suggests. -- Matthias Klose <doko@ubuntu.com> Wed, 25 May 2016 15:52:29 +0200

Modifications :
  1. Download patch debian/control

    --- 0.57/debian/control 2016-02-26 17:36:35.000000000 +0000 +++ 0.57ubuntu1/debian/control 2016-05-25 13:53:55.000000000 +0000 @@ -23,7 +23,7 @@ Package: default-jre Architecture: any Depends: default-jre-headless (= ${binary:Version}), ${jre}, ${misc:Depends} -Recommends: default-java-plugin +Suggests: default-java-plugin Provides: ${jre:provides} Description: Standard Java or Java compatible Runtime This dependency package points to the Java runtime, or Java compatible
  2. Download patch xxx

    --- 0.57/xxx 1970-01-01 00:00:00.000000000 +0000 +++ 0.57ubuntu1/xxx 2016-05-25 13:54:21.000000000 +0000 @@ -0,0 +1,54 @@ +diff -pruN 0.56/debian/rules 0.56ubuntu2/debian/rules +--- 0.56/debian/rules 2016-02-10 14:58:21.000000000 +0000 ++++ 0.56ubuntu2/debian/rules 2016-02-25 01:53:18.000000000 +0000 +@@ -12,6 +12,7 @@ include debian/java_defaults.mk + p_jre = openjdk-$(java_default_version)-jre + p_jhl = openjdk-$(java_default_version)-jre-headless + p_jdk = openjdk-$(java_default_version)-jdk ++p_jdkhl = openjdk-$(java_default_version)-jdk-headless + p_doc = openjdk-$(java_default_version)-doc + p_plugin = icedtea-$(java_default_version)-plugin + dversion = 2:1.$(java_default_version)-$(release) +@@ -21,6 +22,7 @@ ifeq (5, $(java_default_version)) + p_jre = gcj-jre + p_jhl = gcj-jre-headless + p_jdk = gcj-jdk ++ p_jdkhl = gcj-jdk # no gcj-jdk-headless package + p_doc = openjdk-8-doc + p_plugin = + jvmdir = java-gcj +@@ -34,6 +36,7 @@ endif + jre_provides = java-runtime, java2-runtime, $(shell seq --format java%.f-runtime --separator ', ' 5 $(java_default_version)) + jhl_provides = java-runtime-headless, java2-runtime-headless, $(shell seq --format java%.f-runtime-headless --separator ', ' 5 $(java_default_version)) + jdk_provides = java-sdk, java2-sdk, $(shell seq --format java%.f-sdk --separator ', ' 5 $(java_default_version)) ++jdkhl_provides = java-sdk-headless, java2-sdk-headless, $(shell seq --format java%.f-sdk-headless --separator ', ' 5 $(java_default_version)) + + + %: +@@ -54,9 +57,10 @@ override_dh_installdocs: + + # Install the changelog and copyright once in default-jre-headless and use links for the other packages + dh_installdocs -pdefault-jre-headless +- dh_link -pdefault-jre /usr/share/doc/default-jre-headless /usr/share/doc/default-jre +- dh_link -pdefault-jdk /usr/share/doc/default-jre /usr/share/doc/default-jdk +- dh_link -pdefault-java-plugin /usr/share/doc/default-jre /usr/share/doc/default-java-plugin ++ dh_link -pdefault-jre /usr/share/doc/default-jre-headless /usr/share/doc/default-jre ++ dh_link -pdefault-jdk-headless /usr/share/doc/default-jre-headless /usr/share/doc/default-jdk-headless ++ dh_link -pdefault-jdk /usr/share/doc/default-jre /usr/share/doc/default-jdk ++ dh_link -pdefault-java-plugin /usr/share/doc/default-jre /usr/share/doc/default-java-plugin + + dh_installdocs -pdefault-jdk-doc + dh_installdocs -pgcj-native-helper +@@ -69,10 +73,12 @@ ifneq (,$(p_jre)) + '-Vjre=$(p_jre)' \ + '-Vjhl=$(p_jhl)' \ + '-Vjdk=$(p_jdk)' \ ++ '-Vjdkhl=$(p_jdkhl)' \ + '-Vdoc=$(p_doc)' \ + '-Vjre:arch=$(DEB_HOST_ARCH)' \ + '-Vjre:provides=$(jre_provides)' \ + '-Vjhl:provides=$(jhl_provides)' \ ++ '-Vjdkhl:provides=$(jdkhl_provides)' \ + '-Vjdk:provides=$(jdk_provides)' + endif + ifneq (,$(p_plugin))

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: java3d

java3d (1.5.2+dfsg-11ubuntu1) vivid; urgency=medium * Resynchronise with Debian. Remaining changes: - 02_fix_generic_ftbfs.patch: Link with gcc -shared, not ld; don't explicitly link with libc. -- Colin Watson <cjwatson@ubuntu.com> Mon, 24 Nov 2014 13:02:59 +0000

Modifications :
  1. Download patch debian/control

    --- 1.5.2+dfsg-11/debian/control 2014-11-23 03:02:30.000000000 +0000 +++ 1.5.2+dfsg-11ubuntu1/debian/control 2014-11-24 13:02:41.000000000 +0000 @@ -1,7 +1,8 @@ Source: java3d Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Onkar Shinde <onkarshinde@ubuntu.com>, Emmanuel Bourg <ebourg@apache.org>, Torsten Werner <twerner@debian.org>
  2. Download patch j3d-core/src/native/ogl/build-linux-generic.xml

    --- 1.5.2+dfsg-11/j3d-core/src/native/ogl/build-linux-generic.xml 2014-11-24 15:07:05.000000000 +0000 +++ 1.5.2+dfsg-11ubuntu1/j3d-core/src/native/ogl/build-linux-generic.xml 2014-11-24 15:07:05.000000000 +0000 @@ -28,8 +28,8 @@ </exec> <!-- Create the library file--> - <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld"> - <arg line="DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -G -z defs -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm -o libj3dcore-ogl.so"/> + <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> + <arg line="-shared DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -Wl,-z,defs -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm -o libj3dcore-ogl.so"/> </exec> </target> @@ -41,8 +41,8 @@ </exec> <!-- Create the wrapper library --> - <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld"> - <arg line="CgWrapper.o -G -z defs -L/usr/X11R6/lib -ldl -lCg -lCgGL -lpthread -lGL -lX11 -lXext -lm -lnsl -lc -o libj3dcore-ogl-cg.so"/> + <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> + <arg line="-shared CgWrapper.o -Wl,-z,defs -L/usr/X11R6/lib -ldl -lCg -lCgGL -lpthread -lGL -lX11 -lXext -lm -lnsl -o libj3dcore-ogl-cg.so"/> </exec> </target>
  3. Download patch debian/patches/02_fix_generic_ftbfs.patch

    --- 1.5.2+dfsg-11/debian/patches/02_fix_generic_ftbfs.patch 2010-01-16 19:50:20.000000000 +0000 +++ 1.5.2+dfsg-11ubuntu1/debian/patches/02_fix_generic_ftbfs.patch 2014-11-24 13:02:41.000000000 +0000 @@ -1,7 +1,7 @@ Index: java3d-1.5.2+dfsg/j3d-core/build.xml =================================================================== ---- java3d-1.5.2+dfsg.orig/j3d-core/build.xml 2010-01-09 18:52:55.000000000 +0530 -+++ java3d-1.5.2+dfsg/j3d-core/build.xml 2010-01-09 20:24:13.000000000 +0530 +--- java3d-1.5.2+dfsg.orig/j3d-core/build.xml 2008-05-23 20:31:19.000000000 +0000 ++++ java3d-1.5.2+dfsg/j3d-core/build.xml 2012-10-13 11:09:55.000000000 +0000 @@ -196,6 +196,15 @@ <property name="install.bin" value="lib/ppc"/> </target> @@ -43,8 +43,8 @@ Index: java3d-1.5.2+dfsg/j3d-core/build. </condition> Index: java3d-1.5.2+dfsg/j3d-core/src/native/build.xml =================================================================== ---- java3d-1.5.2+dfsg.orig/j3d-core/src/native/build.xml 2010-01-09 18:52:55.000000000 +0530 -+++ java3d-1.5.2+dfsg/j3d-core/src/native/build.xml 2010-01-09 20:23:04.000000000 +0530 +--- java3d-1.5.2+dfsg.orig/j3d-core/src/native/build.xml 2008-02-28 20:17:58.000000000 +0000 ++++ java3d-1.5.2+dfsg/j3d-core/src/native/build.xml 2012-10-13 11:10:00.000000000 +0000 @@ -45,6 +45,13 @@ <property name="osNativeScreenInfo" value="X11NativeScreenInfo"/> </target> @@ -94,7 +94,7 @@ Index: java3d-1.5.2+dfsg/j3d-core/src/na Index: java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml 2010-01-09 20:23:04.000000000 +0530 ++++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml 2012-10-13 11:11:17.000000000 +0000 @@ -0,0 +1,74 @@ +<?xml version="1.0"?> + @@ -126,8 +126,8 @@ Index: java3d-1.5.2+dfsg/j3d-core/src/na + </exec> + + <!-- Create the library file--> -+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld"> -+ <arg line="DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -G -z defs -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm -o libj3dcore-ogl.so"/> ++ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> ++ <arg line="-shared DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -Wl,-z,defs -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm -o libj3dcore-ogl.so"/> + </exec> + + </target> @@ -139,8 +139,8 @@ Index: java3d-1.5.2+dfsg/j3d-core/src/na + </exec> + + <!-- Create the wrapper library --> -+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld"> -+ <arg line="CgWrapper.o -G -z defs -L/usr/X11R6/lib -ldl -lCg -lCgGL -lpthread -lGL -lX11 -lXext -lm -lnsl -lc -o libj3dcore-ogl-cg.so"/> ++ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> ++ <arg line="-shared CgWrapper.o -Wl,-z,defs -L/usr/X11R6/lib -ldl -lCg -lCgGL -lpthread -lGL -lX11 -lXext -lm -lnsl -o libj3dcore-ogl-cg.so"/> + </exec> + + </target>

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: jmagick

jmagick (6.6.9~20130201-svn99-3ubuntu2) zesty; urgency=medium * Rebuild against new imagemagick 6.9.7.0. -- Gianfranco Costamagna <locutusofborg@debian.org> Wed, 18 Jan 2017 13:33:21 +0100 jmagick (6.6.9~20130201-svn99-3ubuntu1) yakkety; urgency=medium * Merge with Debian; remaining changes: - Fix warnings about implicit function declaration. Closes: #727776. -- Matthias Klose <doko@ubuntu.com> Tue, 06 Sep 2016 15:48:31 +0200

Modifications :
  1. Download patch .pc/02_jmagick_implicit_decl.patch/src/magick/jmagick.h
  2. Download patch src/magick/jmagick.h

    --- 6.6.9~20130201-svn99-3/src/magick/jmagick.h 2009-11-10 13:24:51.000000000 +0000 +++ 6.6.9~20130201-svn99-3ubuntu2/src/magick/jmagick.h 2017-03-29 22:42:25.000000000 +0000 @@ -110,6 +110,29 @@ int setIntFieldValue(JNIEnv *env, jint value); /* + * Retrieve the byte array from the specified field. + * + * Input: + * env Java VM environment. + * obj Java object for which the value is to be retrieved. + * fieldName name of the field to be retrieved. + * fieldID if non-null, points to field ID. 0 to request retrieval. + * + * Output: + * fieldID if non-null, will contain the field ID. + * size the size of the array is returned here. Must not be NULL. + * + * Return: + * The byte array requested. The caller is responsible for + * deallocating this byte array. + */ +unsigned char* getByteArrayFieldValue(JNIEnv *env, + jobject obj, + const char *fieldName, + jfieldID *fieldID, + int *size); + +/* * From a java.awt.Rectangle object, construct a ImageMagick * RectangleInfo, as passed in from the parameter. *
  3. Download patch debian/control

    --- 6.6.9~20130201-svn99-3/debian/control 2016-09-05 04:13:53.000000000 +0000 +++ 6.6.9~20130201-svn99-3ubuntu2/debian/control 2016-09-06 13:48:31.000000000 +0000 @@ -1,5 +1,6 @@ Source: jmagick -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Varun Hiremath <varun@debian.org> Section: graphics Priority: optional
  4. Download patch .pc/applied-patches

    --- 6.6.9~20130201-svn99-3/.pc/applied-patches 2017-03-29 22:42:25.321938217 +0000 +++ 6.6.9~20130201-svn99-3ubuntu2/.pc/applied-patches 2017-03-29 22:42:25.573945071 +0000 @@ -1,2 +1,3 @@ 01_fix_load_jnilib.patch 0001-Use-pkgconfig-for-flags.patch +02_jmagick_implicit_decl.patch
  5. Download patch debian/patches/02_jmagick_implicit_decl.patch

    --- 6.6.9~20130201-svn99-3/debian/patches/02_jmagick_implicit_decl.patch 1970-01-01 00:00:00.000000000 +0000 +++ 6.6.9~20130201-svn99-3ubuntu2/debian/patches/02_jmagick_implicit_decl.patch 2016-09-06 13:48:31.000000000 +0000 @@ -0,0 +1,37 @@ +Description: Include the missing prototype for getByteArrayFieldValue +Author: Adam Conrad <adconrad@ubuntu.com> + +Index: jmagick-6.6.9~20130201-svn99/src/magick/jmagick.h +=================================================================== +--- jmagick-6.6.9~20130201-svn99.orig/src/magick/jmagick.h 2013-10-26 10:45:26.000000000 -0600 ++++ jmagick-6.6.9~20130201-svn99/src/magick/jmagick.h 2013-10-26 10:50:51.932356603 -0600 +@@ -110,6 +110,29 @@ + jint value); + + /* ++ * Retrieve the byte array from the specified field. ++ * ++ * Input: ++ * env Java VM environment. ++ * obj Java object for which the value is to be retrieved. ++ * fieldName name of the field to be retrieved. ++ * fieldID if non-null, points to field ID. 0 to request retrieval. ++ * ++ * Output: ++ * fieldID if non-null, will contain the field ID. ++ * size the size of the array is returned here. Must not be NULL. ++ * ++ * Return: ++ * The byte array requested. The caller is responsible for ++ * deallocating this byte array. ++ */ ++unsigned char* getByteArrayFieldValue(JNIEnv *env, ++ jobject obj, ++ const char *fieldName, ++ jfieldID *fieldID, ++ int *size); ++ ++/* + * From a java.awt.Rectangle object, construct a ImageMagick + * RectangleInfo, as passed in from the parameter. + *
  6. Download patch debian/patches/series

    --- 6.6.9~20130201-svn99-3/debian/patches/series 2016-09-05 04:13:53.000000000 +0000 +++ 6.6.9~20130201-svn99-3ubuntu2/debian/patches/series 2016-09-06 13:48:31.000000000 +0000 @@ -1,3 +1,4 @@ 01_fix_load_jnilib.patch 0001-Use-pkgconfig-for-flags.patch +02_jmagick_implicit_decl.patch

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: jsch-agent-proxy

jsch-agent-proxy (0.0.8-2ubuntu1) xenial; urgency=medium * Switch to using maven-ant-helper to avoid maven in main: - d/rules,modules: Switch maven->ant; add targets for jar installs - d/build.xml: Wrapper for maven-ant-helper build.xml to support multi-module projects. - d/control: Update BD's to drop maven related dependencies, add maven-ant-helper and maven-repo-helper. -- James Page <james.page@ubuntu.com> Wed, 17 Feb 2016 15:00:47 +0000

Modifications :
  1. Download patch debian/modules

    --- 0.0.8-2/debian/modules 1970-01-01 00:00:00.000000000 +0000 +++ 0.0.8-2ubuntu1/debian/modules 2016-02-17 14:33:12.000000000 +0000 @@ -0,0 +1,7 @@ +jsch-agent-proxy-core +jsch-agent-proxy-jsch +jsch-agent-proxy-pageant +jsch-agent-proxy-sshagent +jsch-agent-proxy-usocket-jna +jsch-agent-proxy-usocket-nc +jsch-agent-proxy-connector-factory
  2. Download patch debian/rules

    --- 0.0.8-2/debian/rules 2015-06-15 21:17:13.000000000 +0000 +++ 0.0.8-2ubuntu1/debian/rules 2016-02-17 14:52:10.000000000 +0000 @@ -1,10 +1,21 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk +include /usr/share/cdbs/1/class/ant.mk -JAVA_HOME := /usr/lib/jvm/default-java -DEB_MAVEN_DOC_TARGET := javadoc:javadoc javadoc:aggregate +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := ant-nodeps ant-junit jsch jna-platform jna +DEB_ANT_BUILDFILE := debian/build.xml +DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) +binary-post-install/lib$(PACKAGE)-java:: + mh_installpoms -plib$(PACKAGE)-java + set -e; \ + for module in `cat debian/modules`; do \ + jar=`echo $$module | sed -e "s/jsch-agent-proxy-/jsch.agentproxy./g"`; \ + mh_installjar -plib$(PACKAGE)-java -l $$module/pom.xml $$module/build/$$jar-$(VERSION).jar; \ + done get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
  3. Download patch debian/control

    --- 0.0.8-2/debian/control 2015-09-02 21:32:39.000000000 +0000 +++ 0.0.8-2ubuntu1/debian/control 2016-02-17 12:24:13.000000000 +0000 @@ -1,10 +1,11 @@ Source: jsch-agent-proxy Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Emmanuel Bourg <ebourg@apache.org> -Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.5), libjna-platform-java -Build-Depends-Indep: libmaven-bundle-plugin-java, libjsch-java +Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-ant-helper, maven-repo-helper, libjna-platform-java, ant, ant-optional +Build-Depends-Indep: libjsch-java Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/jsch-agent-proxy.git Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/jsch-agent-proxy.git
  4. Download patch debian/build.xml

    --- 0.0.8-2/debian/build.xml 1970-01-01 00:00:00.000000000 +0000 +++ 0.0.8-2ubuntu1/debian/build.xml 2016-02-17 15:00:45.000000000 +0000 @@ -0,0 +1,86 @@ +<?xml version="1.0"?> +<project name="jsch.agent" default="build-all" basedir="."> + <property name="build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/> + <target name="build-all"> + <antcall target="component"> + <param name="component" value="."/> + <param name="target" value="package"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-core"/> + <param name="target" value="package"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-jsch"/> + <param name="target" value="package"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-pageant"/> + <param name="target" value="package"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-sshagent"/> + <param name="target" value="package"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-usocket-jna"/> + <param name="target" value="package"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-usocket-nc"/> + <param name="target" value="package"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-connector-factory"/> + <param name="target" value="package"/> + </antcall> + </target> + + <target name="clean"> + <antcall target="component"> + <param name="component" value="."/> + <param name="target" value="clean"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-core"/> + <param name="target" value="clean"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-jsch"/> + <param name="target" value="clean"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-pageant"/> + <param name="target" value="clean"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-sshagent"/> + <param name="target" value="clean"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-usocket-jna"/> + <param name="target" value="clean"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-usocket-nc"/> + <param name="target" value="clean"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-connector-factory"/> + <param name="target" value="clean"/> + </antcall> + </target> + + <target name="component"> + <!-- Ensure any jar files already built in this project are used for compilation --> + <path id="local.path.ref"> + <fileset dir="${basedir}" includes="**/*.jar"/> + </path> + <ant antfile="${build.xml}" dir="${basedir}/${component}" target="${target}"> + <property name="package" value="${package}"/> + <property name="version" value="${version}"/> + <property name="debian.dir" value="${basedir}/debian"/> + <property name="classpath.compile" value="${toString:local.path.ref}"/> + </ant> + </target> +</project>

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: junit4

junit4 (4.12-4ubuntu1) xenial; urgency=low * Merge from Debian unstable. Remaining changes: - d/*: Re-use 4.11-3 packaging to avoid the switch. - d/build.xml,d/junit-pom-template.xml: Pick ant build components from 4.11 and adapt for new location and version. - d/tweak-resulttest.patch: Strip out failing part of ResultTest test case due to differences in the way classes are loaded using ant for the package build. -- James Page <james.page@ubuntu.com> Tue, 08 Mar 2016 12:15:34 +0000

Modifications :
  1. Download patch debian/rules

    --- 4.12-4/debian/rules 2015-12-22 17:47:55.000000000 +0000 +++ 4.12-4ubuntu1/debian/rules 2016-03-08 11:31:26.000000000 +0000 @@ -1,14 +1,35 @@ #!/usr/bin/make -f export JAVA_HOME=/usr/lib/jvm/default-java -%: - dh $@ --parallel --buildsystem=maven +include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/rules/debhelper.mk -override_dh_install: - dh_install - # Run jh_manifest after dh_install to ensure that debian/junit4.manifest is - # really installed into the jar file. See also #808736 +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +DEB_ANT_BUILD_TARGET := dist +DEB_ANT_BUILDFILE := debian/build.xml +DEB_JARS := ant-nodeps hamcrest-core + +binary-post-install/junit4:: + sed "s/@artifactId@/junit/;s/@version@/$(VERSION)/" debian/junit-pom-template.xml > debian/pom.xml + mh_installpoms -pjunit4 + mh_installjar -pjunit4 -njunit4 -l debian/pom.xml junit$(VERSION)/junit-dep-$(VERSION).jar jh_manifest -pjunit4 +binary-post-install/junit4-doc:: + dh_install -pjunit4-doc junit$(VERSION)/javadoc/* /usr/share/doc/junit4/api/ + +clean:: + -rm debian/pom.xml + -rm src/main/java/junit/runner/Version.java + mh_clean + +upstream-from-git: + git-archive --format=tar --prefix=junit4-$(DEB_UPSTREAM_VERSION)/ \ + v$(DEB_UPSTREAM_VERSION) | gzip -9 \ + > ../junit4_$(DEB_UPSTREAM_VERSION).orig.tar.gz + get-orig-source: -uscan --upstream-version 0 --rename +
  2. Download patch debian/control

    --- 4.12-4/debian/control 2015-12-22 17:47:55.000000000 +0000 +++ 4.12-4ubuntu1/debian/control 2016-03-08 11:28:05.000000000 +0000 @@ -1,6 +1,7 @@ Source: junit4 Section: java -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Florian Weimer <fw@deneb.enyo.de>, Varun Hiremath <varun@debian.org>, Damien Raude-Morvan <drazzib@debian.org>, @@ -8,13 +9,11 @@ Uploaders: Florian Weimer <fw@deneb.enyo Jakub Adam <jakub.adam@ktknet.cz>, Emmanuel Bourg <ebourg@apache.org> Priority: optional -Build-Depends: debhelper (>= 9), default-jdk, javahelper +Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk, javahelper Build-Depends-Indep: default-jdk-doc, libhamcrest-java (>= 1.3), libhamcrest-java-doc, - libmaven-enforcer-plugin-java, - libmaven-javadoc-plugin-java, - maven-debian-helper + maven-repo-helper Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/junit4.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/junit4.git
  3. Download patch .pc/exclude-dependency-sources.patch/pom.xml
  4. Download patch debian/patches/exclude-dependency-sources.patch

    --- 4.12-4/debian/patches/exclude-dependency-sources.patch 2015-12-22 17:47:55.000000000 +0000 +++ 4.12-4ubuntu1/debian/patches/exclude-dependency-sources.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -Description: Don't include hamcrest in the Javadoc (the source artifact isn't available) -Author: Emmanuel Bourg <ebourg@apache.org> -Forwarded: not-needed ---- a/pom.xml -+++ b/pom.xml -@@ -303,7 +303,7 @@ - <minmemory>32m</minmemory> - <maxmemory>128m</maxmemory> - <failOnError>true</failOnError> -- <includeDependencySources>true</includeDependencySources> -+ <includeDependencySources>false</includeDependencySources> - <dependencySourceIncludes> - <dependencySourceInclude>org.hamcrest:hamcrest-core:*</dependencySourceInclude> - </dependencySourceIncludes> -@@ -407,7 +407,7 @@ - <minmemory>32m</minmemory> - <maxmemory>128m</maxmemory> - <failOnError>true</failOnError> -- <includeDependencySources>true</includeDependencySources> -+ <includeDependencySources>false</includeDependencySources> - <dependencySourceIncludes> - <dependencySourceInclude>org.hamcrest:hamcrest-core:*</dependencySourceInclude> - </dependencySourceIncludes>
  5. Download patch debian/junit4.poms

    --- 4.12-4/debian/junit4.poms 2015-12-22 17:47:55.000000000 +0000 +++ 4.12-4ubuntu1/debian/junit4.poms 2015-12-22 23:14:37.000000000 +0000 @@ -1 +1 @@ -pom.xml --no-parent --java-lib --has-package-version --usj-name=junit4 +debian/pom.xml --no-parent
  6. Download patch .pc/applied-patches

    --- 4.12-4/.pc/applied-patches 2016-03-08 17:37:35.504465060 +0000 +++ 4.12-4ubuntu1/.pc/applied-patches 2016-03-08 17:37:35.740471640 +0000 @@ -1,4 +1,3 @@ -maven2-compatibility.patch -exclude-dependency-sources.patch Version.java.patch privacy-breach-logo.patch +tweak-resulttest.patch
  7. Download patch debian/orig-tar.sh

    --- 4.12-4/debian/orig-tar.sh 2015-12-22 17:47:55.000000000 +0000 +++ 4.12-4ubuntu1/debian/orig-tar.sh 2015-12-22 23:14:36.000000000 +0000 @@ -3,7 +3,7 @@ # called by uscan with '--upstream-version' <version> <file> VERSION=$2 DIR=junit4-$VERSION -TAR=../junit4_$VERSION.orig.tar.xz +TAR=../junit4_$VERSION.orig.tar.gz ORIG_TAR=$3 #rm -f $3 @@ -14,7 +14,7 @@ mkdir $DIR tar -x -v -z -f $ORIG_TAR rm $ORIG_TAR find . -maxdepth 2 -wholename "./junit-*/*" -exec mv '{}' $DIR \; -XZ_OPT=--best tar -c -J -f $TAR -X debian/orig-tar.exclude $DIR +GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR rm -rf $DIR junit-* # move to directory 'tarballs'
  8. Download patch debian/junit4.manifest

    --- 4.12-4/debian/junit4.manifest 2015-12-22 17:47:55.000000000 +0000 +++ 4.12-4ubuntu1/debian/junit4.manifest 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -usr/share/java/junit4.jar: - Class-Path: hamcrest-core.jar - Bundle-Vendor: JUnit - Bundle-Version: 4.12 - Bundle-Name: JUnit Testing Framework - Bundle-ManifestVersion: 2 - Bundle-SymbolicName: org.junit - Export-Package: org.junit.experimental.theories.suppliers;uses:="org.junit.experimental.theories";version="4.12",org.junit.experimental.theories;uses:="org.junit.experimental.theories.internal,org.junit.internal,org.junit.runners.model,org.junit.runners,org.junit";version="4.12",org.junit.experimental.theories.internal;uses:="org.junit.experimental.theories,org.junit.runners.model";version="4.12",org.junit.internal.runners;uses:="org.junit.runner,org.junit.internal,org.junit.runner.notification,org.junit.runners.model,junit.framework,org.junit.runner.manipulation,junit.extensions,org.junit";version="4.12",org.junit.internal;uses:="org.hamcrest,org.junit,org.junit.runners,org.junit.runner,org.junit.runner.notification";version="4.12",org.junit.internal.runners.model;uses:="org.junit.internal,org.junit.runner,org.junit.runners.model,org.junit.runner.notification";version="4.12",org.junit.experimental.categories;uses:="org.junit.runner.manipulation,org.junit.runner,org.junit.runners,org.junit.runners.model";version="4.12",org.junit.runner.manipulation;uses:="org.junit.runner";version="4.12",org.junit.rules;uses:="org.hamcrest,org.junit,org.junit.runners.model,org.junit.internal,org.junit.internal.matchers,org.junit.runner,org.junit.matchers,org.junit.internal.runners.statements";version="4.12",org.junit.runner;uses:="org.junit.runners.model,org.junit.runners,junit.framework,org.junit.internal.runners,org.junit.internal,junit.runner,org.junit.runner.notification,org.junit.runner.manipulation,org.junit.internal.requests,org.junit.internal.builders";version="4.12",org.junit.runners;uses:="org.junit.internal.runners,org.junit.runners.model,org.junit.internal.runners.model,org.junit.internal.runners.rules,org.junit.rules,org.junit.runner,org.junit.runner.notification,org.junit.internal.runners.statements,org.junit,org.junit.internal,org.junit.runner.manipulation,org.junit.internal.builders";version="4.12",org.junit.matchers;uses:="org.junit.internal.matchers,org.hamcrest.core,org.hamcrest";version="4.12",org.junit.runner.notification;uses:="org.junit.runner";version="4.12",org.junit.experimental.results;uses:="org.junit.runner,org.junit.runner.notification,org.junit.internal,org.hamcrest";version="4.12",org.junit.experimental.max;uses:="org.junit.runner,org.junit.runners,org.junit.internal.runners,org.junit.runners.model,org.junit.internal.requests,junit.framework,org.junit.runner.notification";version="4.12",org.junit.internal.builders;uses:="org.junit.runner,org.junit.runners.model,org.junit,org.junit.runner.notification,junit.framework,org.junit.internal.runners,org.junit.runners";version="4.12",org.junit;uses:="org.junit.internal,org.hamcrest,org.junit.runners";version="4.12",org.junit.experimental.runners;uses:="org.junit.runners,org.junit.runners.model";version="4.12",org.junit.internal.runners.rules;uses:="org.junit.rules,org.junit.runners.model,org.junit";version="4.12",org.junit.internal.matchers;uses:="org.hamcrest,org.junit.internal";version="4.12",org.junit.internal.requests;uses:="org.junit.runner,org.junit.internal.builders,org.junit.runner.manipulation,org.junit.internal.runners";version="4.12",org.junit.experimental;uses:="org.junit.runner,org.junit.runners.model,org.junit.runners";version="4.12",org.junit.runners.model;uses:="org.junit.internal.runners.model,org.junit.internal.runners,org.junit.runner,org.junit.internal,org.junit";version="4.12",org.junit.internal.runners.statements;uses:="org.junit.internal,org.junit.runners.model";version="4.12",junit.runner;uses:="junit.framework";version="4.12",junit.textui;uses:="junit.framework,junit.runner";version="4.12",junit.extensions;uses:="junit.framework";version="4.12",junit.framework;uses:="org.junit.runner.manipulation,org.junit.runner,org.junit.runner.notification,org.junit,org.junit.internal";version="4.12" - Import-Package: org.hamcrest;version="1.3",org.hamcrest.core;version="1. 3"
  9. Download patch .pc/tweak-resulttest.patch/src/test/java/junit/tests/runner/ResultTest.java

    --- 4.12-4/.pc/tweak-resulttest.patch/src/test/java/junit/tests/runner/ResultTest.java 1970-01-01 00:00:00.000000000 +0000 +++ 4.12-4ubuntu1/.pc/tweak-resulttest.patch/src/test/java/junit/tests/runner/ResultTest.java 2014-12-04 16:13:56.000000000 +0000 @@ -0,0 +1,107 @@ +package junit.tests.runner; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.List; + +import junit.framework.TestCase; +import junit.tests.framework.Success; +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.junit.tests.running.methods.AnnotationTest; + +public class ResultTest extends TestCase { + + public void testRunFailureResultCanBeSerialised() throws Exception { + JUnitCore runner = new JUnitCore(); + Result result = runner.run(AnnotationTest.FailureTest.class); + assertResultSerializable(result); + } + + public void testRunSuccessResultCanBeSerialised() throws Exception { + JUnitCore runner = new JUnitCore(); + Result result = runner.run(Success.class); + assertResultSerializable(result); + } + + private void assertResultSerializable(Result result) throws IOException, ClassNotFoundException { + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + new ObjectOutputStream(byteArrayOutputStream).writeObject(result); + byte[] bytes = byteArrayOutputStream.toByteArray(); + ObjectInputStream objectInputStream = new ObjectInputStream(new ByteArrayInputStream(bytes)); + Result fromStream = (Result) objectInputStream.readObject(); + assertSerializedCorrectly(result, fromStream); + + InputStream resource = getClass().getResourceAsStream(getName()); + assertNotNull("Could not read resource " + getName(), resource); + objectInputStream = new ObjectInputStream(resource); + fromStream = (Result) objectInputStream.readObject(); + + assertSerializedCorrectly(new ResultWithFixedRunTime(result), fromStream); + } + + /** + * A version of {@code Result} that returns a hard-coded runtime. + * This makes values returned by the methods deterministic. + */ + private static class ResultWithFixedRunTime extends Result { + private final Result delegate; + + public ResultWithFixedRunTime(Result delegate) { + this.delegate = delegate; + } + + @Override + public int getRunCount() { + return delegate.getRunCount(); + } + + @Override + public int getFailureCount() { + return delegate.getFailureCount(); + } + + @Override + public long getRunTime() { + return 2; + } + + @Override + public List<Failure> getFailures() { + return delegate.getFailures(); + } + + @Override + public int getIgnoreCount() { + return delegate.getIgnoreCount(); + } + } + + private void assertSerializedCorrectly(Result result, Result fromStream) { + assertNotNull(fromStream); + + // Exceptions don't implement equals() so we need to compare field by field + assertEquals("failureCount", result.getFailureCount(), fromStream.getFailureCount()); + assertEquals("ignoreCount", result.getIgnoreCount(), fromStream.getIgnoreCount()); + assertEquals("runTime", result.getRunTime(), fromStream.getRunTime()); + assertEquals("failures", result.getFailures().size(), fromStream.getFailures().size()); + int index = 0; + for (Failure failure : result.getFailures()) { + Failure failureFromStream = fromStream.getFailures().get(index); + String messagePrefix = String.format("failures[%d]", index++); + assertEquals(messagePrefix + ".description", + failure.getDescription(), failureFromStream.getDescription()); + Throwable exception = failure.getException(); + Throwable exceptionFromStream = failureFromStream.getException(); + assertEquals(messagePrefix + ".exception", + exception.getClass(), exceptionFromStream.getClass()); + assertEquals(messagePrefix + ".exception", + exception.getMessage(), exceptionFromStream.getMessage()); + } + } +}
  10. Download patch debian/patches/maven2-compatibility.patch

    --- 4.12-4/debian/patches/maven2-compatibility.patch 2015-12-22 17:47:55.000000000 +0000 +++ 4.12-4ubuntu1/debian/patches/maven2-compatibility.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Description: Remove the prerequisite on Maven 3 -Author: Emmanuel Bourg <ebourg@apache.org> -Forwarded: not-needed ---- a/pom.xml -+++ b/pom.xml -@@ -65,7 +65,7 @@ - </mailingLists> - - <prerequisites> -- <maven>3.0.4</maven> -+ <maven>2.2.1</maven> - </prerequisites> - - <scm>
  11. Download patch debian/patches/series

    --- 4.12-4/debian/patches/series 2015-12-22 17:47:55.000000000 +0000 +++ 4.12-4ubuntu1/debian/patches/series 2016-03-08 11:29:41.000000000 +0000 @@ -1,4 +1,5 @@ -maven2-compatibility.patch -exclude-dependency-sources.patch Version.java.patch privacy-breach-logo.patch + +# Ubuntu +tweak-resulttest.patch
  12. Download patch pom.xml

    --- 4.12-4/pom.xml 2016-03-08 17:37:35.000000000 +0000 +++ 4.12-4ubuntu1/pom.xml 2014-12-04 16:13:56.000000000 +0000 @@ -65,7 +65,7 @@ </mailingLists> <prerequisites> - <maven>2.2.1</maven> + <maven>3.0.4</maven> </prerequisites> <scm> @@ -303,7 +303,7 @@ <minmemory>32m</minmemory> <maxmemory>128m</maxmemory> <failOnError>true</failOnError> - <includeDependencySources>false</includeDependencySources> + <includeDependencySources>true</includeDependencySources> <dependencySourceIncludes> <dependencySourceInclude>org.hamcrest:hamcrest-core:*</dependencySourceInclude> </dependencySourceIncludes> @@ -407,7 +407,7 @@ <minmemory>32m</minmemory> <maxmemory>128m</maxmemory> <failOnError>true</failOnError> - <includeDependencySources>false</includeDependencySources> + <includeDependencySources>true</includeDependencySources> <dependencySourceIncludes> <dependencySourceInclude>org.hamcrest:hamcrest-core:*</dependencySourceInclude> </dependencySourceIncludes>
  13. Download patch debian/MANIFEST.MF

    --- 4.12-4/debian/MANIFEST.MF 1970-01-01 00:00:00.000000000 +0000 +++ 4.12-4ubuntu1/debian/MANIFEST.MF 2015-06-19 14:36:25.000000000 +0000 @@ -0,0 +1,64 @@ +Manifest-Version: 1.0 +Class-Path: hamcrest-core.jar +Bundle-Vendor: JUnit +Bundle-Version: 4.11 +Bundle-Name: JUnit Testing Framework +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.junit +Export-Package: org.junit.experimental.theories.suppliers;uses:="org.jun + it.experimental.theories";version="4.11",org.junit.experimental.theorie + s;uses:="org.junit.experimental.theories.internal,org.junit.internal,or + g.junit.runners.model,org.junit.runners,org.junit";version="4.11",org.j + unit.experimental.theories.internal;uses:="org.junit.experimental.theor + ies,org.junit.runners.model";version="4.11",org.junit.internal.runners; + uses:="org.junit.runner,org.junit.internal,org.junit.runner.notificatio + n,org.junit.runners.model,junit.framework,org.junit.runner.manipulation + ,junit.extensions,org.junit";version="4.11",org.junit.internal;uses:="o + rg.hamcrest,org.junit,org.junit.runners,org.junit.runner,org.junit.runn + er.notification";version="4.11",org.junit.internal.runners.model;uses:= + "org.junit.internal,org.junit.runner,org.junit.runners.model,org.junit. + runner.notification";version="4.11",org.junit.experimental.categories;u + ses:="org.junit.runner.manipulation,org.junit.runner,org.junit.runners, + org.junit.runners.model";version="4.11",org.junit.runner.manipulation;u + ses:="org.junit.runner";version="4.11",org.junit.rules;uses:="org.hamcr + est,org.junit,org.junit.runners.model,org.junit.internal,org.junit.inte + rnal.matchers,org.junit.runner,org.junit.matchers,org.junit.internal.ru + nners.statements";version="4.11",org.junit.runner;uses:="org.junit.runn + ers.model,org.junit.runners,junit.framework,org.junit.internal.runners, + org.junit.internal,junit.runner,org.junit.runner.notification,org.junit + .runner.manipulation,org.junit.internal.requests,org.junit.internal.bui + lders";version="4.11",org.junit.runners;uses:="org.junit.internal.runne + rs,org.junit.runners.model,org.junit.internal.runners.model,org.junit.i + nternal.runners.rules,org.junit.rules,org.junit.runner,org.junit.runner + .notification,org.junit.internal.runners.statements,org.junit,org.junit + .internal,org.junit.runner.manipulation,org.junit.internal.builders";ve + rsion="4.11",org.junit.matchers;uses:="org.junit.internal.matchers,org. + hamcrest.core,org.hamcrest";version="4.11",org.junit.runner.notificatio + n;uses:="org.junit.runner";version="4.11",org.junit.experimental.result + s;uses:="org.junit.runner,org.junit.runner.notification,org.junit.inter + nal,org.hamcrest";version="4.11",org.junit.experimental.max;uses:="org. + junit.runner,org.junit.runners,org.junit.internal.runners,org.junit.run + ners.model,org.junit.internal.requests,junit.framework,org.junit.runner + .notification";version="4.11",org.junit.internal.builders;uses:="org.ju + nit.runner,org.junit.runners.model,org.junit,org.junit.runner.notificat + ion,junit.framework,org.junit.internal.runners,org.junit.runners";versi + on="4.11",org.junit;uses:="org.junit.internal,org.hamcrest,org.junit.ru + nners";version="4.11",org.junit.experimental.runners;uses:="org.junit.r + unners,org.junit.runners.model";version="4.11",org.junit.internal.runne + rs.rules;uses:="org.junit.rules,org.junit.runners.model,org.junit";vers + ion="4.11",org.junit.internal.matchers;uses:="org.hamcrest,org.junit.in + ternal";version="4.11",org.junit.internal.requests;uses:="org.junit.run + ner,org.junit.internal.builders,org.junit.runner.manipulation,org.junit + .internal.runners";version="4.11",org.junit.experimental;uses:="org.jun + it.runner,org.junit.runners.model,org.junit.runners";version="4.11",org + .junit.runners.model;uses:="org.junit.internal.runners.model,org.junit. + internal.runners,org.junit.runner,org.junit.internal,org.junit";version + ="4.11",org.junit.internal.runners.statements;uses:="org.junit.internal + ,org.junit.runners.model";version="4.11",junit.runner;uses:="junit.fram + ework";version="4.11",junit.textui;uses:="junit.framework,junit.runner" + ;version="4.11",junit.extensions;uses:="junit.framework";version="4.11" + ,junit.framework;uses:="org.junit.runner.manipulation,org.junit.runner, + org.junit.runner.notification,org.junit,org.junit.internal";version="4. + 11" +Import-Package: org.hamcrest;version="1.3",org.hamcrest.core;version="1. + 3"
  14. Download patch src/test/java/junit/tests/runner/ResultTest.java

    --- 4.12-4/src/test/java/junit/tests/runner/ResultTest.java 2014-12-04 16:13:56.000000000 +0000 +++ 4.12-4ubuntu1/src/test/java/junit/tests/runner/ResultTest.java 2016-03-08 17:37:35.000000000 +0000 @@ -36,13 +36,6 @@ public class ResultTest extends TestCase ObjectInputStream objectInputStream = new ObjectInputStream(new ByteArrayInputStream(bytes)); Result fromStream = (Result) objectInputStream.readObject(); assertSerializedCorrectly(result, fromStream); - - InputStream resource = getClass().getResourceAsStream(getName()); - assertNotNull("Could not read resource " + getName(), resource); - objectInputStream = new ObjectInputStream(resource); - fromStream = (Result) objectInputStream.readObject(); - - assertSerializedCorrectly(new ResultWithFixedRunTime(result), fromStream); } /**
  15. Download patch debian/junit4-doc.install

    --- 4.12-4/debian/junit4-doc.install 2015-12-22 17:47:55.000000000 +0000 +++ 4.12-4ubuntu1/debian/junit4-doc.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -target/site/apidocs/* usr/share/doc/junit4/api -target/apidocs/* usr/share/doc/junit4/api
  16. Download patch .pc/maven2-compatibility.patch/pom.xml
  17. Download patch debian/patches/tweak-resulttest.patch

    --- 4.12-4/debian/patches/tweak-resulttest.patch 1970-01-01 00:00:00.000000000 +0000 +++ 4.12-4ubuntu1/debian/patches/tweak-resulttest.patch 2015-06-19 15:08:19.000000000 +0000 @@ -0,0 +1,16 @@ +--- a/src/test/java/junit/tests/runner/ResultTest.java ++++ b/src/test/java/junit/tests/runner/ResultTest.java +@@ -36,13 +36,6 @@ public class ResultTest extends TestCase + ObjectInputStream objectInputStream = new ObjectInputStream(new ByteArrayInputStream(bytes)); + Result fromStream = (Result) objectInputStream.readObject(); + assertSerializedCorrectly(result, fromStream); +- +- InputStream resource = getClass().getResourceAsStream(getName()); +- assertNotNull("Could not read resource " + getName(), resource); +- objectInputStream = new ObjectInputStream(resource); +- fromStream = (Result) objectInputStream.readObject(); +- +- assertSerializedCorrectly(new ResultWithFixedRunTime(result), fromStream); + } + + /**
  18. Download patch debian/ant.properties

    --- 4.12-4/debian/ant.properties 1970-01-01 00:00:00.000000000 +0000 +++ 4.12-4ubuntu1/debian/ant.properties 2015-06-19 14:36:25.000000000 +0000 @@ -0,0 +1,3 @@ +hamcrestlib=/usr/share/java/hamcrest-core.jar +manifest=debian/MANIFEST.MF +version-status=
  19. Download patch debian/build.xml
  20. Download patch debian/orig-tar.exclude

    --- 4.12-4/debian/orig-tar.exclude 2015-12-22 17:47:55.000000000 +0000 +++ 4.12-4ubuntu1/debian/orig-tar.exclude 2015-12-22 23:14:37.000000000 +0000 @@ -1,8 +1,5 @@ *.jar *.zip apache-maven -hopscotch-*.min.js -.classpath -.project -.settings -.travis.yml + +
  21. Download patch debian/junit-pom-template.xml

    --- 4.12-4/debian/junit-pom-template.xml 1970-01-01 00:00:00.000000000 +0000 +++ 4.12-4ubuntu1/debian/junit-pom-template.xml 2015-06-19 15:09:44.000000000 +0000 @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd "> + <modelVersion>4.0.0</modelVersion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>@version@</version> + <name>JUnit</name> + <url>http://junit.org</url> + <description> + JUnit is a regression testing framework written by Erich Gamma and Kent Beck. + It is used by the developer who implements unit tests in Java. + </description> + <organization> + <name>JUnit</name> + <url>http://www.junit.org</url> + </organization> + <mailingLists> + <mailingList> + <name>JUnit Mailing List</name> + <post>junit@yahoogroups.com</post> + <archive> + http://tech.groups.yahoo.com/group/junit/ + </archive> + </mailingList> + </mailingLists> + <licenses> + <license> + <name>Common Public License Version 1.0</name> + <url>http://www.opensource.org/licenses/cpl1.0.txt</url> + </license> + </licenses> + <scm> + <connection>scm:git:git://github.com/KentBeck/junit.git</connection> + <developerConnection>scm:git:git@github.com:KentBeck/junit.git</developerConnection> + <url>http://github.com/KentBeck/junit/tree/master</url> + </scm> + <developers> + <developer> + <id>dsaff</id> + <name>David Saff</name> + <email>david@saff.net</email> + </developer> + </developers> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <encoding>ISO-8859-1</encoding> + <source>${jdk.version}</source> + <target>${jdk.version}</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <version>1.3</version> + <scope>compile</scope> + </dependency> + </dependencies> + <properties> + <jdk.version>1.5</jdk.version> + </properties> +</project> \ No newline at end of file

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: junitperf

junitperf (1.9.1-8ubuntu1) quantal; urgency=low * Ensure backwards compatible bytecode is built (LP: #1049787): - d/rules: Ensure debian/ant.properties is used by dh_auto_build. -- James Page <james.page@ubuntu.com> Thu, 20 Sep 2012 10:23:59 +0100 junitperf (1.9.1-8build1) quantal; urgency=low * No-change rebuild with openjdk-7 as default-jdk. -- James Page <james.page@ubuntu.com> Fri, 18 May 2012 11:41:22 +0100

Modifications :
  1. Download patch debian/rules

    --- 1.9.1-8/debian/rules 2010-05-20 19:35:08.000000000 +0000 +++ 1.9.1-8ubuntu1/debian/rules 2012-09-20 09:21:41.000000000 +0000 @@ -4,4 +4,4 @@ dh $@ --with javahelper override_dh_auto_build: - dh_auto_build -- jar javadoc + dh_auto_build -- -propertyfile debian/ant.properties jar javadoc
  2. Download patch debian/control

    --- 1.9.1-8/debian/control 2010-05-20 19:35:08.000000000 +0000 +++ 1.9.1-8ubuntu1/debian/control 2012-09-20 09:24:13.000000000 +0000 @@ -1,7 +1,8 @@ Source: junitperf Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Arnaud Vandyck <avdyk@debian.org>, Wolfgang Baer <WBaer@gmx.de>, Niels Thykier <niels@thykier.net> Build-Depends: ant, debhelper (>= 7.0.50~), default-jdk, javahelper

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: libcommons-cli-java

libcommons-cli-java (1.3.1-3ubuntu1) xenial; urgency=low * Merge from Debian unstable. Remaining changes: - d/*: Switch to using maven-ant-helper for package build. -- James Page <james.page@ubuntu.com> Tue, 08 Mar 2016 11:39:30 +0000

Modifications :
  1. Download patch debian/build.properties

    --- 1.3.1-3/debian/build.properties 2015-12-15 11:10:01.000000000 +0000 +++ 1.3.1-3ubuntu1/debian/build.properties 2015-12-15 17:15:24.000000000 +0000 @@ -1,7 +1,5 @@ javadoc.dir=target/api -build.sourceDirectory=src/java -build.testDirectory=src/test build.directory=target -maven.test.skip=true +#maven.test.skip=true ant.build.javac.target=1.4 ant.build.javac.source=1.4
  2. Download patch debian/rules

    --- 1.3.1-3/debian/rules 2015-12-15 11:10:58.000000000 +0000 +++ 1.3.1-3ubuntu1/debian/rules 2016-03-08 11:14:12.000000000 +0000 @@ -2,8 +2,23 @@ export JAVA_HOME = /usr/lib/jvm/default-java -%: - dh $@ --buildsystem=maven +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk + +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := ant-nodeps junit4 commons-lang ant-junit +DEB_ANT_BUILD_TARGET := package #javadoc +DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml +DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE) -Dversion=$(VERSION) + +binary-post-install/$(PACKAGE):: + mh_installpoms -p$(PACKAGE) + mh_installjar -p$(PACKAGE) -l pom.xml target/commons-cli-$(VERSION).jar + +clean:: + -rm -rf debian/tmp get-orig-source: -uscan --download-current-version --force-download --rename
  3. Download patch debian/control

    --- 1.3.1-3/debian/control 2015-12-15 12:08:52.000000000 +0000 +++ 1.3.1-3ubuntu1/debian/control 2016-03-08 11:24:57.000000000 +0000 @@ -1,13 +1,18 @@ Source: libcommons-cli-java Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Ludovic Claude <ludovic.claude@laposte.net>, tony mancill <tmancill@debian.org>, Emmanuel Bourg <ebourg@apache.org> Build-Depends: debhelper (>= 9), + cdbs (>= 0.4.8), default-jdk, - maven-debian-helper, + ant, + ant-optional, + maven-ant-helper, maven-repo-helper, + libcommons-lang-java (>= 2.0), junit4 Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/libcommons-cli-java.git

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: libcommons-dbcp-java

libcommons-dbcp-java (1.4-5ubuntu2) xenial; urgency=medium * Build-depend on libtomcat8-java. -- Matthias Klose <doko@ubuntu.com> Mon, 22 Feb 2016 20:56:42 +0100 libcommons-dbcp-java (1.4-5ubuntu1) vivid; urgency=low * Merge from Debian unstable. Remaining changes: - d/ant.properties: Specifiy location of dependencies for build, set source/target version of Java to 1.5. - d/control: Switch BD/BDI's for ant based build, manually specify dependencies for binary packages. - d/libcommons-dbcp-java-doc.install: Pickup docs from ant build location. - d/maven.rules: Specify mappings for installed maven artifacts. - d/patches/01_build.patch: Patch ant build file for Javadoc locations. - d/rules: Rewrite for ant based build. - d/maven.*, d/patches/0001-configure-source-and-target-version-1.5.patch, d/README.source: Dropped as not required for ant based build. -- James Page <james.page@ubuntu.com> Mon, 08 Dec 2014 15:30:21 +0000

Modifications :
  1. Download patch .pc/01_build.patch/build.xml
  2. Download patch debian/README.source

    --- 1.4-5/debian/README.source 2014-10-25 20:19:43.000000000 +0000 +++ 1.4-5ubuntu2/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -Information about libcommons-dbcp-java --------------------------------------- - -This package was debianized using the mh_make command -from the maven-debian-helper package. - -The build system uses Maven but prevents it from downloading -anything from the Internet, making the build compliant with -the Debian policy.
  3. Download patch debian/rules

    --- 1.4-5/debian/rules 2014-10-25 20:19:43.000000000 +0000 +++ 1.4-5ubuntu2/debian/rules 2014-10-26 04:26:39.000000000 +0000 @@ -1,9 +1,25 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk +include /usr/share/cdbs/1/class/ant.mk -JAVA_HOME := /usr/lib/jvm/default-java +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := commons-collections3 commons-pool junit geronimo-jta_1.1_spec + +PACKAGE=commons-dbcp + +DEB_ANT_CLEAN_TARGET := clean +DEB_ANT_BUILD_TARGET := build +#DEB_ANT_CHECK_TARGET := test + +# Per Debian Java Policy, install a versioned JAR and an unversioned symlink +binary-post-install/lib$(PACKAGE)-java:: + mh_installpoms -plib$(PACKAGE)-java + mh_installjar -plib$(PACKAGE)-java -l pom.xml dist/$(PACKAGE).jar + +clean:: + -rm -rf debian/tmp + -rm -fr doc/api DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
  4. Download patch debian/patches/01_build.patch

    --- 1.4-5/debian/patches/01_build.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.4-5ubuntu2/debian/patches/01_build.patch 2012-07-09 09:14:53.000000000 +0000 @@ -0,0 +1,24 @@ +Description: Cleanup upstream build.xml: + - Use local Javadoc index from default-jdk-doc + - Set test.failonerror to false +Origin: vendor +Forwarded: not-needed +Author: Damien Raude-Morvan <drazzib@debian.org> +Last-Update: 2010-02-20 +--- a/build.xml ++++ b/build.xml +@@ -179,8 +179,8 @@ + nohelp="true" + nonavbar="false" + serialwarn="false"> +- <link href="http://java.sun.com/j2se/1.5.0/docs/api"/> +- <link href="http://commons.apache.org/pool/apidocs"/> ++ <link href="/usr/share/doc/default-jdk-doc/api/"/> ++ <link href="/usr/share/doc/libcommons-pool-java/api/"/> + </javadoc> + </target> + +--- /dev/null ++++ b/build.properties +@@ -0,0 +1 @@ ++test.failonerror=false
  5. Download patch .pc/0001-configure-source-and-target-version-1.5.patch/pom.xml
  6. Download patch debian/control

    --- 1.4-5/debian/control 2014-10-25 20:45:36.000000000 +0000 +++ 1.4-5ubuntu2/debian/control 2016-02-22 19:56:40.000000000 +0000 @@ -1,16 +1,16 @@ Source: libcommons-dbcp-java Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Damien Raude-Morvan <drazzib@debian.org>, Emmanuel Bourg <ebourg@apache.org> -Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4) +Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk, maven-repo-helper Build-Depends-Indep: default-jdk-doc, junit, libcommons-pool-java, libcommons-pool-java-doc, libgeronimo-jta-1.1-spec-java, - libmaven-javadoc-plugin-java, libtomcat8-java Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/libcommons-dbcp-java.git @@ -19,8 +19,8 @@ Homepage: http://commons.apache.org/dbcp Package: libcommons-dbcp-java Architecture: all -Depends: ${maven:Depends}, ${misc:Depends} -Suggests: libcommons-dbcp-java-doc, ${maven:OptionalDepends} +Depends: ${misc:Depends}, libcommons-pool-java, libcommons-collections3-java +Suggests: libcommons-dbcp-java-doc, libgeronimo-jta-1.1-spec-java Description: Database Connection Pooling Services The DBCP package provides database connection pooling services. The following features are supported @@ -38,8 +38,8 @@ Description: Database Connection Pooling Package: libcommons-dbcp-java-doc Architecture: all Section: doc -Depends: ${maven:DocDepends}, ${misc:Depends} -Recommends: ${maven:DocOptionalDepends} +Depends: ${misc:Depends} +Recommends: libcommons-pool-java-doc, default-jdk-doc Suggests: libcommons-dbcp-java Description: Database Connection Pooling Services - documentation The DBCP package provides database connection pooling services. The
  7. Download patch .pc/03_exclude-transactions-tests.patch/pom.xml

    --- 1.4-5/.pc/03_exclude-transactions-tests.patch/pom.xml 2016-02-22 23:09:56.000000000 +0000 +++ 1.4-5ubuntu2/.pc/03_exclude-transactions-tests.patch/pom.xml 2010-02-07 16:59:20.000000000 +0000 @@ -265,14 +265,6 @@ <tarLongFileMode>gnu</tarLongFileMode> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> </plugins> </build> <reporting>
  8. Download patch .pc/applied-patches

    --- 1.4-5/.pc/applied-patches 2016-02-22 23:09:56.927601551 +0000 +++ 1.4-5ubuntu2/.pc/applied-patches 2016-02-22 23:09:57.171608059 +0000 @@ -1,3 +1,3 @@ -0001-configure-source-and-target-version-1.5.patch +01_build.patch 02_java7_compat.patch 03_exclude-transactions-tests.patch
  9. Download patch debian/maven.rules

    --- 1.4-5/debian/maven.rules 2014-10-25 20:52:44.000000000 +0000 +++ 1.4-5ubuntu2/debian/maven.rules 2016-02-22 19:57:43.000000000 +0000 @@ -19,3 +19,5 @@ commons-dbcp commons-dbcp jar s/.*/debian/ * * junit junit jar s/.*/3.x/ * * s/tomcat/org.apache.tomcat/ s/naming-common/tomcat-catalina/ * s/.*/8.x/ * * +commons-collections commons-collections jar s/3\..*/3.x/ +s/org.apache.geronimo.specs/glassfish/ s/geronimo-jta_1.1_spec/javaee/ jar s/.*/debian/
  10. Download patch build.properties

    --- 1.4-5/build.properties 1970-01-01 00:00:00.000000000 +0000 +++ 1.4-5ubuntu2/build.properties 2016-02-22 23:09:57.000000000 +0000 @@ -0,0 +1 @@ +test.failonerror=false
  11. Download patch debian/patches/0001-configure-source-and-target-version-1.5.patch

    --- 1.4-5/debian/patches/0001-configure-source-and-target-version-1.5.patch 2014-10-25 20:19:43.000000000 +0000 +++ 1.4-5ubuntu2/debian/patches/0001-configure-source-and-target-version-1.5.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -From: Torsten Werner <twerner@debian.org> -Date: Sun, 11 Sep 2011 17:24:30 +0200 -Subject: configure source and target version 1.5 - ---- - pom.xml | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/pom.xml b/pom.xml -index bff49ea..e145e42 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -265,6 +265,14 @@ - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> - </plugin> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-compiler-plugin</artifactId> -+ <configuration> -+ <source>1.5</source> -+ <target>1.5</target> -+ </configuration> -+ </plugin> - </plugins> - </build> - <reporting> ---
  12. Download patch debian/patches/03_exclude-transactions-tests.patch

    --- 1.4-5/debian/patches/03_exclude-transactions-tests.patch 2014-10-25 20:19:43.000000000 +0000 +++ 1.4-5ubuntu2/debian/patches/03_exclude-transactions-tests.patch 2014-12-08 15:05:46.000000000 +0000 @@ -3,9 +3,9 @@ Author: Emmanuel Bourg <ebourg@apache.or Forwarded: not-needed --- a/pom.xml +++ b/pom.xml -@@ -272,6 +272,20 @@ - <source>1.5</source> - <target>1.5</target> +@@ -278,6 +278,20 @@ + <effort>Default</effort> + <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile> </configuration> + <executions> + <execution> @@ -22,5 +22,5 @@ Forwarded: not-needed + </execution> + </executions> </plugin> - </plugins> - </build> + <plugin> + <groupId>org.codehaus.mojo</groupId>
  13. Download patch debian/patches/series

    --- 1.4-5/debian/patches/series 2014-10-25 20:19:43.000000000 +0000 +++ 1.4-5ubuntu2/debian/patches/series 2014-10-26 04:26:39.000000000 +0000 @@ -1,3 +1,3 @@ -0001-configure-source-and-target-version-1.5.patch +01_build.patch 02_java7_compat.patch 03_exclude-transactions-tests.patch
  14. Download patch debian/libcommons-dbcp-java-doc.install

    --- 1.4-5/debian/libcommons-dbcp-java-doc.install 2014-10-25 20:19:43.000000000 +0000 +++ 1.4-5ubuntu2/debian/libcommons-dbcp-java-doc.install 2014-10-26 04:26:39.000000000 +0000 @@ -1,2 +1,2 @@ -target/apidocs/* usr/share/doc/libcommons-dbcp-java/api +dist/docs/* usr/share/doc/libcommons-dbcp-java
  15. Download patch pom.xml

    --- 1.4-5/pom.xml 2016-02-22 23:09:56.000000000 +0000 +++ 1.4-5ubuntu2/pom.xml 2016-02-22 23:09:57.000000000 +0000 @@ -265,12 +265,18 @@ <tarLongFileMode>gnu</tarLongFileMode> </configuration> </plugin> + </plugins> + </build> + <reporting> + <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.1</version> <configuration> - <source>1.5</source> - <target>1.5</target> + <threshold>Normal</threshold> + <effort>Default</effort> + <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile> </configuration> <executions> <execution> @@ -287,20 +293,6 @@ </execution> </executions> </plugin> - </plugins> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>2.1</version> - <configuration> - <threshold>Normal</threshold> - <effort>Default</effort> - <excludeFilterFile>${basedir}/findbugs-exclude-filter.xml</excludeFilterFile> - </configuration> - </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId>
  16. Download patch debian/maven.cleanIgnoreRules

    --- 1.4-5/debian/maven.cleanIgnoreRules 2014-10-25 20:52:32.000000000 +0000 +++ 1.4-5ubuntu2/debian/maven.cleanIgnoreRules 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -# Maven clean ignore rules - ignore some Maven dependencies and plugins -# during the clean phase of a Maven build -# Format of this file is: -# [group] [artifact] [type] [version] [classifier] [scope] -# where each element can be either -# - the exact string, for example org.apache for the group, or 3.1 -# for the version. In this case, the element is simply matched -# and left as it is -# - * (the star character, alone). In this case, anything will -# match and be left as it is. For example, using * on the -# position of the artifact field will match any artifact id -# All elements much match before a rule can be applied -# Example rule: match jar with groupid= junit, artifactid= junit -# and version starting with 3., this dependency is then removed -# from the POM before mvn clean is called -# junit junit jar s/3\\..*/3.x/ -
  17. Download patch debian/maven.properties

    --- 1.4-5/debian/maven.properties 2014-10-25 20:19:43.000000000 +0000 +++ 1.4-5ubuntu2/debian/maven.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -# Include here properties to pass to Maven during the build. -# For example: -# maven.test.skip=true -
  18. Download patch build.xml

    --- 1.4-5/build.xml 2010-02-07 16:59:20.000000000 +0000 +++ 1.4-5ubuntu2/build.xml 2016-02-22 23:09:57.000000000 +0000 @@ -179,8 +179,8 @@ nohelp="true" nonavbar="false" serialwarn="false"> - <link href="http://java.sun.com/j2se/1.5.0/docs/api"/> - <link href="http://commons.apache.org/pool/apidocs"/> + <link href="/usr/share/doc/default-jdk-doc/api/"/> + <link href="/usr/share/doc/libcommons-pool-java/api/"/> </javadoc> </target>
  19. Download patch debian/maven.ignoreRules

    --- 1.4-5/debian/maven.ignoreRules 2014-10-25 20:52:32.000000000 +0000 +++ 1.4-5ubuntu2/debian/maven.ignoreRules 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -# Maven ignore rules - ignore some Maven dependencies and plugins -# Format of this file is: -# [group] [artifact] [type] [version] [classifier] [scope] -# where each element can be either -# - the exact string, for example org.apache for the group, or 3.1 -# for the version. In this case, the element is simply matched -# and left as it is -# - * (the star character, alone). In this case, anything will -# match and be left as it is. For example, using * on the -# position of the artifact field will match any artifact id -# All elements much match before a rule can be applied -# Example rule: match jar with groupid= junit, artifactid= junit -# and version starting with 3., this dependency is then removed -# from the POM -# junit junit jar s/3\\..*/3.x/ - -commons-logging commons-logging * * * * -org.apache.geronimo.modules geronimo-transaction * * * * -org.apache.maven.plugins maven-assembly-plugin * * * * -org.apache.maven.plugins maven-changes-plugin * * * * -org.apache.maven.plugins maven-checkstyle-plugin * * * * -org.apache.maven.plugins maven-pmd-plugin * * * * -org.apache.maven.plugins maven-surefire-plugin * * * * -org.codehaus.mojo clirr-maven-plugin * * * * -org.codehaus.mojo cobertura-maven-plugin * * * * -org.codehaus.mojo findbugs-maven-plugin * * * * -tomcat naming-java * * * *
  20. Download patch debian/maven.publishedRules

    --- 1.4-5/debian/maven.publishedRules 2014-10-25 20:52:32.000000000 +0000 +++ 1.4-5ubuntu2/debian/maven.publishedRules 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -# Maven published rules - additional rules to publish, to help -# the packaging work of Debian maintainers using mh_make -# Format of this file is: -# [group] [artifact] [type] [version] [classifier] [scope] -# where each element can be either -# - the exact string, for example org.apache for the group, or 3.1 -# for the version. In this case, the element is simply matched -# and left as it is -# - * (the star character, alone). In this case, anything will -# match and be left as it is. For example, using * on the -# position of the artifact field will match any artifact id -# - a regular expression of the form s/match/replace/ -# in this case, elements that match are transformed using -# the regex rule. -# All elements much match before a rule can be applied -# Example rule: match jar with groupid= junit, artifactid= junit -# and version starting with 3., replacing the version with 3.x -# junit junit jar s/3\\..*/3.x/ -
  21. Download patch debian/ant.properties

    --- 1.4-5/debian/ant.properties 1970-01-01 00:00:00.000000000 +0000 +++ 1.4-5ubuntu2/debian/ant.properties 2012-07-09 09:45:00.000000000 +0000 @@ -0,0 +1,4 @@ +commons-collections.jar=/usr/share/java/commons-collections3.jar +commons-pool.jar=/usr/share/java/commons-pool.jar +ant.build.javac.source=1.5 +ant.build.javac.target=1.5

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: libcommons-discovery-java

libcommons-discovery-java (0.5-3ubuntu1) quantal; urgency=low * Merge from Debian testing. Remaining changes: - d/control: Switch Build-Deps from maven to ant, fix Depends on binary packages. - d/rules: Switch from maven to ant cdbs build and ensure that junit4 is used to execute unit tests. - d/ant.properties: Specify build overrides for upstream build.xml to support use of system Java libraries. - d/libcommons-discovery-java-doc.install: install API docs from ant build output. - d/patches/fix_junit4_tests.diff: fix build process to execute tests using the junit ant task rather than executing junit directly in order to support use of JUnit4 annotations. -- James Page <james.page@ubuntu.com> Mon, 28 May 2012 17:18:46 +0100

Modifications :
  1. Download patch debian/rules

    --- 0.5-3/debian/rules 2011-11-14 23:12:27.000000000 +0000 +++ 0.5-3ubuntu1/debian/rules 2012-05-22 09:44:00.000000000 +0000 @@ -1,10 +1,20 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk include /usr/share/cdbs/1/class/javahelper.mk +include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := ant-junit4 ant-junit +DEB_ANT_BUILD_TARGET := dist test.discovery +LIBRARY := commons-discovery + +install/lib$(LIBRARY)-java:: + mh_installpoms -plib$(LIBRARY)-java + mh_installjar -plib$(LIBRARY)-java -l pom.xml dist/$(LIBRARY).jar + +clean:: + -rm -rf debian/tmp get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
  2. Download patch debian/control

    --- 0.5-3/debian/control 2012-03-08 16:08:49.000000000 +0000 +++ 0.5-3ubuntu1/debian/control 2012-05-28 16:19:24.000000000 +0000 @@ -1,13 +1,14 @@ Source: libcommons-discovery-java Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Damien Raude-Morvan <drazzib@debian.org>, Kumar Appaiah <akumar@debian.org>, Varun Hiremath <varun@debian.org>, Jakub Adam <jakub.adam@ktknet.cz> -Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) -Build-Depends-Indep: libcommons-logging-java, junit4, default-jdk-doc, libcommons-logging-java-doc, - libmaven-javadoc-plugin-java, javahelper +Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk +Build-Depends-Indep: ant-optional, libcommons-logging-java, junit4, default-jdk-doc, + libcommons-logging-java-doc, maven-repo-helper, javahelper Standards-Version: 3.9.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-discovery-java/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-discovery-java/ @@ -15,8 +16,7 @@ Homepage: http://commons.apache.org/disc Package: libcommons-discovery-java Architecture: all -Depends: ${misc:Depends}, ${maven:Depends} -Recommends: ${maven:OptionalDepends} +Depends: ${misc:Depends}, libcommons-logging-java Suggests: libcommons-discovery-java-doc Description: locates classes that implement a given Java interface The Discovery Component is about discovering, or finding, @@ -39,8 +39,7 @@ Description: locates classes that implem Package: libcommons-discovery-java-doc Section: doc Architecture: all -Depends: ${misc:Depends}, ${maven:DocDepends} -Recommends: ${maven:DocOptionalDepends} +Depends: ${misc:Depends}, libcommons-logging-java-doc Suggests: libcommons-discovery-java Description: locates classes that implement a given Java interface (documentation) The Discovery Component is about discovering, or finding,
  3. Download patch .pc/applied-patches

    --- 0.5-3/.pc/applied-patches 2012-05-28 17:36:07.931191460 +0000 +++ 0.5-3ubuntu1/.pc/applied-patches 2012-05-28 17:36:08.135196371 +0000 @@ -1,2 +1,3 @@ java6_incompatible_types.diff java6_incompatible_types_tests.diff +fix_junit4_tests.diff
  4. Download patch debian/patches/series

    --- 0.5-3/debian/patches/series 2011-11-01 14:41:14.000000000 +0000 +++ 0.5-3ubuntu1/debian/patches/series 2012-05-22 09:44:00.000000000 +0000 @@ -1,2 +1,3 @@ java6_incompatible_types.diff java6_incompatible_types_tests.diff +fix_junit4_tests.diff
  5. Download patch .pc/fix_junit4_tests.diff/build.xml
  6. Download patch build.xml

    --- 0.5-3/build.xml 2008-07-14 22:44:17.000000000 +0000 +++ 0.5-3ubuntu1/build.xml 2012-05-28 17:36:08.000000000 +0000 @@ -221,11 +221,20 @@ <target name="test.discovery" depends="compile.tests" description="Run basic Service unit tests ..."> <echo message="Running basic Service tests ..."/> - <java classname="${test.runner}" fork="yes" + <!-- java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}"> <arg value="org.apache.commons.discovery.test.TestAll"/> <classpath refid="test.classpath"/> - </java> + </java --> + <junit printsummary="yes" haltonfailure="yes"> + <classpath refid="test.classpath"/> + <formatter type="plain"/> + <batchtest fork="yes"> + <fileset dir="${test.home}"> + <include name="**/TestAll.java"/> + </fileset> + </batchtest> + </junit> </target>
  7. Download patch debian/libcommons-discovery-java-doc.install

    --- 0.5-3/debian/libcommons-discovery-java-doc.install 2011-09-19 21:29:37.000000000 +0000 +++ 0.5-3ubuntu1/debian/libcommons-discovery-java-doc.install 2012-05-22 09:44:00.000000000 +0000 @@ -1,2 +1,2 @@ -target/apidocs/* usr/share/doc/libcommons-discovery-java/api +dist/docs/api/* usr/share/doc/libcommons-discovery-java/api
  8. Download patch debian/ant.properties

    --- 0.5-3/debian/ant.properties 1970-01-01 00:00:00.000000000 +0000 +++ 0.5-3ubuntu1/debian/ant.properties 2011-11-23 11:06:21.000000000 +0000 @@ -0,0 +1,4 @@ +junit.jar=/usr/share/java/junit4.jar +logger.jar=/usr/share/java/commons-logging.jar +ant.build.javac.source=1.5 +ant.build.javac.target=1.5
  9. Download patch debian/patches/fix_junit4_tests.diff

    --- 0.5-3/debian/patches/fix_junit4_tests.diff 1970-01-01 00:00:00.000000000 +0000 +++ 0.5-3ubuntu1/debian/patches/fix_junit4_tests.diff 2011-11-23 11:47:23.000000000 +0000 @@ -0,0 +1,35 @@ +Description: Execute JUnit tests using Ant junit task instead of executing + junit directory using java as this does not support JUnit4 test annotations. + . + Upstream have switched build system to maven so this patch will not be + forwarded either to Debian or to upstream. +Author: James Page <james.page@ubuntu.com> +Forwarded: not-needed + +Index: libcommons-discovery-java-0.5/build.xml +=================================================================== +--- libcommons-discovery-java-0.5.orig/build.xml 2011-11-23 11:13:50.206722656 +0000 ++++ libcommons-discovery-java-0.5/build.xml 2011-11-23 11:16:25.095112101 +0000 +@@ -221,11 +221,20 @@ + <target name="test.discovery" depends="compile.tests" + description="Run basic Service unit tests ..."> + <echo message="Running basic Service tests ..."/> +- <java classname="${test.runner}" fork="yes" ++ <!-- java classname="${test.runner}" fork="yes" + failonerror="${test.failonerror}"> + <arg value="org.apache.commons.discovery.test.TestAll"/> + <classpath refid="test.classpath"/> +- </java> ++ </java --> ++ <junit printsummary="yes" haltonfailure="yes"> ++ <classpath refid="test.classpath"/> ++ <formatter type="plain"/> ++ <batchtest fork="yes"> ++ <fileset dir="${test.home}"> ++ <include name="**/TestAll.java"/> ++ </fileset> ++ </batchtest> ++ </junit> + </target> + +

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: libcommons-lang-java

libcommons-lang-java (2.6-6ubuntu2) xenial; urgency=medium * d/libcommons-lang-java.poms: do not reference javadoc.jar (LP: #1556647) . -- Nishanth Aravamudan <nish.aravamudan@canonical.com> Wed, 16 Mar 2016 12:24:31 -0700 libcommons-lang-java (2.6-6ubuntu1) xenial; urgency=medium * Resync with Debian unstable, remaining changes: - d/control,rules,libcommons-lang-java.poms: Drop use of bnd for generating OSGi metadata. -- James Page <james.page@ubuntu.com> Tue, 08 Mar 2016 11:12:15 +0000

Modifications :
  1. Download patch debian/rules

    --- 2.6-6/debian/rules 2015-11-17 15:09:35.000000000 +0000 +++ 2.6-6ubuntu2/debian/rules 2016-03-08 10:46:45.000000000 +0000 @@ -11,9 +11,6 @@ export CLASSPATH=$(shell for jar in `cat override_dh_auto_build: ANT_ARGS="-Dbasedir=$(realpath .) -Djdk.javadoc=file:///usr/share/doc/default-jdk-doc/api/ jar javadoc javadoc-jar" dh_auto_build - cat debian/commons-lang.bnd | sed s/VERSION/$(DEB_UPSTREAM_VERSION)/ > debian/.commons-lang-versioned.bnd - echo debian/.commons-lang-versioned.bnd >> debian/.mh_clean - bnd wrap --properties debian/.commons-lang-versioned.bnd --output target/commons-lang.bnd.jar target/commons-lang-$(DEB_UPSTREAM_VERSION).jar get-orig-source: -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
  2. Download patch debian/control

    --- 2.6-6/debian/control 2015-11-17 15:09:35.000000000 +0000 +++ 2.6-6ubuntu2/debian/control 2016-03-08 10:48:58.000000000 +0000 @@ -1,7 +1,8 @@ Source: libcommons-lang-java Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Emmanuel Bourg <ebourg@apache.org> Build-Depends: @@ -10,7 +11,6 @@ Build-Depends: default-jdk, maven-repo-helper (>= 1.7) Build-Depends-Indep: - bnd (>= 2.1.0), default-jdk-doc, junit (>= 3.8.1), libcommons-parent-java (>= 12)
  3. Download patch debian/libcommons-lang-java.poms

    --- 2.6-6/debian/libcommons-lang-java.poms 2015-11-17 15:09:35.000000000 +0000 +++ 2.6-6ubuntu2/debian/libcommons-lang-java.poms 2016-03-16 22:13:39.000000000 +0000 @@ -23,5 +23,4 @@ # --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created # temporarily for certain artifacts such as Javadoc jars. # -pom.xml --has-package-version --artifact=target/commons-lang.bnd.jar --java-lib - +pom.xml --has-package-version --artifact=target/commons-lang-*[^javadoc].jar --java-lib

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: libgnumail-java

libgnumail-java (1.1.2-10ubuntu1) xenial; urgency=low * Merge from Debian unstable. Remaining changes: - d/p/add-osgi-metadata.patch: Drop requirement for javax.activiation, fixing FTBFS in eclipse-* packages. - Don't use bnd to generate OSGi metadata. -- James Page <james.page@ubuntu.com> Mon, 07 Mar 2016 17:18:03 +0000

Modifications :
  1. Download patch .pc/add-osgi-metadata.patch/build.xml
  2. Download patch debian/patches/add-osgi-metadata.patch

    --- 1.1.2-10/debian/patches/add-osgi-metadata.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.2-10ubuntu1/debian/patches/add-osgi-metadata.patch 2014-03-27 09:16:36.000000000 +0000 @@ -0,0 +1,25 @@ +From: Jakub Adam <jakub.adam@ktknet.cz> +Date: Sun, 16 Oct 2011 11:57:21 +0200 +Subject: add-osgi-metadata + +--- + build.xml | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +--- a/build.xml ++++ b/build.xml +@@ -161,6 +161,14 @@ Free Software Foundation, Inc., 51 Frank + <include name='mime.types'/> + <include name='javamail.charset.map'/> + </metainf> ++ <manifest> ++ <attribute name="Bundle-ManifestVersion" value="2"/> ++ <attribute name="Bundle-Name" value="GNU JavaMail"/> ++ <attribute name="Bundle-Vendor" value="gnu.org"/> ++ <attribute name="Bundle-SymbolicName" value="javax.mail"/> ++ <attribute name="Bundle-Version" value="1.1.2"/> ++ <attribute name="Export-Package" value="javax.mail,javax.mail.event,javax.mail.internet,javax.mail.search,javax.mail.util"/> ++ </manifest> + <include name='javax/mail/**/*.class'/> + <include name='gnu/mail/util/*.class'/> + <include name='gnu/mail/handler/*.class'/>
  3. Download patch debian/rules

    --- 1.1.2-10/debian/rules 2015-11-17 16:20:10.000000000 +0000 +++ 1.1.2-10ubuntu1/debian/rules 2016-03-07 15:20:54.000000000 +0000 @@ -13,12 +13,9 @@ DEB_ANT_ARGS := -Dpackage=$(PACK -Ddoc=api -Dant.build.javac.source=1.4 API_DOCS := api -common-post-build-indep:: - bnd wrap --properties debian/gnumail.bnd --output debian/gnumail-$(VERSION).jar ./gnumail-$(VERSION).jar - install/$(PACKAGE):: mh_installpom -p$(PACKAGE) debian/gnumail.pom - mh_installjar -p$(PACKAGE) --java-lib debian/gnumail.pom debian/gnumail-$(VERSION).jar + mh_installjar -p$(PACKAGE) --java-lib debian/gnumail.pom gnumail-$(VERSION).jar dh_install -p$(PACKAGE) ./gnumail-providers-$(VERSION).jar usr/share/java dh_link -p$(PACKAGE) usr/share/java/gnumail-providers-$(VERSION).jar usr/share/java/gnumail-providers.jar dh_installchangelogs ChangeLog
  4. Download patch debian/gnumail.bnd

    --- 1.1.2-10/debian/gnumail.bnd 2015-11-17 16:20:10.000000000 +0000 +++ 1.1.2-10ubuntu1/debian/gnumail.bnd 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -Bundle-Name: GNU JavaMail -Bundle-SymbolicName: javax.mail -Bundle-Version: 1.1.2 -Bundle-Vendor: Debian.org -Import-Package: !gnu.inet.util, * --nouses: true
  5. Download patch debian/control

    --- 1.1.2-10/debian/control 2015-11-17 16:20:10.000000000 +0000 +++ 1.1.2-10ubuntu1/debian/control 2016-03-07 14:56:31.000000000 +0000 @@ -1,7 +1,8 @@ Source: libgnumail-java Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Torsten Werner <twerner@debian.org>, Jakub Adam <jakub.adam@ktknet.cz> @@ -11,7 +12,6 @@ Build-Depends: debhelper (>= 9), maven-repo-helper Build-Depends-Indep: - bnd (>= 2.1.0), default-jdk, default-jdk-doc, libgnuinet-java
  6. Download patch .pc/applied-patches

    --- 1.1.2-10/.pc/applied-patches 2016-03-07 20:08:54.708561986 +0000 +++ 1.1.2-10ubuntu1/.pc/applied-patches 2016-03-07 20:08:54.932568101 +0000 @@ -2,3 +2,4 @@ gnumail-imaps.patch javadoc-link.patch 04_remove_jaf_dependency.patch +add-osgi-metadata.patch
  7. Download patch debian/patches/series

    --- 1.1.2-10/debian/patches/series 2015-11-17 16:20:10.000000000 +0000 +++ 1.1.2-10ubuntu1/debian/patches/series 2015-11-17 22:44:51.000000000 +0000 @@ -2,3 +2,4 @@ gnumail-imaps.patch javadoc-link.patch 04_remove_jaf_dependency.patch +add-osgi-metadata.patch
  8. Download patch build.xml

    --- 1.1.2-10/build.xml 2016-03-07 20:08:54.000000000 +0000 +++ 1.1.2-10ubuntu1/build.xml 2016-03-07 20:08:54.000000000 +0000 @@ -161,6 +161,14 @@ Free Software Foundation, Inc., 51 Frank <include name='mime.types'/> <include name='javamail.charset.map'/> </metainf> + <manifest> + <attribute name="Bundle-ManifestVersion" value="2"/> + <attribute name="Bundle-Name" value="GNU JavaMail"/> + <attribute name="Bundle-Vendor" value="gnu.org"/> + <attribute name="Bundle-SymbolicName" value="javax.mail"/> + <attribute name="Bundle-Version" value="1.1.2"/> + <attribute name="Export-Package" value="javax.mail,javax.mail.event,javax.mail.internet,javax.mail.search,javax.mail.util"/> + </manifest> <include name='javax/mail/**/*.class'/> <include name='gnu/mail/util/*.class'/> <include name='gnu/mail/handler/*.class'/>

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: libjaxen-java

libjaxen-java (1.1.6-1ubuntu1) trusty; urgency=low * Revert to using ant for build process to support continued main inclusion in Ubuntu. -- James Page <james.page@ubuntu.com> Tue, 12 Nov 2013 14:35:11 +0000

Modifications :
  1. Download patch debian/rules

    --- 1.1.6-1/debian/rules 2013-07-25 17:27:31.000000000 +0000 +++ 1.1.6-1ubuntu1/debian/rules 2013-11-12 13:55:46.000000000 +0000 @@ -1,9 +1,19 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/maven.mk +include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/debhelper.mk JAVA_HOME := /usr/lib/jvm/default-java +DEB_ANT_BUILDFILE := debian/build.xml +DEB_JARS := ant-junit junit xom +DEB_ANT_BUILD_TARGET := dist + +install/libjaxen-java:: + mh_installpoms -plibjaxen-java + mh_installjar -plibjaxen-java -l pom.xml dist/jaxen.jar + +clean:: + mh_clean get-orig-source: uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename
  2. Download patch debian/control

    --- 1.1.6-1/debian/control 2013-07-26 09:31:47.000000000 +0000 +++ 1.1.6-1ubuntu1/debian/control 2013-11-12 13:27:56.000000000 +0000 @@ -1,11 +1,12 @@ Source: libjaxen-java Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Marcus Better <marcus@better.se>, Emmanuel Bourg <ebourg@apache.org>, Damien Raude-Morvan <drazzib@debian.org> -Build-Depends: cdbs, debhelper (>= 7), default-jdk -Build-Depends-Indep: junit, libdom4j-java, libjdom1-java, libxom-java, maven-debian-helper, libmaven-javadoc-plugin-java +Build-Depends: cdbs, debhelper (>= 7), ant, ant-optional, default-jdk +Build-Depends-Indep: junit, libdom4j-java, libjdom1-java, libxom-java, maven-repo-helper Standards-Version: 3.9.4 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libjaxen-java Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libjaxen-java
  3. Download patch debian/libjaxen-java-doc.docs

    --- 1.1.6-1/debian/libjaxen-java-doc.docs 2013-07-25 16:24:04.000000000 +0000 +++ 1.1.6-1ubuntu1/debian/libjaxen-java-doc.docs 2013-11-12 14:05:09.000000000 +0000 @@ -1 +1 @@ -target/apidocs +dist/docs/api
  4. Download patch debian/libjaxen-java-doc.links
  5. Download patch debian/libjaxen-java-doc.doc-base

    --- 1.1.6-1/debian/libjaxen-java-doc.doc-base 2013-07-25 16:26:28.000000000 +0000 +++ 1.1.6-1ubuntu1/debian/libjaxen-java-doc.doc-base 2013-11-12 14:08:23.000000000 +0000 @@ -5,5 +5,5 @@ Abstract: This is the API Javadoc provid Section: Programming Format: HTML -Index: /usr/share/doc/libjaxen-java-doc/apidocs/index.html -Files: /usr/share/doc/libjaxen-java-doc/apidocs/* +Index: /usr/share/doc/libjaxen-java-doc/api/index.html +Files: /usr/share/doc/libjaxen-java-doc/api/*
  6. Download patch debian/ant.properties

    --- 1.1.6-1/debian/ant.properties 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.6-1ubuntu1/debian/ant.properties 2013-11-12 14:08:06.000000000 +0000 @@ -0,0 +1,4 @@ +ant.build.javac.source=1.3 +ant.build.javac.target=1.3 +noget=true +libdir=/usr/share/java
  7. Download patch debian/build.xml

    --- 1.1.6-1/debian/build.xml 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.6-1ubuntu1/debian/build.xml 2013-11-12 13:55:37.000000000 +0000 @@ -0,0 +1,190 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!--build.xml generated by maven from project.xml version 1.1 + on date February 13 2006, time 1000--> +<project default="jar" name="jaxen" basedir=".."> + <!--Load local and user build preferences--> + <property file="build.properties"></property> + <property file="${user.home}/build.properties"></property> + <!--Build properties--> + <property name="defaulttargetdir" value="${basedir}/target"></property> + <property name="libdir" value="/usr/share/java"></property> + <property name="classesdir" value="${basedir}/target/classes"></property> + <property name="testclassesdir" value="${basedir}/target/test-classes"></property> + <property name="testreportdir" value="${basedir}/target/test-reports"></property> + <property name="distdir" value="${basedir}/dist"></property> + <property name="javadocdir" value="${basedir}/dist/docs/api"></property> + <property name="final.name" value="jaxen"></property> + <property name="proxy.host" value=""></property> + <property name="proxy.port" value=""></property> + <property name="proxy.username" value=""></property> + <property name="proxy.password" value=""></property> + <path id="build.classpath"> + <pathelement location="${libdir}/dom4j.jar"></pathelement> + <pathelement location="${libdir}/jdom1.jar"></pathelement> + <pathelement location="${libdir}/xml-apis.jar"></pathelement> + <pathelement location="${libdir}/xercesImpl.jar"></pathelement> + <pathelement location="${libdir}/xom.jar"></pathelement> + <pathelement location="${libdir}/junit.jar"></pathelement> + </path> + <target name="init" description="o Initializes some properties"> + <mkdir dir="${libdir}"></mkdir> + <!--Test if JUNIT is present in ANT classpath--> + <available property="Junit.present" classname="junit.framework.Test"></available> + <!--Test if user defined a proxy--> + <condition property="useProxy"> + <and> + <isset property="proxy.host"></isset> + <not> + <equals trim="true" arg2="" arg1="${proxy.host}"></equals> + </not> + </and> + </condition> + </target> + <target name="compile" description="o Compile the code"> + <mkdir dir="${classesdir}"></mkdir> + <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> + <src> + <pathelement location="${basedir}/src/java/main"></pathelement> + </src> + <classpath refid="build.classpath"></classpath> + </javac> + </target> + <target name="jar" description="o Create the jar" depends="compile,test"> + <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar> + </target> + <target name="clean" description="o Clean up the generated directories"> + <delete dir="${defaulttargetdir}"></delete> + <delete dir="${distdir}"></delete> + </target> + <target name="dist" description="o Create a distribution" depends="jar, javadoc"> + <mkdir dir="dist"></mkdir> + <copy todir="dist"> + <fileset dir="${defaulttargetdir}" includes="*.jar"></fileset> + <fileset dir="${basedir}" includes="LICENSE*, README*"></fileset> + </copy> + </target> + <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test"> + <fail message="There were test failures."></fail> + </target> + <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests"> + <mkdir dir="${testreportdir}"></mkdir> + <junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true"> + <sysproperty key="basedir" value="."></sysproperty> + <formatter type="xml"></formatter> + <formatter usefile="false" type="plain"></formatter> + <classpath> + <path refid="build.classpath"></path> + <pathelement path="${testclassesdir}"></pathelement> + <pathelement path="${classesdir}"></pathelement> + </classpath> + <batchtest todir="${testreportdir}"> + <fileset dir="${basedir}/src/java/test"> + <include name="**/*Test.java"></include> + <exclude name="org/jaxen/jdom/XPathTest.java"></exclude> + </fileset> + </batchtest> + </junit> + </target> + <target name="junit-present" unless="Junit.present" depends="init"> + <echo>================================= WARNING ================================</echo> + <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo> + <echo>==========================================================================</echo> + </target> + <target name="compile-tests" if="Junit.present" depends="junit-present,compile"> + <mkdir dir="${testclassesdir}"></mkdir> + <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> + <src> + <pathelement location="${basedir}/src/java/test"></pathelement> + </src> + <classpath> + <path refid="build.classpath"></path> + <pathelement path="${classesdir}"></pathelement> + </classpath> + </javac> + <copy todir="${testclassesdir}"> + <fileset dir="${basedir}/src/java/test"> + <include name="**/*.werk"></include> + <include name="**/*.xml"></include> + <include name="**/*.properties"></include> + </fileset> + </copy> + </target> + <target name="javadoc" description="o Generate javadoc"> + <mkdir dir="${javadocdir}"></mkdir> + <tstamp> + <format pattern="2001-yyyy" property="year"></format> + </tstamp> + <property name="copyright" value="Copyright &amp;copy; Codehaus. All Rights Reserved."></property> + <property name="title" value="jaxen 1.1.3 API"></property> + <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java/main" packagenames="org.jaxen.*"> + <classpath> + <path refid="build.classpath"></path> + </classpath> + </javadoc> + </target> + <target name="get-dep-dom4j.jar" description="o Download the dependency : dom4j.jar" unless="dom4j.jar" depends="init,setProxy,noProxy,get-custom-dep-dom4j.jar"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/dom4j.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven/repository/JPP/jars/dom4j.jar"></get> + </target> + <target name="get-custom-dep-dom4j.jar" if="dom4j.jar" depends="init,setProxy,noProxy"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/dom4j.jar" usetimestamp="true" ignoreerrors="true" src="${dom4j.jar}"></get> + </target> + <target name="get-dep-jdom.jar" description="o Download the dependency : jdom.jar" unless="jdom.jar" depends="init,setProxy,noProxy,get-custom-dep-jdom.jar"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/jdom.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven/repository/JPP/jars/jdom.jar"></get> + </target> + <target name="get-custom-dep-jdom.jar" if="jdom.jar" depends="init,setProxy,noProxy"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/jdom.jar" usetimestamp="true" ignoreerrors="true" src="${jdom.jar}"></get> + </target> + <target name="get-dep-xmlParserAPIs.jar" description="o Download the dependency : xmlParserAPIs.jar" unless="xmlParserAPIs.jar" depends="init,setProxy,noProxy,get-custom-dep-xmlParserAPIs.jar"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/xml-commons-apis.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven/repository/JPP/jars/xml-commons-apis.jar"></get> + </target> + <target name="get-custom-dep-xmlParserAPIs.jar" if="xmlParserAPIs.jar" depends="init,setProxy,noProxy"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/xml-commons-apis.jar" usetimestamp="true" ignoreerrors="true" src="${xmlParserAPIs.jar}"></get> + </target> + <target name="get-dep-xercesImpl.jar" description="o Download the dependency : xercesImpl.jar" unless="xercesImpl.jar" depends="init,setProxy,noProxy,get-custom-dep-xercesImpl.jar"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/xerces-j2.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven/repository/JPP/jars/xerces-j2.jar"></get> + </target> + <target name="get-custom-dep-xercesImpl.jar" if="xercesImpl.jar" depends="init,setProxy,noProxy"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/xerces-j2.jar" usetimestamp="true" ignoreerrors="true" src="${xercesImpl.jar}"></get> + </target> + <target name="get-dep-xom.jar" description="o Download the dependency : xom.jar" unless="xom.jar" depends="init,setProxy,noProxy,get-custom-dep-xom.jar"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/xom.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven/repository/JPP/jars/xom.jar"></get> + </target> + <target name="get-custom-dep-xom.jar" if="xom.jar" depends="init,setProxy,noProxy"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/xom.jar" usetimestamp="true" ignoreerrors="true" src="${xom.jar}"></get> + </target> + <target name="get-dep-junit.jar" description="o Download the dependency : junit.jar" unless="junit.jar" depends="init,setProxy,noProxy,get-custom-dep-junit.jar"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/junit.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven/repository/JPP/jars/junit.jar"></get> + </target> + <target name="get-custom-dep-junit.jar" if="junit.jar" depends="init,setProxy,noProxy"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/junit.jar" usetimestamp="true" ignoreerrors="true" src="${junit.jar}"></get> + </target> + <target name="get-deps" unless="noget" depends="get-dep-dom4j.jar,get-dep-jdom.jar,get-dep-xmlParserAPIs.jar,get-dep-xercesImpl.jar,get-dep-xom.jar,get-dep-junit.jar"></target> + <target name="setProxy" if="useProxy" depends="init"> + <!--Proxy settings works only with a JDK 1.2 and higher.--> + <echo>Proxy used :</echo> + <echo>Proxy host [${proxy.host}]</echo> + <echo>Proxy port [${proxy.port}]</echo> + <echo>Proxy user [${proxy.username}]</echo> + <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}"></setproxy> + </target> + <target name="noProxy" unless="useProxy" depends="init"> + <echo>Proxy not used.</echo> + </target> + <target name="install-maven"> + <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"></get> + <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar> + </target> +</project>

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: libjaxp1.3-java

libjaxp1.3-java (1.3.05-2ubuntu3) quantal; urgency=low * No-change rebuild with openjdk-7 as default-jdk. -- James Page <james.page@ubuntu.com> Fri, 18 May 2012 11:43:46 +0100 libjaxp1.3-java (1.3.05-2ubuntu2) precise; urgency=low * No-change rebuild to drop spurious libsfgcc1 dependency on armhf. -- Adam Conrad <adconrad@0c3.net> Fri, 02 Dec 2011 20:59:58 -0700 libjaxp1.3-java (1.3.05-2ubuntu1) precise; urgency=low * Merge with Debian; remaining changes: -- Matthias Klose <doko@ubuntu.com> Thu, 01 Dec 2011 17:46:28 +0100

Modifications :
  1. Download patch debian/control

    --- 1.3.05-2/debian/control 2011-11-15 22:58:39.000000000 +0000 +++ 1.3.05-2ubuntu3/debian/control 2011-12-01 16:48:34.000000000 +0000 @@ -1,7 +1,8 @@ Source: libjaxp1.3-java Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Matthias Klose <doko@ubuntu.com>, Michael Koch <konqueror@gmx.de>, Jakub Adam <jakub.adam@ktknet.cz> Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-repo-helper, @@ -15,7 +16,7 @@ Package: libjaxp1.3-java Architecture: all Depends: ${misc:Depends} Suggests: libjaxp1.3-java-gcj -Conflicts: libxalan2-java (<= 2.7.1-2) +Conflicts: libxalan2-java (<= 2.7.1-3) Description: Java XML parser and transformer APIs (DOM, SAX, JAXP, TrAX) xml-apis.jar from the Apache XML Commons project is used by the Xerces-J XML parser and Xalan-J XSLT processor and specifies these APIs:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: libphonenumber

libphonenumber (7.1.0-5ubuntu2) zesty; urgency=high * No change rebuild against boost1.62. -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 01 Nov 2016 16:26:52 +0000 libphonenumber (7.1.0-5ubuntu1) yakkety; urgency=medium [ Ken VanDine ] * Sync from debian unstable * Remaining changes: - debian/patches/hash_as_diallable_char.patch -- Ken VanDine <ken.vandine@canonical.com> Wed, 21 Sep 2016 10:18:53 -0400

Modifications :
  1. Download patch .pc/hash_as_diallable_char.patch/cpp/test/phonenumbers/phonenumberutil_test.cc
  2. Download patch debian/control

    --- 7.1.0-5/debian/control 2016-09-13 21:13:45.000000000 +0000 +++ 7.1.0-5ubuntu2/debian/control 2016-11-01 16:26:52.000000000 +0000 @@ -1,6 +1,7 @@ Source: libphonenumber Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Daniel Pocock <daniel@pocock.pro>, Fredrik Roubert <roubert@google.com> Build-Depends: cdbs, cmake,
  3. Download patch debian/patches/readdir_r-is-deprecated.patch

    --- 7.1.0-5/debian/patches/readdir_r-is-deprecated.patch 2016-09-13 21:13:45.000000000 +0000 +++ 7.1.0-5ubuntu2/debian/patches/readdir_r-is-deprecated.patch 2016-09-21 14:20:13.000000000 +0000 @@ -13,11 +13,11 @@ Origin: https://github.com/googlei18n/li tools/cpp/src/cpp-build/generate_geocoding_data.cc | 53 +++++++++------------- 3 files changed, 27 insertions(+), 35 deletions(-) -diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt -index 9a3adb0..4d95238 100644 ---- a/cpp/CMakeLists.txt -+++ b/cpp/CMakeLists.txt -@@ -82,14 +82,14 @@ if (${USE_ALTERNATE_FORMATS} STREQUAL "ON") +Index: libphonenumber-7.1.0-4ubuntu1/cpp/CMakeLists.txt +=================================================================== +--- libphonenumber-7.1.0-4ubuntu1.orig/cpp/CMakeLists.txt ++++ libphonenumber-7.1.0-4ubuntu1/cpp/CMakeLists.txt +@@ -82,14 +82,14 @@ if (${USE_ALTERNATE_FORMATS} STREQUAL "O endif () # Find all the required libraries and programs. @@ -35,10 +35,10 @@ index 9a3adb0..4d95238 100644 endif () include_directories (${Boost_INCLUDE_DIRS}) endif () -diff --git a/tools/cpp/CMakeLists.txt b/tools/cpp/CMakeLists.txt -index fafa846..1dcf285 100644 ---- a/tools/cpp/CMakeLists.txt -+++ b/tools/cpp/CMakeLists.txt +Index: libphonenumber-7.1.0-4ubuntu1/tools/cpp/CMakeLists.txt +=================================================================== +--- libphonenumber-7.1.0-4ubuntu1.orig/tools/cpp/CMakeLists.txt ++++ libphonenumber-7.1.0-4ubuntu1/tools/cpp/CMakeLists.txt @@ -38,6 +38,7 @@ endif () include_directories ("src") @@ -53,10 +53,10 @@ index fafa846..1dcf285 100644 add_executable (generate_geocoding_data_test ${TEST_SOURCES}) -target_link_libraries (generate_geocoding_data_test ${TEST_LIBS}) +target_link_libraries (generate_geocoding_data_test ${TEST_LIBS} ${Boost_LIBRARIES}) -diff --git a/tools/cpp/src/cpp-build/generate_geocoding_data.cc b/tools/cpp/src/cpp-build/generate_geocoding_data.cc -index 132a917..ec03298 100644 ---- a/tools/cpp/src/cpp-build/generate_geocoding_data.cc -+++ b/tools/cpp/src/cpp-build/generate_geocoding_data.cc +Index: libphonenumber-7.1.0-4ubuntu1/tools/cpp/src/cpp-build/generate_geocoding_data.cc +=================================================================== +--- libphonenumber-7.1.0-4ubuntu1.orig/tools/cpp/src/cpp-build/generate_geocoding_data.cc ++++ libphonenumber-7.1.0-4ubuntu1/tools/cpp/src/cpp-build/generate_geocoding_data.cc @@ -16,7 +16,6 @@ #include "cpp-build/generate_geocoding_data.h"
  4. Download patch cpp/test/phonenumbers/phonenumberutil_test.cc

    --- 7.1.0-5/cpp/test/phonenumbers/phonenumberutil_test.cc 2015-10-08 14:30:16.000000000 +0000 +++ 7.1.0-5ubuntu2/cpp/test/phonenumbers/phonenumberutil_test.cc 2016-11-05 14:39:03.000000000 +0000 @@ -2411,9 +2411,9 @@ TEST_F(PhoneNumberUtilTest, NormaliseStr } TEST_F(PhoneNumberUtilTest, NormaliseStripNonDiallableCharacters) { - string input_number("03*4-56&+a#234"); + string input_number("03*4-56&+1a#234"); NormalizeDiallableCharsOnly(&input_number); - static const string kExpectedOutput("03*456+234"); + static const string kExpectedOutput("03*456+1#234"); EXPECT_EQ(kExpectedOutput, input_number) << "Conversion did not correctly remove non-diallable characters"; }
  5. Download patch .pc/applied-patches

    --- 7.1.0-5/.pc/applied-patches 2016-11-05 14:39:02.332186336 +0000 +++ 7.1.0-5ubuntu2/.pc/applied-patches 2016-11-05 14:39:03.444216752 +0000 @@ -7,3 +7,4 @@ 0010-reproducible-build.patch gcc-6-ftbfs.patch readdir_r-is-deprecated.patch +hash_as_diallable_char.patch
  6. Download patch .pc/hash_as_diallable_char.patch/cpp/src/phonenumbers/phonenumberutil.cc
  7. Download patch debian/patches/series

    --- 7.1.0-5/debian/patches/series 2016-09-13 21:13:45.000000000 +0000 +++ 7.1.0-5ubuntu2/debian/patches/series 2016-09-21 14:18:27.000000000 +0000 @@ -7,3 +7,4 @@ 0010-reproducible-build.patch gcc-6-ftbfs.patch readdir_r-is-deprecated.patch +hash_as_diallable_char.patch
  8. Download patch debian/patches/hash_as_diallable_char.patch

    --- 7.1.0-5/debian/patches/hash_as_diallable_char.patch 1970-01-01 00:00:00.000000000 +0000 +++ 7.1.0-5ubuntu2/debian/patches/hash_as_diallable_char.patch 2016-09-08 17:56:08.000000000 +0000 @@ -0,0 +1,31 @@ +Description: Added hash as a diallable char +Forwarded: https://github.com/googlei18n/libphonenumber/pull/1312 +Author: Tiago Salem Herrmann <tiago.herrmann@canonical.com> +Index: libphonenumber-7.1.0-4ubuntu1/cpp/src/phonenumbers/phonenumberutil.cc +=================================================================== +--- libphonenumber-7.1.0-4ubuntu1.orig/cpp/src/phonenumbers/phonenumberutil.cc ++++ libphonenumber-7.1.0-4ubuntu1/cpp/src/phonenumbers/phonenumberutil.cc +@@ -288,6 +288,7 @@ class PhoneNumberRegExpsAndMappings { + void InitializeMapsAndSets() { + diallable_char_mappings_.insert(std::make_pair('+', '+')); + diallable_char_mappings_.insert(std::make_pair('*', '*')); ++ diallable_char_mappings_.insert(std::make_pair('#', '#')); + // Here we insert all punctuation symbols that we wish to respect when + // formatting alpha numbers, as they show the intended number groupings. + all_plus_number_grouping_symbols_.insert( +Index: libphonenumber-7.1.0-4ubuntu1/cpp/test/phonenumbers/phonenumberutil_test.cc +=================================================================== +--- libphonenumber-7.1.0-4ubuntu1.orig/cpp/test/phonenumbers/phonenumberutil_test.cc ++++ libphonenumber-7.1.0-4ubuntu1/cpp/test/phonenumbers/phonenumberutil_test.cc +@@ -2411,9 +2411,9 @@ TEST_F(PhoneNumberUtilTest, NormaliseStr + } + + TEST_F(PhoneNumberUtilTest, NormaliseStripNonDiallableCharacters) { +- string input_number("03*4-56&+a#234"); ++ string input_number("03*4-56&+1a#234"); + NormalizeDiallableCharsOnly(&input_number); +- static const string kExpectedOutput("03*456+234"); ++ static const string kExpectedOutput("03*456+1#234"); + EXPECT_EQ(kExpectedOutput, input_number) + << "Conversion did not correctly remove non-diallable characters"; + }
  9. Download patch cpp/src/phonenumbers/phonenumberutil.cc

    --- 7.1.0-5/cpp/src/phonenumbers/phonenumberutil.cc 2015-10-08 14:30:16.000000000 +0000 +++ 7.1.0-5ubuntu2/cpp/src/phonenumbers/phonenumberutil.cc 2016-11-05 14:39:03.000000000 +0000 @@ -288,6 +288,7 @@ class PhoneNumberRegExpsAndMappings { void InitializeMapsAndSets() { diallable_char_mappings_.insert(std::make_pair('+', '+')); diallable_char_mappings_.insert(std::make_pair('*', '*')); + diallable_char_mappings_.insert(std::make_pair('#', '#')); // Here we insert all punctuation symbols that we wish to respect when // formatting alpha numbers, as they show the intended number groupings. all_plus_number_grouping_symbols_.insert(

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: sunflow

sunflow (0.07.2.svn396+dfsg-14ubuntu1) zesty; urgency=medium * d/control: update dependency to libmagickcore-6.q16-3-extra for imagemagick ABI bump. -- Nishanth Aravamudan <nish.aravamudan@canonical.com> Thu, 30 Mar 2017 10:20:42 -0700

Modifications :
  1. Download patch debian/control

    --- 0.07.2.svn396+dfsg-14/debian/control 2015-02-21 15:12:04.000000000 +0000 +++ 0.07.2.svn396+dfsg-14ubuntu1/debian/control 2017-03-30 17:20:42.000000000 +0000 @@ -1,10 +1,11 @@ Source: sunflow Section: graphics Priority: extra -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Gabriele Giacone <1o5g4r8o@gmail.com> Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 9), ant, imagemagick, - default-jdk, libmagickcore-6.q16-2-extra, python (>= 2.6.6-3~) + default-jdk, libmagickcore-6.q16-3-extra, python (>= 2.6.6-3~) Build-Depends-Indep: janino Standards-Version: 3.9.6 Homepage: http://sunflow.sourceforge.net/

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: tomcat8

tomcat8 (8.0.38-2ubuntu2) zesty; urgency=medium * Fix an upgrade error when JAVA_OPTS in /etc/default/tomcat8 contains the '%' character (LP: #1666570). -- Joshua Powers <josh.powers@canonical.com> Tue, 28 Mar 2017 16:47:32 -0700 tomcat8 (8.0.38-2ubuntu1) zesty; urgency=medium * SECURITY UPDATE: HTTP response injection via invalid characters - debian/patches/CVE-2016-6816.patch: add additional checks for valid characters in java/org/apache/coyote/http11/AbstractInputBuffer.java, java/org/apache/coyote/http11/AbstractNioInputBuffer.java, java/org/apache/coyote/http11/InternalAprInputBuffer.java, java/org/apache/coyote/http11/InternalInputBuffer.java, java/org/apache/coyote/http11/LocalStrings.properties, java/org/apache/tomcat/util/http/parser/HttpParser.java. - CVE-2016-6816 * SECURITY UPDATE: remote code execution via JmxRemoteLifecycleListener - debian/patches/CVE-2016-8735.patch: explicitly configure allowed credential types in java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java. - CVE-2016-8735 * SECURITY UPDATE: information leakage between requests - debian/patches/CVE-2016-8745.patch: properly handle cache when unable to complete sendfile request in java/org/apache/tomcat/util/net/NioEndpoint.java. - CVE-2016-8745 * SECURITY UPDATE: privilege escalation during package upgrade - debian/rules, debian/tomcat8.postinst: properly set permissions on /etc/tomcat8/Catalina/localhost. - CVE-2016-9774 * SECURITY UPDATE: privilege escalation during package removal - debian/tomcat8.postrm.in: don't reset permissions before removing user. - CVE-2016-9775 -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Wed, 15 Feb 2017 08:38:11 -0500

Modifications :
  1. Download patch java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java

    --- 8.0.38-2/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java 2015-12-18 15:13:10.000000000 +0000 +++ 8.0.38-2ubuntu2/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java 2017-04-11 04:40:22.000000000 +0000 @@ -264,6 +264,10 @@ public class JmxRemoteLifecycleListener serverCsf = new RmiClientLocalhostSocketFactory(serverCsf); } + env.put("jmx.remote.rmi.server.credential.types", new String[] { + String[].class.getName(), + String.class.getName() }); + // Populate the env properties used to create the server if (serverCsf != null) { env.put(RMIConnectorServer.RMI_CLIENT_SOCKET_FACTORY_ATTRIBUTE, serverCsf); @@ -328,7 +332,7 @@ public class JmxRemoteLifecycleListener cs = new RMIConnectorServer(serviceUrl, theEnv, server, ManagementFactory.getPlatformMBeanServer()); cs.start(); - registry.bind("jmxrmi", server); + registry.bind("jmxrmi", server.toStub()); log.info(sm.getString("jmxRemoteLifecycleListener.start", Integer.toString(theRmiRegistryPort), Integer.toString(theRmiServerPort), serverName));
  2. Download patch .pc/CVE-2016-8735.patch/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
  3. Download patch .pc/CVE-2016-6816.patch/java/org/apache/tomcat/util/http/parser/HttpParser.java
  4. Download patch .pc/CVE-2016-6816.patch/java/org/apache/coyote/http11/InternalAprInputBuffer.java
  5. Download patch java/org/apache/coyote/http11/AbstractNioInputBuffer.java

    --- 8.0.38-2/java/org/apache/coyote/http11/AbstractNioInputBuffer.java 2016-05-13 10:29:03.000000000 +0000 +++ 8.0.38-2ubuntu2/java/org/apache/coyote/http11/AbstractNioInputBuffer.java 2017-04-11 04:40:22.000000000 +0000 @@ -21,6 +21,7 @@ import java.nio.charset.StandardCharsets import org.apache.coyote.Request; import org.apache.tomcat.util.buf.MessageBytes; +import org.apache.tomcat.util.http.parser.HttpParser; public abstract class AbstractNioInputBuffer<S> extends AbstractInputBuffer<S> { @@ -228,7 +229,7 @@ public abstract class AbstractNioInputBu if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) { space = true; request.method().setBytes(buf, parsingRequestLineStart, pos - parsingRequestLineStart); - } else if (!HTTP_TOKEN_CHAR[buf[pos]]) { + } else if (!HttpParser.isToken(buf[pos])) { throw new IllegalArgumentException(sm.getString("iib.invalidmethod")); } pos++; @@ -276,9 +277,10 @@ public abstract class AbstractNioInputBu parsingRequestLineEol = true; space = true; end = pos; - } else if ((buf[pos] == Constants.QUESTION) - && (parsingRequestLineQPos == -1)) { + } else if ((buf[pos] == Constants.QUESTION) && (parsingRequestLineQPos == -1)) { parsingRequestLineQPos = pos; + } else if (HttpParser.isNotRequestTarget(buf[pos])) { + throw new IllegalArgumentException(sm.getString("iib.invalidRequestTarget")); } pos++; } @@ -315,7 +317,7 @@ public abstract class AbstractNioInputBu if (parsingRequestLinePhase == 6) { // // Reading the protocol - // Protocol is always US-ASCII + // Protocol is always "HTTP/" DIGIT "." DIGIT // while (!parsingRequestLineEol) { // Read new bytes if needed @@ -330,6 +332,8 @@ public abstract class AbstractNioInputBu if (end == 0) end = pos; parsingRequestLineEol = true; + } else if (!HttpParser.isHttpProtocol(buf[pos])) { + throw new IllegalArgumentException(sm.getString("iib.invalidHttpProtocol")); } pos++; } @@ -470,7 +474,7 @@ public abstract class AbstractNioInputBu headerData.realPos = pos; headerData.lastSignificantChar = pos; break; - } else if (chr < 0 || !HTTP_TOKEN_CHAR[chr]) { + } else if (!HttpParser.isToken(chr)) { // If a non-token header is detected, skip the line and // ignore the header headerData.lastSignificantChar = pos;
  6. Download patch debian/rules

    --- 8.0.38-2/debian/rules 2016-10-26 12:29:04.000000000 +0000 +++ 8.0.38-2ubuntu2/debian/rules 2017-04-10 18:59:52.000000000 +0000 @@ -53,6 +53,13 @@ override_dh_install-indep: jh_manifest +override_dh_fixperms: + dh_fixperms + # Make the/etc/tomcat8/Catalina/localhost directory writable by the tomcat user + for PACKAGE in tomcat8 tomcat8-admin tomcat8-docs tomcat8-examples; do \ + chmod 775 --verbose debian/$$PACKAGE/etc/tomcat8/Catalina/localhost; \ + done + override_dh_auto_clean: dh_auto_clean -$(ANT) clean
  7. Download patch .pc/CVE-2016-6816.patch/java/org/apache/coyote/http11/AbstractInputBuffer.java
  8. Download patch .pc/CVE-2016-6816.patch/java/org/apache/coyote/http11/InternalInputBuffer.java
  9. Download patch java/org/apache/coyote/http11/LocalStrings.properties

    --- 8.0.38-2/java/org/apache/coyote/http11/LocalStrings.properties 2016-05-13 10:29:03.000000000 +0000 +++ 8.0.38-2ubuntu2/java/org/apache/coyote/http11/LocalStrings.properties 2017-04-11 04:40:22.000000000 +0000 @@ -33,8 +33,10 @@ iib.available.readFail=A non-blocking re iib.eof.error=Unexpected EOF read on the socket iib.failedread.apr=Read failed with APR/native error code [{0}] iib.filter.npe=You may not add a null filter -iib.invalidheader=The HTTP header line [{0}] does not conform to RFC 2616 and has been ignored. +iib.invalidheader=The HTTP header line [{0}] does not conform to RFC 7230 and has been ignored. iib.invalidmethod=Invalid character found in method name. HTTP method names must be tokens +iib.invalidRequestTarget=Invalid character found in the request target. The valid characters are defined in RFC 7230 and RFC 3986 +iib.invalidHttpProtocol=Invalid character found in the HTTP protocol iib.parseheaders.ise.error=Unexpected state: headers already parsed. Buffer not recycled? iib.readtimeout=Timeout attempting to read data from the socket iib.requestheadertoolarge.error=Request header is too large
  10. Download patch debian/control

    --- 8.0.38-2/debian/control 2016-10-26 12:44:26.000000000 +0000 +++ 8.0.38-2ubuntu2/debian/control 2017-04-10 18:59:52.000000000 +0000 @@ -1,7 +1,8 @@ Source: tomcat8 Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: James Page <james.page@ubuntu.com>, Miguel Landaeta <nomadium@debian.org>, tony mancill <tmancill@debian.org>,
  11. Download patch .pc/applied-patches

    --- 8.0.38-2/.pc/applied-patches 2017-04-11 04:40:21.521760796 +0000 +++ 8.0.38-2ubuntu2/.pc/applied-patches 2017-04-11 04:40:22.213779692 +0000 @@ -9,3 +9,6 @@ 0015_disable_test_TestCometProcessor.patch 0018-fix-manager-webapp.patch 0019-add-distribution-to-error-page.patch +CVE-2016-6816.patch +CVE-2016-8735.patch +CVE-2016-8745.patch
  12. Download patch debian/patches/CVE-2016-8735.patch

    --- 8.0.38-2/debian/patches/CVE-2016-8735.patch 1970-01-01 00:00:00.000000000 +0000 +++ 8.0.38-2ubuntu2/debian/patches/CVE-2016-8735.patch 2017-04-10 18:59:52.000000000 +0000 @@ -0,0 +1,28 @@ +Description: fix remote code execution via JmxRemoteLifecycleListener +Origin: upstream, http://svn.apache.org/r1767656 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802312 + +Index: tomcat8-8.0.37/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java +=================================================================== +--- tomcat8-8.0.37.orig/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java 2015-12-18 10:13:10.000000000 -0500 ++++ tomcat8-8.0.37/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java 2017-01-13 11:51:35.406731419 -0500 +@@ -264,6 +264,10 @@ + serverCsf = new RmiClientLocalhostSocketFactory(serverCsf); + } + ++ env.put("jmx.remote.rmi.server.credential.types", new String[] { ++ String[].class.getName(), ++ String.class.getName() }); ++ + // Populate the env properties used to create the server + if (serverCsf != null) { + env.put(RMIConnectorServer.RMI_CLIENT_SOCKET_FACTORY_ATTRIBUTE, serverCsf); +@@ -328,7 +332,7 @@ + cs = new RMIConnectorServer(serviceUrl, theEnv, server, + ManagementFactory.getPlatformMBeanServer()); + cs.start(); +- registry.bind("jmxrmi", server); ++ registry.bind("jmxrmi", server.toStub()); + log.info(sm.getString("jmxRemoteLifecycleListener.start", + Integer.toString(theRmiRegistryPort), + Integer.toString(theRmiServerPort), serverName));
  13. Download patch .pc/CVE-2016-8745.patch/java/org/apache/tomcat/util/net/NioEndpoint.java
  14. Download patch .pc/CVE-2016-6816.patch/java/org/apache/coyote/http11/AbstractNioInputBuffer.java
  15. Download patch java/org/apache/tomcat/util/http/parser/HttpParser.java

    --- 8.0.38-2/java/org/apache/tomcat/util/http/parser/HttpParser.java 2016-03-05 18:28:27.000000000 +0000 +++ 8.0.38-2ubuntu2/java/org/apache/tomcat/util/http/parser/HttpParser.java 2017-04-11 04:40:22.000000000 +0000 @@ -34,33 +34,58 @@ import java.io.StringReader; */ public class HttpParser { - // Arrays used by isToken(), isHex() - private static final boolean isToken[] = new boolean[128]; - private static final boolean isHex[] = new boolean[128]; + private static final int ARRAY_SIZE = 128; + + private static final boolean[] IS_CONTROL = new boolean[ARRAY_SIZE]; + private static final boolean[] IS_SEPARATOR = new boolean[ARRAY_SIZE]; + private static final boolean[] IS_TOKEN = new boolean[ARRAY_SIZE]; + private static final boolean[] IS_HEX = new boolean[ARRAY_SIZE]; + private static final boolean[] IS_NOT_REQUEST_TARGET = new boolean[ARRAY_SIZE]; + private static final boolean[] IS_HTTP_PROTOCOL = new boolean[ARRAY_SIZE]; static { - // Setup the flag arrays - for (int i = 0; i < 128; i++) { - if (i <= 32) { // includes '\t' and ' ' - isToken[i] = false; - } else if (i == '(' || i == ')' || i == '<' || i == '>' || i == '@' || - i == ',' || i == ';' || i == ':' || i == '\\' || i == '\"' || - i == '/' || i == '[' || i == ']' || i == '?' || i == '=' || - i == '{' || i == '}') { - isToken[i] = false; - } else { - isToken[i] = true; + for (int i = 0; i < ARRAY_SIZE; i++) { + // Control> 0-31, 127 + if (i < 32 || i == 127) { + IS_CONTROL[i] = true; } - if (i >= '0' && i <= '9' || i >= 'A' && i <= 'F' || - i >= 'a' && i <= 'f') { - isHex[i] = true; - } else { - isHex[i] = false; + // Separator + if ( i == '(' || i == ')' || i == '<' || i == '>' || i == '@' || + i == ',' || i == ';' || i == ':' || i == '\\' || i == '\"' || + i == '/' || i == '[' || i == ']' || i == '?' || i == '=' || + i == '{' || i == '}' || i == ' ' || i == '\t') { + IS_SEPARATOR[i] = true; + } + + // Token: Anything 0-127 that is not a control and not a separator + if (!IS_CONTROL[i] && !IS_SEPARATOR[i] && i < 128) { + IS_TOKEN[i] = true; + } + + // Hex: 0-9, a-f, A-F + if ((i >= '0' && i <='9') || (i >= 'a' && i <= 'f') || (i >= 'A' && i <= 'F')) { + IS_HEX[i] = true; + } + + // Not valid for request target. + // Combination of multiple rules from RFC7230 and RFC 3986. Must be + // ASCII, no controls plus a few additional characters excluded + if (IS_CONTROL[i] || i > 127 || + i == ' ' || i == '\"' || i == '#' || i == '<' || i == '>' || i == '\\' || + i == '^' || i == '`' || i == '{' || i == '|' || i == '}') { + IS_NOT_REQUEST_TARGET[i] = true; + } + + // Not valid for HTTP protocol + // "HTTP/" DIGIT "." DIGIT + if (i == 'H' || i == 'T' || i == 'P' || i == '/' || i == '.' || (i >= '0' && i <= '9')) { + IS_HTTP_PROTOCOL[i] = true; } } } + public static String unquote(String input) { if (input == null || input.length() < 2) { return input; @@ -91,24 +116,49 @@ public class HttpParser { return result.toString(); } - static boolean isToken(int c) { + + public static boolean isToken(int c) { // Fast for correct values, slower for incorrect ones try { - return isToken[c]; + return IS_TOKEN[c]; } catch (ArrayIndexOutOfBoundsException ex) { return false; } } - static boolean isHex(int c) { - // Fast for correct values, slower for incorrect ones + + public static boolean isHex(int c) { + // Fast for correct values, slower for some incorrect ones try { - return isHex[c]; + return IS_HEX[c]; } catch (ArrayIndexOutOfBoundsException ex) { return false; } } + + public static boolean isNotRequestTarget(int c) { + // Fast for valid request target characters, slower for some incorrect + // ones + try { + return IS_NOT_REQUEST_TARGET[c]; + } catch (ArrayIndexOutOfBoundsException ex) { + return true; + } + } + + + public static boolean isHttpProtocol(int c) { + // Fast for valid HTTP protocol characters, slower for some incorrect + // ones + try { + return IS_HTTP_PROTOCOL[c]; + } catch (ArrayIndexOutOfBoundsException ex) { + return false; + } + } + + // Skip any LWS and return the next char static int skipLws(StringReader input, boolean withReset) throws IOException {
  16. Download patch debian/tomcat8.postrm.in

    --- 8.0.38-2/debian/tomcat8.postrm.in 2016-10-27 12:32:52.000000000 +0000 +++ 8.0.38-2ubuntu2/debian/tomcat8.postrm.in 2017-04-10 18:59:52.000000000 +0000 @@ -64,9 +64,6 @@ case "$1" in /etc/tomcat8/Catalina/localhost /etc/tomcat8/Catalina /etc/tomcat8 # clean up /etc/authbind after conffiles have been removed rmdir --ignore-fail-on-non-empty /etc/authbind/byuid /etc/authbind - # Put all files owned by group tomcat8 back into root group before deleting - # the tomcat8 user and group - chown -Rhf root:root /etc/tomcat8/ || true # Remove user/group and log files (don't remove everything under # /var/lib/tomcat8 because there might be user-installed webapps) db_get tomcat8/username && TOMCAT8_USER="$RET" || TOMCAT8_USER="tomcat8"
  17. Download patch java/org/apache/tomcat/util/net/NioEndpoint.java

    --- 8.0.38-2/java/org/apache/tomcat/util/net/NioEndpoint.java 2016-05-04 13:28:30.000000000 +0000 +++ 8.0.38-2ubuntu2/java/org/apache/tomcat/util/net/NioEndpoint.java 2017-04-11 04:40:22.000000000 +0000 @@ -1245,11 +1245,15 @@ public class NioEndpoint extends Abstrac } }catch ( IOException x ) { if ( log.isDebugEnabled() ) log.debug("Unable to complete sendfile request:", x); - cancelledKey(sk,SocketStatus.ERROR); + if (!calledByProcessor) { + cancelledKey(sk,SocketStatus.ERROR); + } return SendfileState.ERROR; }catch ( Throwable t ) { log.error("",t); - cancelledKey(sk, SocketStatus.ERROR); + if (!calledByProcessor) { + cancelledKey(sk, SocketStatus.ERROR); + } return SendfileState.ERROR; } }
  18. Download patch debian/patches/series

    --- 8.0.38-2/debian/patches/series 2016-10-19 07:17:34.000000000 +0000 +++ 8.0.38-2ubuntu2/debian/patches/series 2017-04-10 18:59:52.000000000 +0000 @@ -11,3 +11,6 @@ 0018-fix-manager-webapp.patch 0019-add-distribution-to-error-page.patch #0020-disable-java8-support-with-jdtcompiler.patch +CVE-2016-6816.patch +CVE-2016-8735.patch +CVE-2016-8745.patch
  19. Download patch debian/tomcat8.postinst

    --- 8.0.38-2/debian/tomcat8.postinst 2016-10-19 07:17:34.000000000 +0000 +++ 8.0.38-2ubuntu2/debian/tomcat8.postinst 2017-04-10 18:59:52.000000000 +0000 @@ -19,10 +19,11 @@ case "$1" in tmpfile=`mktemp /tmp/tomcat8.XXXXXXXXXX` chmod 644 $tmpfile + DELIM=$(printf '\001') cat $TEMPLATE \ | sed "s%^TOMCAT8_USER=.*$%TOMCAT8_USER=$TOMCAT8_USER%" \ | sed "s%^TOMCAT8_GROUP=.*$%TOMCAT8_GROUP=$TOMCAT8_GROUP%" \ - | sed "s%^JAVA_OPTS=.*$%JAVA_OPTS=\"$JAVA_OPTS\"%" \ + | sed "s${DELIM}^JAVA_OPTS=.*\$${DELIM}JAVA_OPTS=\"$JAVA_OPTS\"${DELIM}" \ >> $tmpfile ucf --debconf-ok --sum-file /usr/share/tomcat8/defaults.md5sum $tmpfile $CONFFILE rm -f $tmpfile @@ -69,7 +70,7 @@ case "$1" in chown -Rh $TOMCAT8_USER:$TOMCAT8_GROUP /var/lib/tomcat8/webapps /var/lib/tomcat8/lib chmod 775 /var/lib/tomcat8/webapps - chmod 775 /etc/tomcat8/Catalina /etc/tomcat8/Catalina/localhost + chmod 775 /etc/tomcat8/Catalina # Authorize user tomcat8 to open privileged ports via authbind. TOMCAT_UID="`id -u $TOMCAT8_USER`"
  20. Download patch java/org/apache/coyote/http11/InternalAprInputBuffer.java

    --- 8.0.38-2/java/org/apache/coyote/http11/InternalAprInputBuffer.java 2016-05-13 10:29:03.000000000 +0000 +++ 8.0.38-2ubuntu2/java/org/apache/coyote/http11/InternalAprInputBuffer.java 2017-04-11 04:40:22.000000000 +0000 @@ -32,6 +32,7 @@ import org.apache.tomcat.jni.Socket; import org.apache.tomcat.jni.Status; import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.buf.MessageBytes; +import org.apache.tomcat.util.http.parser.HttpParser; import org.apache.tomcat.util.net.AbstractEndpoint; import org.apache.tomcat.util.net.SocketWrapper; @@ -181,7 +182,7 @@ public class InternalAprInputBuffer exte if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) { space = true; request.method().setBytes(buf, start, pos - start); - } else if (!HTTP_TOKEN_CHAR[buf[pos]]) { + } else if (!HttpParser.isToken(buf[pos])) { throw new IllegalArgumentException(sm.getString("iib.invalidmethod")); } @@ -232,9 +233,10 @@ public class InternalAprInputBuffer exte eol = true; space = true; end = pos; - } else if ((buf[pos] == Constants.QUESTION) - && (questionPos == -1)) { + } else if ((buf[pos] == Constants.QUESTION) && (questionPos == -1)) { questionPos = pos; + } else if (HttpParser.isNotRequestTarget(buf[pos])) { + throw new IllegalArgumentException(sm.getString("iib.invalidRequestTarget")); } pos++; @@ -270,7 +272,7 @@ public class InternalAprInputBuffer exte // // Reading the protocol - // Protocol is always US-ASCII + // Protocol is always "HTTP/" DIGIT "." DIGIT // while (!eol) { @@ -287,6 +289,8 @@ public class InternalAprInputBuffer exte if (end == 0) end = pos; eol = true; + } else if (!HttpParser.isHttpProtocol(buf[pos])) { + throw new IllegalArgumentException(sm.getString("iib.invalidHttpProtocol")); } pos++; @@ -385,7 +389,7 @@ public class InternalAprInputBuffer exte if (buf[pos] == Constants.COLON) { colon = true; headerValue = headers.addValue(buf, start, pos - start); - } else if (buf[pos] < 0 || !HTTP_TOKEN_CHAR[buf[pos]]) { + } else if (!HttpParser.isToken(buf[pos])) { // If a non-token header is detected, skip the line and // ignore the header skipLine(start);
  21. Download patch .pc/CVE-2016-6816.patch/java/org/apache/coyote/http11/LocalStrings.properties

    --- 8.0.38-2/.pc/CVE-2016-6816.patch/java/org/apache/coyote/http11/LocalStrings.properties 1970-01-01 00:00:00.000000000 +0000 +++ 8.0.38-2ubuntu2/.pc/CVE-2016-6816.patch/java/org/apache/coyote/http11/LocalStrings.properties 2016-05-13 10:29:03.000000000 +0000 @@ -0,0 +1,48 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +http11processor.fallToDebug=\n Note: further occurrences of HTTP header parsing errors will be logged at DEBUG level. +http11processor.header.parse=Error parsing HTTP request header +http11processor.neverused=This method should never be used +http11processor.request.prepare=Error preparing request +http11processor.request.process=Error processing request +http11processor.request.finish=Error finishing request +http11processor.response.finish=Error finishing response +http11processor.socket.info=Exception getting socket information +http11processor.socket.ssl=Exception getting SSL attributes +http11processor.socket.sslreneg=Exception re-negotiating SSL connection +http11processor.comet.notsupported=The Comet protocol is not supported by this connector +http11processor.sendfile.error=Error sending data using sendfile. May be caused by invalid request attributes for start/end points +http11Processor.upgrade=An internal error has occurred as upgraded connections should only be processed by the dedicated upgrade processor implementations + +iib.apr.sslGeneralError=An APR general error was returned by the SSL read operation on APR/native socket [{0}] with wrapper [{1}]. It will be treated as EAGAIN and the socket returned to the poller. + +iib.available.readFail=A non-blocking read failed while attempting to determine if data was available +iib.eof.error=Unexpected EOF read on the socket +iib.failedread.apr=Read failed with APR/native error code [{0}] +iib.filter.npe=You may not add a null filter +iib.invalidheader=The HTTP header line [{0}] does not conform to RFC 2616 and has been ignored. +iib.invalidmethod=Invalid character found in method name. HTTP method names must be tokens +iib.parseheaders.ise.error=Unexpected state: headers already parsed. Buffer not recycled? +iib.readtimeout=Timeout attempting to read data from the socket +iib.requestheadertoolarge.error=Request header is too large +iib.socketClosed=The socket has been closed in another thread + +iob.failedwrite=Failed write +iob.failedwrite.ack=Failed to send HTTP 100 continue response +iob.illegalreset=The response may not be reset once it has been committed +iob.responseheadertoolarge.error=An attempt was made to write more data to the response headers than there was room available in the buffer. Increase maxHttpHeaderSize on the connector or write less data into the response headers. + +iob.nio2.nullSocket=Socket was null while trying to process exception. See Bug 57749 \ No newline at end of file
  22. Download patch java/org/apache/coyote/http11/AbstractInputBuffer.java

    --- 8.0.38-2/java/org/apache/coyote/http11/AbstractInputBuffer.java 2015-11-12 09:33:08.000000000 +0000 +++ 8.0.38-2ubuntu2/java/org/apache/coyote/http11/AbstractInputBuffer.java 2017-04-11 04:40:22.000000000 +0000 @@ -30,62 +30,10 @@ import org.apache.tomcat.util.res.String public abstract class AbstractInputBuffer<S> implements InputBuffer{ - protected static final boolean[] HTTP_TOKEN_CHAR = new boolean[128]; - /** * The string manager for this package. */ - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - - - static { - for (int i = 0; i < 128; i++) { - if (i < 32) { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == 127) { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == '(') { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == ')') { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == '<') { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == '>') { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == '@') { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == ',') { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == ';') { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == ':') { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == '\\') { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == '\"') { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == '/') { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == '[') { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == ']') { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == '?') { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == '=') { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == '{') { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == '}') { - HTTP_TOKEN_CHAR[i] = false; - } else if (i == ' ') { - HTTP_TOKEN_CHAR[i] = false; - } else { - HTTP_TOKEN_CHAR[i] = true; - } - } - } + protected static final StringManager sm = StringManager.getManager(Constants.Package); /**
  23. Download patch java/org/apache/coyote/http11/InternalInputBuffer.java

    --- 8.0.38-2/java/org/apache/coyote/http11/InternalInputBuffer.java 2016-05-13 10:29:03.000000000 +0000 +++ 8.0.38-2ubuntu2/java/org/apache/coyote/http11/InternalInputBuffer.java 2017-04-11 04:40:22.000000000 +0000 @@ -28,6 +28,7 @@ import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.buf.MessageBytes; +import org.apache.tomcat.util.http.parser.HttpParser; import org.apache.tomcat.util.net.AbstractEndpoint; import org.apache.tomcat.util.net.SocketWrapper; @@ -142,7 +143,7 @@ public class InternalInputBuffer extends if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) { space = true; request.method().setBytes(buf, start, pos - start); - } else if (!HTTP_TOKEN_CHAR[buf[pos]]) { + } else if (!HttpParser.isToken(buf[pos])) { throw new IllegalArgumentException(sm.getString("iib.invalidmethod")); } @@ -193,9 +194,10 @@ public class InternalInputBuffer extends eol = true; space = true; end = pos; - } else if ((buf[pos] == Constants.QUESTION) - && (questionPos == -1)) { + } else if ((buf[pos] == Constants.QUESTION) && (questionPos == -1)) { questionPos = pos; + } else if (HttpParser.isNotRequestTarget(buf[pos])) { + throw new IllegalArgumentException(sm.getString("iib.invalidRequestTarget")); } pos++; @@ -230,9 +232,8 @@ public class InternalInputBuffer extends // // Reading the protocol - // Protocol is always US-ASCII + // Protocol is always "HTTP/" DIGIT "." DIGIT // - while (!eol) { // Read new bytes if needed @@ -247,6 +248,8 @@ public class InternalInputBuffer extends if (end == 0) end = pos; eol = true; + } else if (!HttpParser.isHttpProtocol(buf[pos])) { + throw new IllegalArgumentException(sm.getString("iib.invalidHttpProtocol")); } pos++; @@ -345,7 +348,7 @@ public class InternalInputBuffer extends if (buf[pos] == Constants.COLON) { colon = true; headerValue = headers.addValue(buf, start, pos - start); - } else if (buf[pos] < 0 || !HTTP_TOKEN_CHAR[buf[pos]]) { + } else if (!HttpParser.isToken(buf[pos])) { // If a non-token header is detected, skip the line and // ignore the header skipLine(start);
  24. Download patch debian/patches/CVE-2016-6816.patch
  25. Download patch debian/patches/CVE-2016-8745.patch

    --- 8.0.38-2/debian/patches/CVE-2016-8745.patch 1970-01-01 00:00:00.000000000 +0000 +++ 8.0.38-2ubuntu2/debian/patches/CVE-2016-8745.patch 2017-04-10 18:59:52.000000000 +0000 @@ -0,0 +1,27 @@ +Description: fix information leakage between requests +Origin: upstream, http://svn.apache.org/viewvc?view=revision&revision=1777469 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802312 +Bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=60409 + +Index: tomcat8-8.0.37/java/org/apache/tomcat/util/net/NioEndpoint.java +=================================================================== +--- tomcat8-8.0.37.orig/java/org/apache/tomcat/util/net/NioEndpoint.java 2016-05-04 09:28:30.000000000 -0400 ++++ tomcat8-8.0.37/java/org/apache/tomcat/util/net/NioEndpoint.java 2017-01-13 12:29:06.177335705 -0500 +@@ -1245,11 +1245,15 @@ + } + }catch ( IOException x ) { + if ( log.isDebugEnabled() ) log.debug("Unable to complete sendfile request:", x); +- cancelledKey(sk,SocketStatus.ERROR); ++ if (!calledByProcessor) { ++ cancelledKey(sk,SocketStatus.ERROR); ++ } + return SendfileState.ERROR; + }catch ( Throwable t ) { + log.error("",t); +- cancelledKey(sk, SocketStatus.ERROR); ++ if (!calledByProcessor) { ++ cancelledKey(sk, SocketStatus.ERROR); ++ } + return SendfileState.ERROR; + } + }
  1. apache-log4j1.2
  2. commons-configuration
  3. derby
  4. dom4j
  5. excalibur-logkit
  6. geronimo-jacc-1.1-spec
  7. geronimo-jta-1.1-spec
  8. java-common
  9. java3d
  10. jmagick
  11. jsch-agent-proxy
  12. junit4
  13. junitperf
  14. libcommons-cli-java
  15. libcommons-dbcp-java
  16. libcommons-discovery-java
  17. libcommons-lang-java
  18. libgnumail-java
  19. libjaxen-java
  20. libjaxp1.3-java
  21. libphonenumber
  22. sunflow
  23. tomcat8