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: animal-sniffer

animal-sniffer (1.7-2ubuntu1) saucy; urgency=low * debian/control: Build-depend on libbackport-util-concurrent-java to fix FTBFS. -- Logan Rosen <logan@ubuntu.com> Tue, 18 Jun 2013 21:08:14 -0400

Modifications :
  1. Download patch debian/control

    --- 1.7-2/debian/control 2012-01-08 01:04:53.000000000 +0000 +++ 1.7-2ubuntu1/debian/control 2013-06-19 01:11:38.000000000 +0000 @@ -1,13 +1,14 @@ Source: animal-sniffer 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 Schmitz <matthias@sigxcpu.org> Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4), ant Build-Depends-Indep: libasm3-java, junit, default-jdk-doc, libmaven-javadoc-plugin-java, libmaven-enforcer-plugin-java, libmaven-invoker-plugin-java, libmaven-common-artifact-filters-java, - libbuild-helper-maven-plugin-java, libmaven-shade-plugin-java, libmaven-plugin-tools-java, libmaven-install-plugin-java + libbuild-helper-maven-plugin-java, libmaven-shade-plugin-java, libmaven-plugin-tools-java, libmaven-install-plugin-java, libbackport-util-concurrent-java Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/pkg-java/animal-sniffer.git Vcs-Browser: http://git.debian.org/?p=pkg-java/animal-sniffer.git;a=summary

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

Source: antlr3

antlr3 (3.2.is.3.2-7ubuntu3) quantal; urgency=low * Fix issue with links between maven-repo and /usr/share/java: - d/rules: Drop calls to mh_linkrepojar - these are no longer required as jar files are installed to /usr/share/java and links created from the /usr/share/maven-repo. -- James Page <james.page@ubuntu.com> Wed, 19 Sep 2012 09:58:41 +0100 antlr3 (3.2.is.3.2-7ubuntu2) quantal; urgency=low * Support installation alongside antlr2 packages (LP: #1049167): - d/antlr3.poms: Provide antlr3 prefixed names for the antlr jar files installed to /usr/share/java. This also makes the 'antlr3' command work again. -- James Page <james.page@ubuntu.com> Tue, 11 Sep 2012 16:26:47 +0100 antlr3 (3.2.is.3.2-7ubuntu1) quantal; urgency=low * Restore jar files to /usr/share/java (LP: #1049087): - d/antlr3.poms: Specify --java-lib flag for jars which are not maven plugins. -- James Page <james.page@ubuntu.com> Tue, 11 Sep 2012 14:06:19 +0100 antlr3 (3.2.is.3.2-7) quantal; urgency=low * No-change upload to Ubuntu -- Jeremy Bicha <jbicha@ubuntu.com> Sun, 01 Jul 2012 01:41:00 -0400

Modifications :
  1. Download patch debian/rules

    --- 3.2.is.3.2-7/debian/rules 2012-07-01 05:43:00.000000000 +0000 +++ 3.2.is.3.2-7ubuntu3/debian/rules 2012-09-19 09:15:00.000000000 +0000 @@ -29,9 +29,6 @@ before-mvn-build:: unpatch-poms mh_unpatchpoms -pantlr3 binary-post-install/antlr3:: - mh_linkrepojar -pantlr3 runtime/Java/pom.xml /usr/share/java/antlr3-runtime.jar - mh_linkrepojar -pantlr3 tool/pom.xml /usr/share/java/antlr3.jar - mh_linkrepojar -plibantlr3-gunit-java gunit/pom.xml /usr/share/java/antlr3-gunit.jar dh_installman -pantlr3 get-orig-source:
  2. Download patch debian/control

    --- 3.2.is.3.2-7/debian/control 2012-07-01 05:43:00.000000000 +0000 +++ 3.2.is.3.2-7ubuntu3/debian/control 2012-09-11 12:53:23.000000000 +0000 @@ -1,7 +1,8 @@ Source: antlr3 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> Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.1), libstringtemplate-java (>= 3.2.1),
  3. Download patch debian/antlr3.poms

    --- 3.2.is.3.2-7/debian/antlr3.poms 2012-07-01 05:43:00.000000000 +0000 +++ 3.2.is.3.2-7ubuntu3/debian/antlr3.poms 2012-09-11 15:16:34.000000000 +0000 @@ -1,6 +1,6 @@ pom.xml -runtime/Java/pom.xml -tool/pom.xml +runtime/Java/pom.xml --java-lib --usj-name=antlr3-runtime +tool/pom.xml --java-lib --usj-name=antlr3 antlr3-maven-plugin/pom.xml --package=antlr3-maven-plugin -gunit/pom.xml --package=libantlr3-gunit-java +gunit/pom.xml --package=libantlr3-gunit-java --java-lib gunit-maven-plugin/pom.xml --package=antlr3-gunit-maven-plugin

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

Source: apache-log4j1.2

apache-log4j1.2 (1.2.17-4ubuntu3) trusty; urgency=medium * d/liblog4j1.2.manifest: Add missing Bundle-SymbolicName to manifest. -- James Page <james.page@ubuntu.com> Tue, 25 Mar 2014 09:26:51 +0000 apache-log4j1.2 (1.2.17-4ubuntu2) trusty; urgency=medium * d/liblog4j1.2.manifest,control,rules: Add OSGi manifest for log4j using javahelper (LP: #894302). -- James Page <james.page@ubuntu.com> Mon, 03 Mar 2014 10:56:35 +0000 apache-log4j1.2 (1.2.17-4ubuntu1) trusty; urgency=low * Merge from Debian unstable (LP: #1246295). Remaining changes: - d/{rules,control}: Remove dependency on bnd and don't add OSGi headers to jar file. -- Yolanda Robla <yolanda.robla@canonical.com> Tue, 30 Oct 2013 13:41:00 +0100

Modifications :
  1. Download patch debian/rules

    --- 1.2.17-4/debian/rules 2013-08-27 06:36:53.000000000 +0000 +++ 1.2.17-4ubuntu3/debian/rules 2014-03-03 10:52:15.000000000 +0000 @@ -1,6 +1,7 @@ #!/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) @@ -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/gnumail.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-4/debian/control 2013-08-27 06:38:39.000000000 +0000 +++ 1.2.17-4ubuntu3/debian/control 2014-03-03 10:52:25.000000000 +0000 @@ -1,7 +1,8 @@ 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>, Kumar Appaiah <akumar@debian.org>, Torsten Werner <twerner@debian.org>, @@ -9,7 +10,7 @@ Uploaders: Varun Hiremath <varun@debian. Jakub Adam <jakub.adam@ktknet.cz>, Emmanuel Bourg <ebourg@apache.org> Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, - libgnumail-java, maven-repo-helper, default-jdk-doc, bnd + libgnumail-java, maven-repo-helper, default-jdk-doc, javahelper Standards-Version: 3.9.4 Homepage: http://logging.apache.org/log4j/1.2/ Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/apache-log4j1.2
  3. Download patch debian/liblog4j1.2-java.manifest

    --- 1.2.17-4/debian/liblog4j1.2-java.manifest 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.17-4ubuntu3/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: batik

batik (1.7.ubuntu-8ubuntu2) quantal; urgency=low * Switch package to use default-jdk instead of openjdk-6: - d/control: Updated BDI's to use default-jdk instead of openjdk-6. - d/control: Updated to use default-jre-headless as runtime. -- James Page <james.page@ubuntu.com> Wed, 16 May 2012 17:50:14 +0100 batik (1.7.ubuntu-8ubuntu1) precise; urgency=low * Merge from Debian testing (LP: #946158), remaining changes: + fix upstream version since we're stuck with this fake upstream version until the next upstream release - update debian/rules * Drop debian/patches/series diff as Debian now has their own version which works fine * Mark Vcs-* as XS-Debian-Vcs-* - update debian/control -- Micah Gersten <micahg@ubuntu.com> Sun, 04 Mar 2012 02:36:50 -0600

Modifications :
  1. Download patch debian/patches/06_fix_paths_in_policy_files.patch

    --- 1.7+dfsg-4/debian/patches/06_fix_paths_in_policy_files.patch 2013-10-15 04:56:48.000000000 +0000 +++ 1.7.ubuntu-8ubuntu2/debian/patches/06_fix_paths_in_policy_files.patch 2012-05-16 16:40:02.000000000 +0000 @@ -1,16 +1,6 @@ -From: Vincent Fourmond <fourmond@debian.org -Date: Mon, 14 Oct 2013 14:59:02 +0200 -Subject: 06_fix_paths_in_policy_files - ---- - .../apache/batik/apps/rasterizer/resources/rasterizer.policy | 8 ++++---- - .../apache/batik/apps/svgbrowser/resources/svgbrowser.policy | 10 +++++----- - 2 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy b/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy -index 9652745..a66f39d 100644 ---- a/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy -+++ b/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy +diff -Nur -x '*.orig' -x '*~' batik-1.7.dfsg/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy batik-1.7.dfsg.new/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy +--- batik-1.7.dfsg/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy 2006-11-22 09:22:10.000000000 +0530 ++++ batik-1.7.dfsg.new/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy 2009-04-19 03:32:06.000000000 +0530 @@ -18,7 +18,7 @@ // $Id: rasterizer.policy 476799 2006-11-19 11:33:41Z cam $ // ----------------------------------------------------------------------------- @@ -20,7 +10,7 @@ index 9652745..a66f39d 100644 permission java.security.AllPermission; }; -@@ -26,16 +26,16 @@ grant codeBase "${app.dev.base}/lib/xml-apis-dom3.jar" { +@@ -26,16 +26,16 @@ permission java.security.AllPermission; }; @@ -40,10 +30,9 @@ index 9652745..a66f39d 100644 permission java.lang.RuntimePermission "createClassLoader"; permission java.net.SocketPermission "*", "listen, connect, resolve, accept"; permission java.lang.RuntimePermission "accessDeclaredMembers"; -diff --git a/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy b/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy -index 6f58c0d..7760b08 100644 ---- a/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy -+++ b/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy +diff -Nur -x '*.orig' -x '*~' batik-1.7.dfsg/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy batik-1.7.dfsg.new/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy +--- batik-1.7.dfsg/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy 2007-11-14 12:43:56.000000000 +0530 ++++ batik-1.7.dfsg.new/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy 2009-04-19 03:30:52.000000000 +0530 @@ -18,23 +18,23 @@ // $Id: svgbrowser.policy 499629 2007-01-25 00:32:16Z cam $ // -----------------------------------------------------------------------------
  2. Download patch debian/rules

    --- 1.7+dfsg-4/debian/rules 2013-10-15 04:56:48.000000000 +0000 +++ 1.7.ubuntu-8ubuntu2/debian/rules 2012-05-16 16:42:57.000000000 +0000 @@ -7,12 +7,15 @@ export JITC_PROCESSOR_TYPE=6 include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/javahelper.mk include /usr/share/cdbs/1/class/ant.mk +export VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed s/\.ubuntu//) + arch = $(shell dpkg-architecture -qDEB_HOST_ARCH) -JAVA_HOME_DIRS := /usr/lib/jvm/default-java +JAVA_HOME_DIRS := /usr/lib/jvm/java-7-openjdk-$(arch) \ + /usr/lib/jvm/java-6-openjdk-$(arch) /usr/lib/jvm/java-6-openjdk \ + /usr/lib/jvm/java-1.5.0-sun /usr/lib/jvm/java-6-sun ANT_HOME := /usr/share/ant DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar bfs \ gnujaxp js xalan2 xml-apis-ext @@ -23,17 +26,15 @@ DEB_ANT_BUILDFILE := build.xml DEB_ANT_CLEAN_TARGET := clean # Increasing memory of the compiler -ANT_OPTS := -Xms256m -Xmx256m -Dbuild.sysclasspath=only +ANT_OPTS := -Xms256m -Xmx256m LIBRARY=batik -UPSTREAM_VERSION = $(subst +dfsg,,$(DEB_UPSTREAM_VERSION)) - LIB_NAMES = all libs install/libbatik-java:: # Install poms ant maven-artifacts - for jar in batik-$(UPSTREAM_VERSION)/maven/*/$(UPSTREAM_VERSION)/*.jar; do \ + for jar in batik-$(VERSION)/maven/*/$(VERSION)/*.jar; do \ pom=$$(dirname $$jar)/$$(basename $$jar .jar).pom; \ mh_installpom -v -plibbatik-java $$pom; \ mh_installjar -plibbatik-java -l $$pom $$jar; \ @@ -41,17 +42,14 @@ install/libbatik-java:: # Install batik-all.jar and batik-libs.jar for name in $(LIB_NAMES); do \ - install -m 644 batik-$(UPSTREAM_VERSION)/lib/batik-$$name.jar debian/libbatik-java/usr/share/java/batik-$$name-$(UPSTREAM_VERSION).jar; \ - ln -s batik-$$name-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik-$$name.jar; \ + install -m 644 batik-$(VERSION)/lib/batik-$$name.jar debian/libbatik-java/usr/share/java/batik-$$name-$(VERSION).jar; \ + ln -s batik-$$name-$(VERSION).jar debian/libbatik-java/usr/share/java/batik-$$name.jar; \ done - ln -s batik-all-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik-$(UPSTREAM_VERSION).jar; \ - ln -s batik-all-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik.jar; \ + ln -s batik-all-$(VERSION).jar debian/libbatik-java/usr/share/java/batik-$(VERSION).jar; \ + ln -s batik-all-$(VERSION).jar debian/libbatik-java/usr/share/java/batik.jar; \ # Install wrapper scripts install -d debian/libbatik-java/usr/bin for prog in debian/wrappers/* ; do \ install -t debian/libbatik-java/usr/bin/ $$prog ; \ done - -clean:: - mh_clean
  3. Download patch debian/compat

    --- 1.7+dfsg-4/debian/compat 2013-10-15 04:56:48.000000000 +0000 +++ 1.7.ubuntu-8ubuntu2/debian/compat 2012-05-16 16:40:02.000000000 +0000 @@ -1 +1 @@ -9 +5
  4. Download patch debian/control

    --- 1.7+dfsg-4/debian/control 2013-10-17 04:59:23.000000000 +0000 +++ 1.7.ubuntu-8ubuntu2/debian/control 2012-05-16 16:50:12.000000000 +0000 @@ -1,46 +1,29 @@ Source: batik Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: - Wolfgang Baer <WBaer@gmx.de>, - Vincent Fourmond <fourmond@debian.org>, - Onkar Shinde <onkarshinde@ubuntu.com> -Standards-Version: 3.9.4 -Build-Depends: - cdbs, - debhelper (>= 9) -Build-Depends-Indep: - ant, - default-jdk, - javahelper, - libavalon-framework-java (>= 4.2.0), - libbsf-java, - libcommons-io-java, - libcommons-logging-java, - libxalan2-java, - libxml-commons-external-java, - maven-repo-helper, - rhino +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Uploaders: Wolfgang Baer <WBaer@gmx.de>, Michael Koch <konqueror@gmx.de>, + Vincent Fourmond <fourmond@debian.org>, Onkar Shinde <onkarshinde@ubuntu.com> +Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 5.0), cdbs +Build-Depends-Indep: default-jdk, ant, + libbsf-java, libxalan2-java, rhino, libavalon-framework-java (>= 4.2.0), + libcommons-io-java, libcommons-logging-java, libxml-commons-external-java, + maven-repo-helper Homepage: http://xml.apache.org/batik/ -Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/batik -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/batik +XS-Debian-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/batik +XS-Debian-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/batik Package: libbatik-java Architecture: all -Depends: - java-wrappers (>= 0.1.12), - libavalon-framework-java (>= 4.2.0), - libbsf-java, - libcommons-io-java, - libcommons-logging-java, - libxalan2-java, +Depends: default-jre-headless | java2-runtime-headless, + libxalan2-java, libbsf-java, + libavalon-framework-java (>= 4.2.0), libcommons-io-java, + libcommons-logging-java, java-wrappers (>= 0.1.12), libxml-commons-external-java, ${misc:Depends} -Recommends: - fop (>= 1:0.94), - rhino, - default-jre +Recommends: fop (>= 1:0.94), rhino, default-jre | java2-runtime Description: xml.apache.org SVG Library Batik is a toolkit for applications or applets that want to use images in the Scalable Vector Graphics (SVG) format for various purposes, such @@ -49,7 +32,7 @@ Description: xml.apache.org SVG Library Batik provides several modules to be used in applications: * A SVG generator module, usable to export graphics into the SVG format. * A SVG processor and SVG Viewing component for integrating SVG viewing. - * A module to convert SVG to various formats, such as raster images + * A module to convert SVG to various formats, such as raster images (JPEG, PNG or Tiff) and PS, PDF. . fop is necessary for PDF output of rasterizer.
  5. Download patch .pc/applied-patches

    --- 1.7+dfsg-4/.pc/applied-patches 2013-10-17 10:09:43.460048357 +0000 +++ 1.7.ubuntu-8ubuntu2/.pc/applied-patches 2013-10-17 10:09:44.240069122 +0000 @@ -1,3 +1,2 @@ 06_fix_paths_in_policy_files.patch source-1.5.patch -remove-js.patch
  6. Download patch debian/manifest

    --- 1.7+dfsg-4/debian/manifest 2013-10-06 17:35:59.000000000 +0000 +++ 1.7.ubuntu-8ubuntu2/debian/manifest 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -usr/share/java/batik-bridge.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik Bridge - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.bridge - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.bridge,org.apache.batik.bridge.svg12 - -usr/share/java/batik-css.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik CSS - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.css - Bundle-Version: 1.7.0 - Require-Bundle: org.apache.batik.util;bundle-version="[1.7.0,1.8.0)",org.w3c.css.sac - Export-Package: org.apache.batik.css.dom,org.apache.batik.css.engine,org.apache.batik.css.engine.sac,org.apache.batik.css.engine.value,org.apache.batik.css.engine.value.css2,org.apache.batik.css.engine.value.svg,org.apache.batik.css.engine.value.svg12,org.apache.batik.css.parser - -usr/share/java/batik-svg-dom.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik SVG DOM - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.dom.svg - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.dom.anim,org.apache.batik.dom.svg,org.apache.batik.dom.svg12 - -usr/share/java/batik-dom.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik DOM - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.dom - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.traversal,org.apache.batik.dom.util,org.apache.batik.dom.xbl - -usr/share/java/batik-awt-util.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik AWT Util - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.ext.awt - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.ext.awt,org.apache.batik.ext.awt.color,org.apache.batik.ext.awt.font,org.apache.batik.ext.awt.g2d,org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.ext.awt.image.spi,org.apache.batik.ext.swing - -usr/share/java/batik-parser.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik Parser - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.parser - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.parser - -usr/share/java/batik-svggen.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik SVG Gen - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.svggen - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.svggen,org.apache.batik.svggen.font,org.apache.batik.svggen.font.table - -usr/share/java/batik-transcoder.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik Parser - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.transcoder - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.transcoder,org.apache.batik.transcoder.image,org.apache.batik.transcoder.keys,org.apache.batik.transcoder.print,org.apache.batik.transcoder.svg2svg,org.apache.batik.transcoder.wmf,org.apache.batik.transcoder.wmf.tosvg - -usr/share/java/batik-gui-util.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik GUI Util - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.util.gui - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.util.gui,org.apache.batik.util.gui.resource,org.apache.batik.util.gui.xmleditor - -usr/share/java/batik-util.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik Util - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.util - Bundle-Version: 1.7.0 - Require-Bundle: org.apache.batik.util.gui;bundle-version="[1.7.0,1.8.0)" - Export-Package: org.apache.batik,org.apache.batik.i18n,org.apache.batik.util,org.apache.batik.util.io,org.apache.batik.util.resources - -usr/share/java/batik-xml.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik XML - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.xml - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.xml
  7. Download patch debian/new-upstream

    --- 1.7+dfsg-4/debian/new-upstream 2013-10-06 17:35:59.000000000 +0000 +++ 1.7.ubuntu-8ubuntu2/debian/new-upstream 2012-05-16 16:40:02.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # -# new-upstream: copyright 2012 by Vincent Fourmond. -# See debian/copyright file for details. +# new-upstream: copyright 2008 by Vincent Fourmond. +# Repackage a zip into a .tar.gz archive # # Called by uscan; from uscan(1): # @@ -15,25 +15,18 @@ # version=$2 -filename=`readlink -f $3` +filename=$3 dir=`mktemp -d` -curdir=`pwd` +# We repackage the upstream source zip file: +unzip $filename -d $dir +origname=batik_$version.orig.tar.gz -origname=batik_$version"+dfsg".orig.tar.xz - -echo "Repackaging batik version $version from $filename" - -# Abort on errors: -set -e - -# We repackage the upstream source file, skipping binary JAR files. +# We repackage excluding the lib/ subdir cd $dir -unzip $filename -cd $dir/batik* -find -name '*.jar' | xargs rm -cd .. -tar cvJf $curdir/../$origname batik*/ +tar cvz \ + -f $origname bat* cd - -rm -rf $dir +mv $dir/$origname .. +rm -rf $dir \ No newline at end of file
  8. Download patch debian/patches/remove-js.patch

    --- 1.7+dfsg-4/debian/patches/remove-js.patch 2013-10-15 04:56:48.000000000 +0000 +++ 1.7.ubuntu-8ubuntu2/debian/patches/remove-js.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Date: Mon, 14 Oct 2013 14:59:02 +0200 -Subject: remove-js - -=================================================================== ---- - build.xml | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/build.xml b/build.xml -index f274e64..96e7bde 100644 ---- a/build.xml -+++ b/build.xml -@@ -808,9 +808,9 @@ JAVA=/usr/bin/java - <copy file="${src}/batik-xml.pom.template" tofile="${maven}/batik-xml/${completeVersion}/batik-xml-${completeVersion}.pom" filtering="true"/> - <copy file="${build}/lib/batik-xml.jar" tofile="${maven}/batik-xml/${completeVersion}/batik-xml-${completeVersion}.jar"/> - -- <mkdir dir="${maven}/batik-js/${completeVersion}"/> -- <copy file="${src}/batik-js.pom.template" tofile="${maven}/batik-js/${completeVersion}/batik-js-${completeVersion}.pom" filtering="true"/> -- <copy file="${build}/lib/js.jar" tofile="${maven}/batik-js/${completeVersion}/batik-js-${completeVersion}.jar"/> -+ <!-- <mkdir dir="${maven}/batik-js/${completeVersion}"/> --> -+ <!-- <copy file="${src}/batik-js.pom.template" tofile="${maven}/batik-js/${completeVersion}/batik-js-${completeVersion}.pom" filtering="true"/> --> -+ <!-- <copy file="${build}/lib/js.jar" tofile="${maven}/batik-js/${completeVersion}/batik-js-${completeVersion}.jar"/> --> - - <!-- Generate checksums of all artifacts and POMs --> - <checksum algorithm="MD5" fileext=".md5">
  9. Download patch debian/manpages/rasterizer.1

    --- 1.7+dfsg-4/debian/manpages/rasterizer.1 2013-10-06 17:35:46.000000000 +0000 +++ 1.7.ubuntu-8ubuntu2/debian/manpages/rasterizer.1 2012-05-16 16:40:02.000000000 +0000 @@ -61,7 +61,7 @@ are floating point values. .TP \fB\-bg\fR <color> .IP -output color. The format for <color> is a.r.g.b, where a, r, g and b +ouput color. The format for <color> is a.r.g.b, where a, r, g and b are integer values. .TP \fB\-cssMedia\fR <media> @@ -158,7 +158,7 @@ are floating point values. .TP \fB\-bg\fR <color> .IP -output color. The format for <color> is a.r.g.b, where a, r, g and b +ouput color. The format for <color> is a.r.g.b, where a, r, g and b are integer values. .TP \fB\-cssMedia\fR <media>
  10. Download patch debian/watch

    --- 1.7+dfsg-4/debian/watch 2013-10-06 17:35:59.000000000 +0000 +++ 1.7.ubuntu-8ubuntu2/debian/watch 2012-05-16 16:40:02.000000000 +0000 @@ -1,3 +1,2 @@ version=3 -opts=dversionmangle=s/\+dfsg// \ http://archive.apache.org/dist/xmlgraphics/batik/ batik-src-([0123456789.]*).zip debian debian/new-upstream Binary files 1.7+dfsg-4/documentation-sources/content/demo/batik-awt-util.jar and 1.7.ubuntu-8ubuntu2/documentation-sources/content/demo/batik-awt-util.jar differ Binary files 1.7+dfsg-4/documentation-sources/content/demo/batik-bridge.jar and 1.7.ubuntu-8ubuntu2/documentation-sources/content/demo/batik-bridge.jar differ Binary files 1.7+dfsg-4/documentation-sources/content/demo/batik-css.jar and 1.7.ubuntu-8ubuntu2/documentation-sources/content/demo/batik-css.jar differ Binary files 1.7+dfsg-4/documentation-sources/content/demo/batik-dom.jar and 1.7.ubuntu-8ubuntu2/documentation-sources/content/demo/batik-dom.jar differ Binary files 1.7+dfsg-4/documentation-sources/content/demo/batik-ext.jar and 1.7.ubuntu-8ubuntu2/documentation-sources/content/demo/batik-ext.jar differ Binary files 1.7+dfsg-4/documentation-sources/content/demo/batik-gvt.jar and 1.7.ubuntu-8ubuntu2/documentation-sources/content/demo/batik-gvt.jar differ Binary files 1.7+dfsg-4/documentation-sources/content/demo/batik-parser.jar and 1.7.ubuntu-8ubuntu2/documentation-sources/content/demo/batik-parser.jar differ Binary files 1.7+dfsg-4/documentation-sources/content/demo/batik-script.jar and 1.7.ubuntu-8ubuntu2/documentation-sources/content/demo/batik-script.jar differ Binary files 1.7+dfsg-4/documentation-sources/content/demo/batik-svg-dom.jar and 1.7.ubuntu-8ubuntu2/documentation-sources/content/demo/batik-svg-dom.jar differ Binary files 1.7+dfsg-4/documentation-sources/content/demo/batik-swing.jar and 1.7.ubuntu-8ubuntu2/documentation-sources/content/demo/batik-swing.jar differ Binary files 1.7+dfsg-4/documentation-sources/content/demo/batik-util.jar and 1.7.ubuntu-8ubuntu2/documentation-sources/content/demo/batik-util.jar differ Binary files 1.7+dfsg-4/documentation-sources/content/demo/batik-xml.jar and 1.7.ubuntu-8ubuntu2/documentation-sources/content/demo/batik-xml.jar differ Binary files 1.7+dfsg-4/documentation-sources/content/demo/xml-apis-dom3.jar and 1.7.ubuntu-8ubuntu2/documentation-sources/content/demo/xml-apis-dom3.jar differ Binary files 1.7+dfsg-4/lib/build/ant-1.6.5.jar and 1.7.ubuntu-8ubuntu2/lib/build/ant-1.6.5.jar differ Binary files 1.7+dfsg-4/lib/build/ant-launcher-1.6.5.jar and 1.7.ubuntu-8ubuntu2/lib/build/ant-launcher-1.6.5.jar differ Binary files 1.7+dfsg-4/lib/build/crimson-1.1.3.jar and 1.7.ubuntu-8ubuntu2/lib/build/crimson-1.1.3.jar differ Binary files 1.7+dfsg-4/lib/js.jar and 1.7.ubuntu-8ubuntu2/lib/js.jar differ Binary files 1.7+dfsg-4/lib/pdf-transcoder.jar and 1.7.ubuntu-8ubuntu2/lib/pdf-transcoder.jar differ Binary files 1.7+dfsg-4/lib/xalan-2.6.0.jar and 1.7.ubuntu-8ubuntu2/lib/xalan-2.6.0.jar differ Binary files 1.7+dfsg-4/lib/xerces_2_5_0.jar and 1.7.ubuntu-8ubuntu2/lib/xerces_2_5_0.jar differ Binary files 1.7+dfsg-4/lib/xml-apis-ext.jar and 1.7.ubuntu-8ubuntu2/lib/xml-apis-ext.jar differ Binary files 1.7+dfsg-4/lib/xml-apis.jar and 1.7.ubuntu-8ubuntu2/lib/xml-apis.jar differ
  11. Download patch debian/patches/series

    --- 1.7+dfsg-4/debian/patches/series 2013-10-06 17:35:59.000000000 +0000 +++ 1.7.ubuntu-8ubuntu2/debian/patches/series 2012-05-16 16:40:02.000000000 +0000 @@ -1,3 +1,2 @@ 06_fix_paths_in_policy_files.patch source-1.5.patch -remove-js.patch
  12. Download patch .pc/remove-js.patch/build.xml
  13. Download patch build.xml

    --- 1.7+dfsg-4/build.xml 2013-10-17 10:09:43.000000000 +0000 +++ 1.7.ubuntu-8ubuntu2/build.xml 2013-10-17 10:09:44.000000000 +0000 @@ -808,9 +808,9 @@ JAVA=/usr/bin/java <copy file="${src}/batik-xml.pom.template" tofile="${maven}/batik-xml/${completeVersion}/batik-xml-${completeVersion}.pom" filtering="true"/> <copy file="${build}/lib/batik-xml.jar" tofile="${maven}/batik-xml/${completeVersion}/batik-xml-${completeVersion}.jar"/> - <!-- <mkdir dir="${maven}/batik-js/${completeVersion}"/> --> - <!-- <copy file="${src}/batik-js.pom.template" tofile="${maven}/batik-js/${completeVersion}/batik-js-${completeVersion}.pom" filtering="true"/> --> - <!-- <copy file="${build}/lib/js.jar" tofile="${maven}/batik-js/${completeVersion}/batik-js-${completeVersion}.jar"/> --> + <mkdir dir="${maven}/batik-js/${completeVersion}"/> + <copy file="${src}/batik-js.pom.template" tofile="${maven}/batik-js/${completeVersion}/batik-js-${completeVersion}.pom" filtering="true"/> + <copy file="${build}/lib/js.jar" tofile="${maven}/batik-js/${completeVersion}/batik-js-${completeVersion}.jar"/> <!-- Generate checksums of all artifacts and POMs --> <checksum algorithm="MD5" fileext=".md5">
  14. Download patch debian/copyright
  15. Download patch debian/patches/source-1.5.patch

    --- 1.7+dfsg-4/debian/patches/source-1.5.patch 2013-10-15 04:56:48.000000000 +0000 +++ 1.7.ubuntu-8ubuntu2/debian/patches/source-1.5.patch 2012-05-16 16:40:02.000000000 +0000 @@ -1,16 +1,6 @@ -From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Date: Mon, 14 Oct 2013 14:59:02 +0200 -Subject: source-1.5 - ---- - build.xml | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/build.xml b/build.xml -index c26e1ee..f274e64 100644 ---- a/build.xml -+++ b/build.xml -@@ -835,7 +835,7 @@ JAVA=/usr/bin/java +--- batik-1.7.orig/build.xml 2008-11-06 18:42:11.000000000 +0100 ++++ batik-1.7/build.xml 2008-11-06 18:41:24.000000000 +0100 +@@ -835,7 +835,7 @@ <echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/> <javac srcdir="${testsrc}" destdir="${dest}" deprecation="${deprecation}" @@ -19,7 +9,7 @@ index c26e1ee..f274e64 100644 <classpath> <pathelement location="${dest}"/> <path refid="libs-classpath"/> -@@ -858,7 +858,7 @@ JAVA=/usr/bin/java +@@ -858,7 +858,7 @@ <echo message="debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/> @@ -28,7 +18,7 @@ index c26e1ee..f274e64 100644 debug="${debug}" optimize="${optimize}" encoding="UTF-8"> <classpath> <pathelement location="${dest}"/> -@@ -868,7 +868,7 @@ JAVA=/usr/bin/java +@@ -868,7 +868,7 @@ </classpath> </javac> @@ -37,7 +27,7 @@ index c26e1ee..f274e64 100644 debug="${debug}" optimize="${optimize}" encoding="UTF-8"> <classpath> <pathelement location="${dest}"/> -@@ -1004,7 +1004,7 @@ JAVA=/usr/bin/java +@@ -1004,7 +1004,7 @@ </target> <target name="compile" depends="init, compile-prepare" unless="compile.done">

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

Source: commons-daemon

commons-daemon (1.0.15-5ubuntu2) trusty; urgency=medium * Add ppc64el support. -- Colin Watson <cjwatson@ubuntu.com> Thu, 17 Apr 2014 11:14:36 +0100 commons-daemon (1.0.15-5ubuntu1) trusty; urgency=medium * Resynchronise with Debian. Remaining changes: - Add arm64 support. -- Colin Watson <cjwatson@ubuntu.com> Thu, 13 Feb 2014 11:41:02 +0000

Modifications :
  1. Download patch debian/patches/arm64.diff

    --- 1.0.15-5/debian/patches/arm64.diff 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.15-5ubuntu2/debian/patches/arm64.diff 2014-02-13 11:40:29.000000000 +0000 @@ -0,0 +1,37 @@ +Description: Add ARM64 support +Author: Colin Watson <cjwatson@ubuntu.com> +Forwarded: no +Last-Update: 2013-10-15 + +Index: b/src/native/unix/configure +=================================================================== +--- a/src/native/unix/configure ++++ b/src/native/unix/configure +@@ -2697,6 +2697,11 @@ + supported_os="arm" + HOST_CPU=arm + ;; ++ aarch64) ++ CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\"" ++ supported_os="aarch64" ++ HOST_CPU=aarch64 ++ ;; + *) + echo "$as_me:$LINENO: result: failed" >&5 + echo "${ECHO_T}failed" >&6 +Index: b/src/native/unix/support/apsupport.m4 +=================================================================== +--- a/src/native/unix/support/apsupport.m4 ++++ b/src/native/unix/support/apsupport.m4 +@@ -176,6 +176,11 @@ + supported_os="arm" + HOST_CPU=arm + ;; ++ aarch64) ++ CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\"" ++ supported_os="aarch64" ++ HOST_CPU=aarch64 ++ ;; + *) + AC_MSG_RESULT([failed]) + AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
  2. Download patch .pc/arm64.diff/src/native/unix/configure
  3. Download patch debian/control

    --- 1.0.15-5/debian/control 2014-01-26 15:19:58.000000000 +0000 +++ 1.0.15-5ubuntu2/debian/control 2014-02-13 11:40:05.000000000 +0000 @@ -1,7 +1,8 @@ Source: commons-daemon 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>, Damien Raude-Morvan <drazzib@debian.org>, Emmanuel Bourg <ebourg@apache.org>
  4. Download patch .pc/ppc64el.diff/src/native/unix/support/apsupport.m4
  5. Download patch .pc/applied-patches

    --- 1.0.15-5/.pc/applied-patches 2014-04-17 13:07:29.426017955 +0000 +++ 1.0.15-5ubuntu2/.pc/applied-patches 2014-04-17 13:07:29.666024159 +0000 @@ -2,3 +2,5 @@ libgcj_PR31700.diff kfreebsd_support.diff s390x_support.diff hurd_support.diff +arm64.diff +ppc64el.diff
  6. Download patch src/native/unix/support/apsupport.m4

    --- 1.0.15-5/src/native/unix/support/apsupport.m4 2014-04-17 13:07:29.000000000 +0000 +++ 1.0.15-5ubuntu2/src/native/unix/support/apsupport.m4 2014-04-17 13:07:29.000000000 +0000 @@ -176,6 +176,16 @@ AC_DEFUN(AP_SUPPORTED_HOST,[ supported_os="arm" HOST_CPU=arm ;; + aarch64) + CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\"" + supported_os="aarch64" + HOST_CPU=aarch64 + ;; + powerpc64le) + CFLAGS="$CFLAGS -DCPU=\\\"powerpc64le\\\"" + supported_os="powerpc64le" + HOST_CPU=powerpc64le + ;; *) AC_MSG_RESULT([failed]) AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
  7. Download patch debian/patches/ppc64el.diff

    --- 1.0.15-5/debian/patches/ppc64el.diff 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.15-5ubuntu2/debian/patches/ppc64el.diff 2014-04-17 10:14:22.000000000 +0000 @@ -0,0 +1,37 @@ +Description: Add ppc64el support +Author: Colin Watson <cjwatson@ubuntu.com> +Forwarded: no +Last-Update: 2014-04-17 + +Index: b/src/native/unix/configure +=================================================================== +--- a/src/native/unix/configure ++++ b/src/native/unix/configure +@@ -2702,6 +2702,11 @@ + supported_os="aarch64" + HOST_CPU=aarch64 + ;; ++ powerpc64le) ++ CFLAGS="$CFLAGS -DCPU=\\\"powerpc64le\\\"" ++ supported_os="powerpc64le" ++ HOST_CPU=powerpc64le ++ ;; + *) + echo "$as_me:$LINENO: result: failed" >&5 + echo "${ECHO_T}failed" >&6 +Index: b/src/native/unix/support/apsupport.m4 +=================================================================== +--- a/src/native/unix/support/apsupport.m4 ++++ b/src/native/unix/support/apsupport.m4 +@@ -181,6 +181,11 @@ + supported_os="aarch64" + HOST_CPU=aarch64 + ;; ++ powerpc64le) ++ CFLAGS="$CFLAGS -DCPU=\\\"powerpc64le\\\"" ++ supported_os="powerpc64le" ++ HOST_CPU=powerpc64le ++ ;; + *) + AC_MSG_RESULT([failed]) + AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
  8. Download patch src/native/unix/configure

    --- 1.0.15-5/src/native/unix/configure 2013-03-27 08:11:16.000000000 +0000 +++ 1.0.15-5ubuntu2/src/native/unix/configure 2014-04-17 13:07:29.000000000 +0000 @@ -2697,6 +2697,16 @@ echo "$as_me: error: Unsupported operati supported_os="arm" HOST_CPU=arm ;; + aarch64) + CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\"" + supported_os="aarch64" + HOST_CPU=aarch64 + ;; + powerpc64le) + CFLAGS="$CFLAGS -DCPU=\\\"powerpc64le\\\"" + supported_os="powerpc64le" + HOST_CPU=powerpc64le + ;; *) echo "$as_me:$LINENO: result: failed" >&5 echo "${ECHO_T}failed" >&6
  9. Download patch debian/patches/series

    --- 1.0.15-5/debian/patches/series 2014-01-26 15:22:15.000000000 +0000 +++ 1.0.15-5ubuntu2/debian/patches/series 2014-04-17 10:12:40.000000000 +0000 @@ -2,3 +2,5 @@ libgcj_PR31700.diff kfreebsd_support.diff s390x_support.diff hurd_support.diff +arm64.diff +ppc64el.diff
  10. Download patch .pc/arm64.diff/src/native/unix/support/apsupport.m4
  11. Download patch .pc/ppc64el.diff/src/native/unix/configure

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

Source: commons-vfs

commons-vfs (2.0-3ubuntu1) quantal; urgency=low * Merge from Debian unstable. Remaining changes: - Use ant build system: + d/control: Drop B-D's on maven-debian-helper + cdbs and add B-D on maven-ant-helper, maven-repo-helper. + d/rules, d/build-classpath, d/build.xml, d/build.properties: Configure build to use customized version of maven-ant-helper build.xml + debhelper. + d/libcommons-vfs-java.poms: Update to pickup build artifacts and remove surplus pom files. + d/libcommons-vfs-java-doc.install: Pickup documentation from core component instead of aggregated javadoc. + d/control: Manually set dependencies for binary packages. - Enabled test suite: + d/patches/disable_webdav_provider.diff: Update patch to fix test that checks for webdav support. + d/build.xml: Ignore webdav when running tests. -- James Page <james.page@ubuntu.com> Fri, 22 Jun 2012 16:27:58 +0100

Modifications :
  1. Download patch debian/libcommons-vfs-java.poms

    --- 2.0-3/debian/libcommons-vfs-java.poms 2012-04-08 16:41:25.000000000 +0000 +++ 2.0-3ubuntu1/debian/libcommons-vfs-java.poms 2012-06-20 22:03:47.000000000 +0000 @@ -1,4 +1,2 @@ pom.xml -examples/pom.xml -core/pom.xml --java-lib -dist/pom.xml --ignore +core/pom.xml --java-lib --artifact=core/target/commons-vfs2-*.jar
  2. Download patch debian/build.properties

    --- 2.0-3/debian/build.properties 1970-01-01 00:00:00.000000000 +0000 +++ 2.0-3ubuntu1/debian/build.properties 2011-10-18 12:43:04.000000000 +0000 @@ -0,0 +1,10 @@ +build.javaVersion=1.5 +# Generate javadoc and link to required API packages +javadoc.generate=true +dependency=libcommons-logging-java +dependency2=libcommons-net2-java +dependency3=libcommons-collections3-java +dependency4=libcommons-httpclient-java +maven.test.exclude=**/RunTest.java +# Line up with maven defaults +build.directory=target
  3. Download patch debian/patches/disable_webdav_provider.diff

    --- 2.0-3/debian/patches/disable_webdav_provider.diff 2011-09-11 00:07:22.000000000 +0000 +++ 2.0-3ubuntu1/debian/patches/disable_webdav_provider.diff 2012-06-20 22:03:47.000000000 +0000 @@ -3,10 +3,10 @@ Description: Disable webdav module (sour Author: Damien Raude-Morvan <drazzib@debian.org> Last-Update: 2011-09-11 Forwarded: not-needed -Index: b/core/pom.xml +Index: commons-vfs-2.0/core/pom.xml =================================================================== ---- a/core/pom.xml -+++ b/core/pom.xml +--- commons-vfs-2.0.orig/core/pom.xml 2011-10-18 13:06:05.271986706 +0100 ++++ commons-vfs-2.0/core/pom.xml 2011-10-18 13:06:08.216010643 +0100 @@ -167,6 +167,36 @@ </configuration> </plugin> @@ -44,10 +44,10 @@ Index: b/core/pom.xml </plugins> </build> <profiles> -Index: b/pom.xml +Index: commons-vfs-2.0/pom.xml =================================================================== ---- a/pom.xml -+++ b/pom.xml +--- commons-vfs-2.0.orig/pom.xml 2011-10-18 13:06:05.291986869 +0100 ++++ commons-vfs-2.0/pom.xml 2011-10-18 13:06:08.216010643 +0100 @@ -243,6 +243,7 @@ </tag> </tags> @@ -56,3 +56,16 @@ Index: b/pom.xml </configuration> </plugin> <plugin> +Index: commons-vfs-2.0/core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java +=================================================================== +--- commons-vfs-2.0.orig/core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java 2011-10-18 13:06:02.194238000 +0100 ++++ commons-vfs-2.0/core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java 2011-10-18 13:06:21.904121945 +0100 +@@ -119,7 +119,7 @@ + + private static String[] schemes = new String[] + { +- "webdav", "http", "ftp", "file", "zip", "tar", "tgz", "bz2", "gz", "jar", "tmp", "ram" ++ "http", "ftp", "file", "zip", "tar", "tgz", "bz2", "gz", "jar", "tmp", "ram" + }; + + public void testConfiguration() throws Exception
  4. Download patch debian/rules

    --- 2.0-3/debian/rules 2011-09-11 00:07:22.000000000 +0000 +++ 2.0-3ubuntu1/debian/rules 2012-06-20 22:03:47.000000000 +0000 @@ -1,14 +1,19 @@ #!/usr/bin/make -f # debian/rules for commons-vfs -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk +PACKAGE := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ') +VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//') -JAVA_HOME := /usr/lib/jvm/default-java -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) +export JAVA_HOME=/usr/lib/jvm/default-java +export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; done) +export ANT_ARGS=-Dbasedir=$(realpath .)/core -Dpackage=$(PACKAGE) \ + -Dversion=$(VERSION) -Dbin.package=lib$(PACKAGE)-java \ + -Dpom.file=$(realpath .)/core/pom.xml -Ddebian.dir=$(realpath .)/debian \ + -propertyfile debian/build.properties \ + -f debian/build.xml -DEB_MAVEN_DOC_TARGET := javadoc:aggregate +%: + dh $@ --buildsystem=ant --with maven_repo_helper get-orig-source: uscan --force-download --rename
  5. Download patch debian/control

    --- 2.0-3/debian/control 2012-04-08 16:41:25.000000000 +0000 +++ 2.0-3ubuntu1/debian/control 2012-06-22 15:29:10.000000000 +0000 @@ -1,7 +1,8 @@ Source: commons-vfs 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> Build-Depends-Indep: ant-doc, junit4, @@ -16,10 +17,9 @@ Build-Depends-Indep: ant-doc, libcommons-net2-java-doc, libcommons-parent-java, libjdom1-java-doc, - libjsch-java, - libmaven-antrun-plugin-java, - libmaven-javadoc-plugin-java -Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper + libjsch-java +Build-Depends: debhelper (>= 7.0.50~), default-jdk, maven-ant-helper, + maven-repo-helper (>= 1.5~) Standards-Version: 3.9.3 Homepage: http://commons.apache.org/vfs/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-vfs @@ -27,8 +27,12 @@ Vcs-Browser: http://svn.debian.org/wsvn/ Package: libcommons-vfs-java Architecture: all -Depends: ${maven:Depends}, ${misc:Depends} -Recommends: ${maven:OptionalDepends} +Depends: libcommons-logging-java, ${misc:Depends} +Recommends: ant, + libcommons-collections3-java, + libcommons-httpclient-java, + libcommons-net2-java, + libjsch-java Suggests: libcommons-vfs-java-doc Description: Java API for accessing various filesystems Commons VFS provides a single API for accessing various different file @@ -41,7 +45,11 @@ Description: Java API for accessing vari Package: libcommons-vfs-java-doc Architecture: all Section: doc -Depends: ${misc:Depends} +Depends: libcommons-collections3-java-doc, + libcommons-httpclient-java-doc, + libcommons-logging-java-doc, + libcommons-net2-java-doc, + ${misc:Depends} Recommends: default-jdk-doc Suggests: libcommons-vfs-java Description: Java API for accessing various filesystems - documentation
  6. Download patch core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java

    --- 2.0-3/core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java 2011-08-18 13:57:07.000000000 +0000 +++ 2.0-3ubuntu1/core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java 2012-06-29 00:10:46.000000000 +0000 @@ -119,7 +119,7 @@ public class DelegatingFileSystemOptions private static String[] schemes = new String[] { - "webdav", "http", "ftp", "file", "zip", "tar", "tgz", "bz2", "gz", "jar", "tmp", "ram" + "http", "ftp", "file", "zip", "tar", "tgz", "bz2", "gz", "jar", "tmp", "ram" }; public void testConfiguration() throws Exception
  7. Download patch debian/build.xml
  8. Download patch debian/libcommons-vfs-java-doc.install

    --- 2.0-3/debian/libcommons-vfs-java-doc.install 2011-09-11 00:07:22.000000000 +0000 +++ 2.0-3ubuntu1/debian/libcommons-vfs-java-doc.install 2012-06-20 22:03:47.000000000 +0000 @@ -1 +1 @@ -target/site/apidocs/* /usr/share/doc/libcommons-vfs-java/api/ +core/target/docs/api/* /usr/share/doc/libcommons-vfs-java/api/
  9. Download patch debian/build-classpath

    --- 2.0-3/debian/build-classpath 1970-01-01 00:00:00.000000000 +0000 +++ 2.0-3ubuntu1/debian/build-classpath 2011-10-18 13:13:22.000000000 +0000 @@ -0,0 +1,10 @@ +/usr/share/java/ant.jar +/usr/share/java/ant-junit4.jar +/usr/share/java/junit4.jar +/usr/share/java/commons-logging.jar +/usr/share/java/commons-net2.jar +/usr/share/java/commons-httpclient.jar +/usr/share/java/commons-compress.jar +/usr/share/java/jsch.jar +/usr/share/java/commons-collections3.jar +/usr/share/java/jdom.jar
  10. Download patch .pc/disable_webdav_provider.diff/core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java

    --- 2.0-3/.pc/disable_webdav_provider.diff/core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java 1970-01-01 00:00:00.000000000 +0000 +++ 2.0-3ubuntu1/.pc/disable_webdav_provider.diff/core/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java 2011-08-18 13:57:07.000000000 +0000 @@ -0,0 +1,132 @@ +/* + * 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. + */ +package org.apache.commons.vfs2.util; + +import java.io.File; +import java.lang.reflect.InvocationTargetException; + +import junit.framework.TestCase; + +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.FileSystemOptions; +import org.apache.commons.vfs2.impl.StandardFileSystemManager; +import org.apache.commons.vfs2.provider.http.HttpFileSystemConfigBuilder; +import org.apache.commons.vfs2.provider.sftp.SftpFileSystemConfigBuilder; +import org.apache.commons.vfs2.provider.sftp.TrustEveryoneUserInfo; + +/** + * Some tests for the DelegatingFileSystemOptionsBuilder + * + * @author <a href="mailto:imario@apache.org">Mario Ivankovits</a> + */ +public class DelegatingFileSystemOptionsBuilderTest extends TestCase +{ + private StandardFileSystemManager fsm = null; + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + // get a full blown, fully functional manager + fsm = new StandardFileSystemManager(); + fsm.init(); + } + + + @Override + protected void tearDown() throws Exception + { + if (fsm != null) + { + fsm.close(); + } + + super.tearDown(); + } + + public void testDelegatingGood() throws Throwable + { + final String[] identityPaths = new String[] + { + "/file1", + "/file2", + }; + + FileSystemOptions opts = new FileSystemOptions(); + DelegatingFileSystemOptionsBuilder delgate = new DelegatingFileSystemOptionsBuilder(fsm); + + delgate.setConfigString(opts, "http", "proxyHost", "proxy"); + delgate.setConfigString(opts, "http", "proxyPort", "8080"); + delgate.setConfigClass(opts, "sftp", "userinfo", TrustEveryoneUserInfo.class); + delgate.setConfigStrings(opts, "sftp", "identities", identityPaths); + + assertEquals("http.proxyHost", HttpFileSystemConfigBuilder.getInstance().getProxyHost(opts), "proxy"); + assertEquals("http.proxyPort", HttpFileSystemConfigBuilder.getInstance().getProxyPort(opts), 8080); + assertEquals("sftp.userInfo", SftpFileSystemConfigBuilder.getInstance().getUserInfo(opts).getClass(), TrustEveryoneUserInfo.class); + + File identities[] = SftpFileSystemConfigBuilder.getInstance().getIdentities(opts); + assertNotNull("sftp.identities", identities); + assertEquals("sftp.identities size", identities.length, identityPaths.length); + for (int iterIdentities = 0; iterIdentities < identities.length; iterIdentities++) + { + assertEquals("sftp.identities #" + iterIdentities, + identities[iterIdentities].getAbsolutePath(), + new File(identityPaths[iterIdentities]).getAbsolutePath()); + } + } + + public void testDelegatingBad() throws Throwable + { + FileSystemOptions opts = new FileSystemOptions(); + DelegatingFileSystemOptionsBuilder delgate = new DelegatingFileSystemOptionsBuilder(fsm); + + try + { + delgate.setConfigString(opts, "http", "proxyPort", "wrong_port"); + fail(); + } + catch (FileSystemException e) + { + assertEquals(e.getCause().getClass(), InvocationTargetException.class); + assertEquals(((InvocationTargetException) e.getCause()).getTargetException().getClass(), NumberFormatException.class); + } + + try + { + delgate.setConfigClass(opts, "sftp", "userinfo", String.class); + fail(); + } + catch (FileSystemException e) + { + assertEquals(e.getCode(), "vfs.provider/config-value-invalid.error"); + } + } + + private static String[] schemes = new String[] + { + "webdav", "http", "ftp", "file", "zip", "tar", "tgz", "bz2", "gz", "jar", "tmp", "ram" + }; + + public void testConfiguration() throws Exception + { + for (int i=0; i < schemes.length; ++i) + { + assertTrue("Missing" + schemes[i] + " provider", fsm.hasProvider(schemes[i])); + } + } +}

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: doxia

doxia (1.1.4-1ubuntu4) trusty; urgency=medium * debian/rules: make sure we run in offline mode in the install:install-file step too by forcing maven in offline mode and specifying the local repository path in relation to the debian dir. (LP: #935070) -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Fri, 11 Apr 2014 22:50:59 -0400 doxia (1.1.4-1ubuntu3) precise; urgency=low * debian/patches/0008-doxia-logging-deps.patch: slightly adjust java package dependencies in doxia-modules and doxia-book pom files to include doxia-logging-api. * debian/rules: import the jar files we just build back into the temporary maven repository so they're accessible as we try to build docs. * debian/control: add a Build-Depends on libmaven-install-plugin-java. -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Wed, 23 Nov 2011 11:44:25 -0500 doxia (1.1.4-1ubuntu2) precise; urgency=low * debian/maven.properties: set maven to offline mode to avoid trying to download file from the web, which would fail the build. -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Tue, 22 Nov 2011 15:00:40 -0500 doxia (1.1.4-1ubuntu1) precise; urgency=low * debian/control: add Build-Depends for libjaxen-java. -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Mon, 21 Nov 2011 10:28:04 -0500

Modifications :
  1. Download patch doxia-modules/pom.xml

    --- 1.1.4-1/doxia-modules/pom.xml 2014-04-12 04:07:33.000000000 +0000 +++ 1.1.4-1ubuntu4/doxia-modules/pom.xml 2014-04-12 04:07:33.000000000 +0000 @@ -50,6 +50,10 @@ under the License. <dependencies> <dependency> <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-logging-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-core</artifactId> </dependency> <dependency>
  2. Download patch debian/rules

    --- 1.1.4-1/debian/rules 2011-09-09 22:28:03.000000000 +0000 +++ 1.1.4-1ubuntu4/debian/rules 2014-04-11 21:51:50.000000000 +0000 @@ -8,3 +8,23 @@ DEB_MAVEN_DOC_TARGET := javadoc:jar java get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename + +IMPORT_BINARY_JARS = \ + for jar in `find $(CURDIR)/doxia-* -name "*.jar" -print`; \ + do \ + artifact=$$(basename $$(dirname $$(echo $$jar | sed "s/\/target//"))); \ + echo "--- $$artifact ---"; \ + mvn install:install-file -o \ + -DgroupId=org.apache.maven.doxia \ + -DartifactId=$$artifact \ + -Dversion=1.1.4 \ + -Dmaven.repo.local=$(CURDIR)/debian/maven-repo \ + -DlocalRepositoryPath=$(CURDIR)/debian/tmp/usr/share/maven-repo \ + -Dpackaging=jar -Dfile=$$jar; \ + done; + +binary-jars: + $(call IMPORT_BINARY_JARS) + touch $@ + +after-mvn-build:: binary-jars
  3. Download patch debian/control

    --- 1.1.4-1/debian/control 2011-09-09 22:28:03.000000000 +0000 +++ 1.1.4-1ubuntu4/debian/control 2014-04-11 19:37:06.000000000 +0000 @@ -1,7 +1,8 @@ Source: doxia 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: Michael Koch <konqueror@gmx.de>, Torsten Werner <twerner@debian.org> Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) Build-Depends-Indep: libclirr-maven-plugin-java, libmaven-plugin-tools-java, libmaven-shade-plugin-java, @@ -11,7 +12,7 @@ Build-Depends-Indep: libclirr-maven-plug libplexus-i18n-java, libplexus-utils-java, libxerces2-java, junit, libxerces2-java, default-jdk-doc, libcommons-configuration-java-doc, liblog4j1.2-java-doc, libmaven2-core-java-doc, libplexus-containers-java-doc, libplexus-utils-java-doc, - libmaven-javadoc-plugin-java + libmaven-javadoc-plugin-java, libjaxen-java, libmaven-install-plugin-java Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/doxia
  4. Download patch doxia-book/pom.xml

    --- 1.1.4-1/doxia-book/pom.xml 2014-04-12 04:07:33.000000000 +0000 +++ 1.1.4-1ubuntu4/doxia-book/pom.xml 2014-04-12 04:07:33.000000000 +0000 @@ -37,6 +37,10 @@ under the License. <!-- doxia core --> <dependency> <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-logging-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-core</artifactId> </dependency> <dependency>
  5. Download patch .pc/applied-patches

    --- 1.1.4-1/.pc/applied-patches 2014-04-12 04:07:33.667053498 +0000 +++ 1.1.4-1ubuntu4/.pc/applied-patches 2014-04-12 04:07:33.987061843 +0000 @@ -5,3 +5,4 @@ 0005-don-t-build-doxia-maven-plugin.patch 0006-specificy-source-and-target-version.patch 0007-disable-plexus-javadoc.patch +0008-doxia-logging-deps.patch
  6. Download patch .pc/0008-doxia-logging-deps.patch/doxia-book/pom.xml

    --- 1.1.4-1/.pc/0008-doxia-logging-deps.patch/doxia-book/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.4-1ubuntu4/.pc/0008-doxia-logging-deps.patch/doxia-book/pom.xml 2014-04-12 04:07:33.000000000 +0000 @@ -0,0 +1,144 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +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. +--> + +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia</artifactId> + <version>1.1.4</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>doxia-book</artifactId> + <name>Doxia :: Book Component</name> + <description>A component to write books like user manuals and guides in any format supported by Doxia.</description> + + <dependencies> + <!-- doxia core --> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-sink-api</artifactId> + </dependency> + + <!-- doxia modules ordered --> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-apt</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-docbook-simple</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-itext</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-latex</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-xdoc</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-xhtml</artifactId> + </dependency> + + <!-- plexus --> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-i18n</artifactId> + <version>1.0-beta-6</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.modello</groupId> + <artifactId>modello-maven-plugin</artifactId> + <configuration> + <models> + <model>src/main/modello/book.mdo</model> + </models> + <version>1.0.0</version> + </configuration> + <executions> + <execution> + <id>site-docs</id> + <phase>pre-site</phase> + <goals> + <goal>xdoc</goal> + <goal>xsd</goal> + </goals> + </execution> + <execution> + <id>descriptor</id> + <phase>generate-sources</phase> + <goals> + <goal>java</goal> + <goal>xpp3-reader</goal> + <goal>xsd</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>reporting</id> + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>l10n-maven-plugin</artifactId> + <version>1.0-alpha-2</version> + <configuration> + <locales> + <locale>en</locale> + <locale>fr</locale> + </locales> + </configuration> + </plugin> + </plugins> + </reporting> + </profile> + </profiles> +</project> \ No newline at end of file
  7. Download patch debian/patches/0008-doxia-logging-deps.patch

    --- 1.1.4-1/debian/patches/0008-doxia-logging-deps.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.4-1ubuntu4/debian/patches/0008-doxia-logging-deps.patch 2014-04-11 19:37:06.000000000 +0000 @@ -0,0 +1,38 @@ +From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> +Subject: Add doxia-logging-api to dependencies for doxia-modules and doxia-book +Last-Update: 2011-11-23 + +It appears to be required at least for building documentation, otherwise the +build fails as it tries to resolve org.apache.maven.doxia.logging.LogEnabled, +among other symbols provided by doxia-logging-api. + +Index: doxia/doxia-modules/pom.xml +=================================================================== +--- doxia.orig/doxia-modules/pom.xml 2011-11-21 16:55:11.277656324 -0500 ++++ doxia/doxia-modules/pom.xml 2011-11-23 10:58:55.255900098 -0500 +@@ -50,6 +50,10 @@ + <dependencies> + <dependency> + <groupId>org.apache.maven.doxia</groupId> ++ <artifactId>doxia-logging-api</artifactId> ++ </dependency> ++ <dependency> ++ <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + </dependency> + <dependency> +Index: doxia/doxia-book/pom.xml +=================================================================== +--- doxia.orig/doxia-book/pom.xml 2011-11-21 16:55:15.685656130 -0500 ++++ doxia/doxia-book/pom.xml 2011-11-23 11:03:28.119915934 -0500 +@@ -37,6 +37,10 @@ + <!-- doxia core --> + <dependency> + <groupId>org.apache.maven.doxia</groupId> ++ <artifactId>doxia-logging-api</artifactId> ++ </dependency> ++ <dependency> ++ <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + </dependency> + <dependency>
  8. Download patch debian/patches/series

    --- 1.1.4-1/debian/patches/series 2011-09-09 22:28:03.000000000 +0000 +++ 1.1.4-1ubuntu4/debian/patches/series 2014-04-11 19:37:06.000000000 +0000 @@ -5,3 +5,4 @@ 0005-don-t-build-doxia-maven-plugin.patch 0006-specificy-source-and-target-version.patch 0007-disable-plexus-javadoc.patch +0008-doxia-logging-deps.patch
  9. Download patch .pc/0008-doxia-logging-deps.patch/doxia-modules/pom.xml

    --- 1.1.4-1/.pc/0008-doxia-logging-deps.patch/doxia-modules/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.4-1ubuntu4/.pc/0008-doxia-logging-deps.patch/doxia-modules/pom.xml 2014-04-12 04:07:33.000000000 +0000 @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--><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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <artifactId>doxia</artifactId> + <groupId>org.apache.maven.doxia</groupId> + <version>1.1.4</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>doxia-modules</artifactId> + + <name>Doxia :: Modules</name> + <packaging>pom</packaging> + + <description>Doxia modules for several markup languages.</description> + + <modules> + <module>doxia-module-apt</module> + <module>doxia-module-confluence</module> + <module>doxia-module-docbook-simple</module> + <module>doxia-module-fml</module> + <module>doxia-module-fo</module> + <module>doxia-module-itext</module> + <module>doxia-module-latex</module> + <module>doxia-module-rtf</module> + <module>doxia-module-twiki</module> + <module>doxia-module-xdoc</module> + <module>doxia-module-xhtml</module> + </modules> + + <dependencies> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-sink-api</artifactId> + </dependency> + + </dependencies> +</project>
  10. Download patch debian/maven.properties

    --- 1.1.4-1/debian/maven.properties 2011-09-09 22:28:03.000000000 +0000 +++ 1.1.4-1ubuntu4/debian/maven.properties 2014-04-11 19:37:06.000000000 +0000 @@ -2,4 +2,5 @@ # For example: maven.test.skip=true +maven.settings.offline=true

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

Source: doxia-sitetools

doxia-sitetools (1.1.4-1ubuntu1) precise; urgency=low * debian/control: - re-add fop to Build-Depends. - add libjaxen-java to Build-Depends. - add libmaven-install-plugin-java to Build-Depends. * debian/maven.properties: ensure maven runs offline. * debian/rules: install just-built jar files back into the local maven repo for the build (they are required for building the docs). -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Thu, 24 Nov 2011 10:52:45 -0500

Modifications :
  1. Download patch debian/rules

    --- 1.1.4-1/debian/rules 2011-09-11 15:44:46.000000000 +0000 +++ 1.1.4-1ubuntu1/debian/rules 2011-11-24 16:10:14.000000000 +0000 @@ -8,3 +8,27 @@ DEB_MAVEN_DOC_TARGET := javadoc:jar java get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename + +IMPORT_BINARY_JARS = \ + for jar in `find $(CURDIR)/doxia-* -name "*.jar" -print`; \ + do \ + artifact=$$(basename $$(dirname $$(echo $$jar | sed "s/\/target//"))); \ + if ! test -d $(CURDIR)/debian/maven-repo/org/apache/maven/doxia/$$artifact/$(DEB_UPSTREAM_VERSION); \ + then \ + echo "Copying just-built binary jar for $$artifact into local maven repository."; \ + mvn install:install-file \ + -DgroupId=org.apache.maven.doxia \ + -DartifactId=$$artifact \ + -Dversion=$(DEB_UPSTREAM_VERSION) \ + -Dmaven.repo.local=$(CURDIR)/debian/maven-repo \ + -Dpackaging=jar -Dfile=$$jar; \ + else \ + echo "We already have the latest version JAR file for $$artifact in the local maven repo."; \ + fi; \ + done + +binary-jars: + $(call IMPORT_BINARY_JARS) + touch $@ + +after-mvn-build:: binary-jars
  2. Download patch debian/control

    --- 1.1.4-1/debian/control 2011-09-11 15:44:46.000000000 +0000 +++ 1.1.4-1ubuntu1/debian/control 2011-11-24 16:14:43.000000000 +0000 @@ -1,7 +1,8 @@ Source: doxia-sitetools 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>, Ludovic Claude <ludovic.claude@laposte.net>, Michael Koch <konqueror@gmx.de> Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) @@ -9,7 +10,8 @@ Build-Depends-Indep: libclirr-maven-plug libcommons-collections3-java, libdoxia-java, libitext1-java, libjaxp1.3-java, libplexus-containers-java, libplexus-i18n-java, libplexus-utils-java, libxalan2-java, junit (>= 3.8.2), libdoxia-java, default-jdk-doc, libdoxia-java-doc, libplexus-containers-java-doc, - libplexus-utils-java-doc, libxalan2-java-doc, libmaven-javadoc-plugin-java + libplexus-utils-java-doc, libxalan2-java-doc, libmaven-javadoc-plugin-java, + fop, libjaxen-java, libmaven-install-plugin-java Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia-sitetools Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/doxia-sitetools/
  3. Download patch debian/maven.properties

    --- 1.1.4-1/debian/maven.properties 2011-09-11 15:44:46.000000000 +0000 +++ 1.1.4-1ubuntu1/debian/maven.properties 2011-11-24 15:52:39.000000000 +0000 @@ -2,3 +2,4 @@ # For example: maven.test.skip=true +maven.settings.offline=true

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

Source: fop

fop (1:1.1.dfsg-2ubuntu1) saucy; urgency=low * Merge from Debian unstable. Remaining changes: - Transition libservlet2.5-java -> libservlet3.0-java. -- James Page <james.page@ubuntu.com> Tue, 21 May 2013 12:21:26 +0100

Modifications :
  1. Download patch debian/rules

    --- 1:1.1.dfsg-2/debian/rules 2012-01-10 17:38:17.000000000 +0000 +++ 1:1.1.dfsg-2ubuntu1/debian/rules 2013-05-16 15:42:01.000000000 +0000 @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelpe include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := batik-all xml-apis-ext batik-libs xml-apis avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-2.5 # ant-junit junit xmlunit +DEB_JARS := batik-all xml-apis-ext batik-libs xml-apis avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-3.0 # ant-junit junit xmlunit DEB_ANT_BUILD_TARGET := package javadocs #junit #docs DEB_ANT_CLEAN_TARGET := distclean DEB_ANT_ARGS := -verbose
  2. Download patch debian/control

    --- 1:1.1.dfsg-2/debian/control 2013-05-16 08:40:07.000000000 +0000 +++ 1:1.1.dfsg-2ubuntu1/debian/control 2013-05-17 08:44:21.000000000 +0000 @@ -1,7 +1,8 @@ Source: fop Section: text 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: Sylvestre Ledru <sylvestre@debian.org>, Torsten Werner <twerner@debian.org>, Mathieu Malaterre <malat@debian.org>, @@ -11,7 +12,7 @@ Build-Depends-Indep: ant-optional (>= 1. libavalon-framework-java (>= 4.1.2-2), libxalan2-java, libxerces2-java, default-jdk, libcommons-io-java, libxmlunit-java, libcommons-logging-java, junit, libxmlgraphics-commons-java (>= 1.5), - libservlet2.5-java, libxml-commons-external-java, maven-repo-helper, libqdox-java (>= 1.12), + libservlet3.0-java, libxml-commons-external-java, maven-repo-helper, libqdox-java (>= 1.12), unzip Standards-Version: 3.9.4 Homepage: http://xmlgraphics.apache.org/fop/ @@ -22,7 +23,7 @@ Package: fop Architecture: all Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libfop-java (= ${binary:Version}) Recommends: libsaxon-java -Suggests: fop-doc, libservlet2.5-java +Suggests: fop-doc, libservlet3.0-java Description: XML formatter driven by XSL Formatting Objects (XSL-FO.) FOP is a Java application that reads a formatting object tree and then turns it into a wide variety of output presentations (including AFP,

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

Source: freemind

freemind (0.9.0+dfsg2-1ubuntu1) utopic; urgency=low * debian/control: Oracle JRE now fulfills depedencies. (LP: #1334658) -- Filip Sohajek <filip.sohajek@gmail.com> Tue, 05 Aug 2014 10:08:11 +0200

Modifications :
  1. Download patch debian/control

    --- 0.9.0+dfsg2-1/debian/control 2014-03-17 04:31:33.000000000 +0000 +++ 0.9.0+dfsg2-1ubuntu1/debian/control 2014-08-06 09:26:41.000000000 +0000 @@ -1,7 +1,8 @@ Source: freemind Section: editors 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: Eric Lavarde <deb@zorglub.s.bawue.de> # FreeMind can be built with JiBX 1.0, 1.1 and 1.2, but the result does only # run with the version it was built with. JiBX 1.1 has been chosen for @@ -15,7 +16,7 @@ Vcs-Browser: http://anonscm.debian.org/v Package: freemind Architecture: all -Depends: default-jre | sun-java6-jre, libjgoodies-forms-java (>= 1.6), libjibx1.1-java | libjibx-java (>= 1.1), libjibx1.1-java | libjibx-java (<< 1.2), simplyhtml (>> 0.13), ${misc:Depends} +Depends: default-jre | java6-runtime | java7-runtime, libjgoodies-forms-java (>= 1.6), libjibx1.1-java | libjibx-java (>= 1.1), libjibx1.1-java | libjibx-java (<< 1.2), simplyhtml (>> 0.13), ${misc:Depends} Recommends: freemind-doc, xdg-utils, java-wrappers Suggests: freemind-plugins-help, freemind-plugins-svg, freemind-plugins-script, freemind-browser Breaks: freemind-plugins-time (<< 0.9.0+dfsg-2)

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: gluegen2

gluegen2 (2.1.5-1ubuntu1) trusty; urgency=medium * Build using the zero VM on AArch64. -- Matthias Klose <doko@ubuntu.com> Tue, 25 Mar 2014 10:17:10 +0100

Modifications :
  1. Download patch debian/rules

    --- 2.1.5-1/debian/rules 2014-02-11 14:03:07.000000000 +0000 +++ 2.1.5-1ubuntu1/debian/rules 2014-03-25 09:16:38.000000000 +0000 @@ -11,6 +11,10 @@ DEB_BUILDDIR := make DEB_ANT_BUILD_TARGET := all junit.run DEB_ANT_ARGS += -Dtarget.sourcelevel=1.6 -Dtarget.targetlevel=1.6 -Dtarget.rt.jar=1.6 +ifeq ($(DEB_HOST_ARCH),arm64) + JAVACMD += -zero +endif + ifeq ($(DEB_HOST_ARCH),armhf) DEB_ANT_ARGS += -DisAbiEabiGnuArmhf=true DEB_ANT_BUILD_TARGET := all.no_junit
  2. Download patch debian/control

    --- 2.1.5-1/debian/control 2014-02-11 14:03:07.000000000 +0000 +++ 2.1.5-1ubuntu1/debian/control 2014-03-25 09:17:04.000000000 +0000 @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Sylvestre Ledru <sylvestre@debian.org> Build-Depends: debhelper (>= 9), cdbs, quilt, default-jdk, - ant, junit4, ant-contrib-cpptasks, ant-optional, libantlr-java + ant, junit4, ant-contrib-cpptasks, ant-optional, libantlr-java, openjdk-7-jre-zero [arm64] Standards-Version: 3.9.5 Homepage: http://jogamp.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/gluegen2/

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

Source: gradle

gradle (1.5-1ubuntu1) utopic; urgency=medium * Merge from Debian unstable. Remaining changes: - Adjust Build-Conflicts to cope with the version of groovy currently in Ubuntu. -- Bhavani Shankar <bhavi@ubuntu.com> Sun, 15 Jun 2014 20:22:14 +0530

Modifications :
  1. Download patch debian/control

    --- 1.5-1/debian/control 2014-05-13 23:42:19.000000000 +0000 +++ 1.5-1ubuntu1/debian/control 2014-06-15 14:50:22.000000000 +0000 @@ -1,5 +1,6 @@ Source: gradle -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: Miguel Landaeta <miguel@miguel.cc>, Damien Raude-Morvan <drazzib@debian.org> Section: java @@ -71,7 +72,7 @@ Build-Depends: ant (>= 1.8), maven (>= 3.0.4-4), testng, unzip -Build-Conflicts: groovy (>= 2.0.0~) +Build-Conflicts: groovy (>= 2.0.0~beta2+isreally2.0.0~) Standards-Version: 3.9.5 Vcs-Git: git://anonscm.debian.org/pkg-java/gradle.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/gradle.git

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

Source: guava-libraries

guava-libraries (17.0-1ubuntu1) utopic; urgency=medium * Merge from Debian unstable. Remaining changes: - debian/rules: Touch README and AUTHORS so they have a current timestamp (Launchpad doesn't accept too old files in packages). -- Bhavani Shankar <bhavi@ubuntu.com> Sun, 13 Jul 2014 22:42:55 +0530

Modifications :
  1. Download patch debian/rules

    --- 17.0-1/debian/rules 2014-07-02 22:11:54.000000000 +0000 +++ 17.0-1ubuntu1/debian/rules 2014-07-03 04:18:51.000000000 +0000 @@ -7,3 +7,7 @@ JAVA_HOME := /usr/lib/jvm/default-java get-orig-source: -uscan --download-current-version --force-download --rename + + +clean:: + touch README AUTHORS
  2. Download patch debian/control

    --- 17.0-1/debian/control 2013-10-16 20:50:20.000000000 +0000 +++ 17.0-1ubuntu1/debian/control 2014-07-03 04:18:51.000000000 +0000 @@ -1,7 +1,8 @@ Source: guava-libraries 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: Miguel Landaeta <miguel@miguel.cc>, Emmanuel Bourg <ebourg@apache.org>, James Page <james.page@canonical.com>

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

Source: jakarta-taglibs-standard

jakarta-taglibs-standard (1.1.2-2ubuntu1) quantal; urgency=low * Merge from Debian unstable. Remaining changes: - Transition from servlet 2.5 -> 3.0. -- James Page <james.page@ubuntu.com> Mon, 16 Jul 2012 14:09:09 +0100

Modifications :
  1. Download patch debian/rules

    --- 1.1.2-2/debian/rules 2012-06-19 22:37:16.000000000 +0000 +++ 1.1.2-2ubuntu1/debian/rules 2012-07-16 13:09:02.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f export JAVA_HOME=/usr/lib/jvm/default-java -export CLASSPATH=/usr/share/java/el-api-2.1.jar +export CLASSPATH=/usr/share/java/el-api-2.2.jar DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+)-.*,\1,p') MAVEN_REPO := http://repo1.maven.org/maven2
  2. Download patch debian/control

    --- 1.1.2-2/debian/control 2012-06-19 22:38:14.000000000 +0000 +++ 1.1.2-2ubuntu1/debian/control 2012-07-16 13:08:29.000000000 +0000 @@ -1,7 +1,8 @@ Source: jakarta-taglibs-standard 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>, James Page <james.page@ubuntu.com> @@ -10,7 +11,7 @@ Build-Depends: debhelper (>= 7.0.50~), javahelper, maven-repo-helper (>= 1.5~) -Build-Depends-Indep: default-jdk, libservlet2.5-java, libxalan2-java +Build-Depends-Indep: default-jdk, libservlet3.0-java, libxalan2-java Standards-Version: 3.9.3 DM-Upload-Allowed: yes Vcs-Git: git://git.debian.org/git/pkg-java/jakarta-taglibs-standard.git
  3. Download patch debian/ant.properties

    --- 1.1.2-2/debian/ant.properties 2012-06-19 22:37:16.000000000 +0000 +++ 1.1.2-2ubuntu1/debian/ant.properties 2012-06-20 03:41:23.000000000 +0000 @@ -2,6 +2,6 @@ build.dir=build dist.dir=dist ant.build.javac.source=1.4 ant.build.javac.target=1.4 -servlet24.jar=/usr/share/java/servlet-api-2.5.jar -jsp20.jar=/usr/share/java/jsp-api-2.1.jar +servlet24.jar=/usr/share/java/servlet-api-3.0.jar +jsp20.jar=/usr/share/java/jsp-api-2.2.jar xalan.jar=/usr/share/java/xalan2.jar

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

Source: jarjar

jarjar (1.4+svn142-4ubuntu1) utopic; urgency=medium * Avoid dependency on libmaven2-core-java to avoid pulling Maven into Ubuntu main: - d/control: Drop BD on libmaven2-core-java - d/p/0001-fix-build.xml.patch: Re-instate patch which excludes Maven support from compilation. -- James Page <james.page@ubuntu.com> Mon, 19 May 2014 13:57:49 +0100

Modifications :
  1. Download patch .pc/0001-fix-build.xml.patch/build.xml
  2. Download patch debian/control

    --- 1.4+svn142-4/debian/control 2014-05-03 18:13:16.000000000 +0000 +++ 1.4+svn142-4ubuntu1/debian/control 2014-05-19 12:41:22.000000000 +0000 @@ -1,12 +1,13 @@ Source: jarjar 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: Niels Thykier <niels@thykier.net>, Damien Raude-Morvan <drazzib@debian.org>, Miguel Landaeta <nomadium@debian.org> Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk, libasm4-java (>= 4.1-2), - maven-repo-helper, libmaven2-core-java + maven-repo-helper Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jarjar Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jarjar
  3. Download patch .pc/applied-patches

    --- 1.4+svn142-4/.pc/applied-patches 2014-05-19 14:36:38.284640321 +0000 +++ 1.4+svn142-4ubuntu1/.pc/applied-patches 2014-05-19 14:36:38.452644740 +0000 @@ -1,3 +1,4 @@ +0001-fix-build.xml.patch 0002-embed-libs-from-debian.patch add_ClassReader_EXPAND_FRAMES.diff 0005-fix-javadocs.patch
  4. Download patch .pc/0002-embed-libs-from-debian.patch/build.xml

    --- 1.4+svn142-4/.pc/0002-embed-libs-from-debian.patch/build.xml 2012-11-08 16:32:51.000000000 +0000 +++ 1.4+svn142-4ubuntu1/.pc/0002-embed-libs-from-debian.patch/build.xml 2014-05-19 14:36:38.000000000 +0000 @@ -69,7 +69,8 @@ <javac includeantruntime="true" srcdir="src/@{module}" destdir="build/@{module}" source="${compile.source}" target="${compile.target}" bootclasspath="@{bootclasspath}" extdirs="${compile.extdirs}" - debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}"> + debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}" + excludes="com/tonicsystems/jarjar/JarJarMojo.java"> <classpath refid="@{refid}"/> <compilerarg value="-Xlint"/> </javac>
  5. Download patch debian/patches/series

    --- 1.4+svn142-4/debian/patches/series 2014-05-06 23:47:33.000000000 +0000 +++ 1.4+svn142-4ubuntu1/debian/patches/series 2014-05-19 12:52:21.000000000 +0000 @@ -1,3 +1,4 @@ +0001-fix-build.xml.patch 0002-embed-libs-from-debian.patch # please see #745815 before re-enabling this patch #szzepiq_jar_resources.diff
  6. Download patch build.xml

    --- 1.4+svn142-4/build.xml 2014-05-19 14:36:38.000000000 +0000 +++ 1.4+svn142-4ubuntu1/build.xml 2014-05-19 14:36:38.000000000 +0000 @@ -69,7 +69,8 @@ <javac includeantruntime="true" srcdir="src/@{module}" destdir="build/@{module}" source="${compile.source}" target="${compile.target}" bootclasspath="@{bootclasspath}" extdirs="${compile.extdirs}" - debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}"> + debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}" + excludes="com/tonicsystems/jarjar/JarJarMojo.java"> <classpath refid="@{refid}"/> <compilerarg value="-Xlint"/> </javac>
  7. Download patch debian/patches/0001-fix-build.xml.patch

    --- 1.4+svn142-4/debian/patches/0001-fix-build.xml.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.4+svn142-4ubuntu1/debian/patches/0001-fix-build.xml.patch 2014-05-19 12:52:14.000000000 +0000 @@ -0,0 +1,20 @@ +From: Arnaud Vandyck <avdyk@debian.org> +Date: Sun, 28 Feb 2010 12:42:05 +0100 +Subject: fix build.xml to drop requirement for maven2 core + +--- + build.xml | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +--- a/build.xml ++++ b/build.xml +@@ -69,7 +69,8 @@ + <javac includeantruntime="true" srcdir="src/@{module}" destdir="build/@{module}" + source="${compile.source}" + target="${compile.target}" bootclasspath="@{bootclasspath}" extdirs="${compile.extdirs}" +- debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}"> ++ debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}" ++ excludes="com/tonicsystems/jarjar/JarJarMojo.java"> + <classpath refid="@{refid}"/> + <compilerarg value="-Xlint"/> + </javac>
  8. Download patch .pc/0005-fix-javadocs.patch/build.xml

    --- 1.4+svn142-4/.pc/0005-fix-javadocs.patch/build.xml 2014-05-19 14:36:38.000000000 +0000 +++ 1.4+svn142-4ubuntu1/.pc/0005-fix-javadocs.patch/build.xml 2014-05-19 14:36:38.000000000 +0000 @@ -69,7 +69,8 @@ <javac includeantruntime="true" srcdir="src/@{module}" destdir="build/@{module}" source="${compile.source}" target="${compile.target}" bootclasspath="@{bootclasspath}" extdirs="${compile.extdirs}" - debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}"> + debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}" + excludes="com/tonicsystems/jarjar/JarJarMojo.java"> <classpath refid="@{refid}"/> <compilerarg value="-Xlint"/> </javac>

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

Source: java3d

java3d (1.5.2+dfsg-9ubuntu1) saucy; urgency=low * 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> Thu, 20 Jun 2013 15:37:14 +0100

Modifications :
  1. Download patch debian/control

    --- 1.5.2+dfsg-9/debian/control 2013-05-27 12:47:41.000000000 +0000 +++ 1.5.2+dfsg-9ubuntu1/debian/control 2013-06-20 14:36:53.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> Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant-optional, libvecmath-java,
  2. Download patch j3d-core/src/native/ogl/build-linux-generic.xml

    --- 1.5.2+dfsg-9/j3d-core/src/native/ogl/build-linux-generic.xml 2013-06-20 23:36:39.000000000 +0000 +++ 1.5.2+dfsg-9ubuntu1/j3d-core/src/native/ogl/build-linux-generic.xml 2013-06-20 23:36:40.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-9/debian/patches/02_fix_generic_ftbfs.patch 2010-03-03 08:31:24.000000000 +0000 +++ 1.5.2+dfsg-9ubuntu1/debian/patches/02_fix_generic_ftbfs.patch 2013-06-20 14:36:53.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: javatools

javatools (0.46ubuntu2) utopic; urgency=medium * The archdir for ppc64el is now "ppc64". -- Colin Watson <cjwatson@ubuntu.com> Mon, 28 Jul 2014 17:35:07 +0100 javatools (0.46ubuntu1) utopic; urgency=medium * Merge from Debian unstable. Remaining changes: - Pre-generate tutorial.html; remove the build dependency on markdown. * Regenerate tutorial.html. -- Logan Rosen <logan@ubuntu.com> Sun, 11 May 2014 21:45:06 -0400

Modifications :
  1. Download patch debian/rules

    --- 0.46/debian/rules 2013-04-28 17:13:22.000000000 +0000 +++ 0.46ubuntu2/debian/rules 2014-05-13 07:08:30.000000000 +0000 @@ -34,8 +34,10 @@ override_dh_auto_build: jh_lib.sh # jarwrapper pod-based manpages $(POD2MAN) -s 1 jarwrapper.pod tmp.jarwrapper/jarwrapper.1 $(POD2MAN) -s 1 jardetector.pod tmp.jarwrapper/jardetector.1 - markdown --html4tags tutorial.txt | \ - cat tutorial-header.html - tutorial-footer.html > tutorial.html + if which markdown >/dev/null 2>&1; then \ + markdown --html4tags tutorial.txt | \ + cat tutorial-header.html - tutorial-footer.html > tutorial.html; \ + fi runtests: jh_lib.sh prove -Ilib $(PAR_ARGS) t @@ -44,5 +46,5 @@ runtests: jh_lib.sh override_dh_auto_test: runtests override_dh_auto_clean: - rm -f jh_lib.sh tutorial.html + rm -f jh_lib.sh #tutorial.html rm -fr tmp tmp.jarwrapper
  2. Download patch debian/control

    --- 0.46/debian/control 2014-03-19 07:04:56.000000000 +0000 +++ 0.46ubuntu2/debian/control 2014-05-13 07:08:53.000000000 +0000 @@ -1,9 +1,10 @@ Source: javatools 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: Matthew Johnson <mjj29@debian.org>, Niels Thykier <niels@thykier.net> Build-Depends: debhelper (>= 7.0.50~) -Build-Depends-Indep: default-jdk, libarchive-zip-perl (>= 1.30-6~), markdown, perl, +Build-Depends-Indep: default-jdk, libarchive-zip-perl (>= 1.30-6~), perl, libtest-minimumversion-perl, libtest-perl-critic-perl, libtest-strict-perl,
  3. Download patch tutorial.html
  4. Download patch java-arch.sh

    --- 0.46/java-arch.sh 2013-12-24 16:19:20.000000000 +0000 +++ 0.46ubuntu2/java-arch.sh 2014-07-28 16:34:33.000000000 +0000 @@ -24,7 +24,7 @@ case $DPKG_ARCH in echo ppc ;; ppc64el) - echo ppc64le + echo ppc64 ;; hppa) echo parisc

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

Source: jmagick

jmagick (6.6.9~20130201-svn99-2ubuntu1) utopic; urgency=medium * Reintroduce Adam Conrad's patch from 6.6.9~20130201-svn99-1ubuntu1 to fix the implicit function declaration. -- Logan Rosen <logan@ubuntu.com> Thu, 22 May 2014 23:06:53 -0400

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-2/src/magick/jmagick.h 2009-11-10 13:24:51.000000000 +0000 +++ 6.6.9~20130201-svn99-2ubuntu1/src/magick/jmagick.h 2014-05-23 04:37:19.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-2/debian/control 2014-05-12 12:25:35.000000000 +0000 +++ 6.6.9~20130201-svn99-2ubuntu1/debian/control 2014-05-23 03:09:38.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-2/.pc/applied-patches 2014-05-23 04:37:18.882739239 +0000 +++ 6.6.9~20130201-svn99-2ubuntu1/.pc/applied-patches 2014-05-23 04:37:19.114745365 +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-2/debian/patches/02_jmagick_implicit_decl.patch 1970-01-01 00:00:00.000000000 +0000 +++ 6.6.9~20130201-svn99-2ubuntu1/debian/patches/02_jmagick_implicit_decl.patch 2014-05-23 03:09:20.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-2/debian/patches/series 2014-05-12 11:31:32.000000000 +0000 +++ 6.6.9~20130201-svn99-2ubuntu1/debian/patches/series 2014-05-23 03:09:33.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

jsch (0.1.51-1ubuntu1) utopic; urgency=low * Merge from Debian unstable. Remaining changes: - Drop dependency on libjzlib-java for continued main inclusion. -- James Page <james.page@ubuntu.com> Mon, 19 May 2014 17:06:04 +0100

Modifications :
  1. Download patch debian/control

    --- 0.1.51-1/debian/control 2014-03-21 22:03:01.000000000 +0000 +++ 0.1.51-1ubuntu1/debian/control 2014-05-19 16:05:50.000000000 +0000 @@ -1,12 +1,13 @@ Source: jsch 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>, Ludovic Claude <ludovic.claude@laposte.net>, Niels Thykier <niels@thykier.net> Build-Depends: debhelper (>= 9), cdbs, default-jdk -Build-Depends-Indep: maven-repo-helper, ant (>= 1.6.5), libjzlib-java +Build-Depends-Indep: maven-repo-helper, ant (>= 1.6.5) Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jsch Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jsch @@ -14,7 +15,7 @@ Homepage: http://www.jcraft.com/jsch/ Package: libjsch-java Architecture: all -Depends: ${misc:Depends}, libjzlib-java +Depends: ${misc:Depends} Description: Java implementation of the SSH2 protocol JSch allows your programs to connect to an SSH server. It supports port forwarding, X11 forwarding, file transfer and more.

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.2-3ubuntu1) quantal; urgency=low * d/patches/CLI-193.patch: Cherry picked patch from upstream VCS to ensure that wrap width is never exceeded when printing help messages which can result in exceptions (LP: #944546). * d/build.properties: Fix test source directory location and enable test suite execution during build process. -- James Page <james.page@ubuntu.com> Tue, 19 Jun 2012 15:00:56 +0100 libcommons-cli-java (1.2-3build1) quantal; urgency=low * No-change rebuild with openjdk-7 as default-jdk. -- James Page <james.page@ubuntu.com> Fri, 18 May 2012 11:41:30 +0100

Modifications :
  1. Download patch debian/build.properties

    --- 1.2-3/debian/build.properties 2010-05-08 19:13:30.000000000 +0000 +++ 1.2-3ubuntu1/debian/build.properties 2012-06-19 15:06:42.000000000 +0000 @@ -1,7 +1,7 @@ javadoc.dir=target/api build.sourceDirectory=src/java -build.testDirectory=src/test +build.testSourceDirectory=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 .pc/CLI-193.patch/src/java/org/apache/commons/cli/HelpFormatter.java
  3. Download patch debian/control

    --- 1.2-3/debian/control 2010-05-08 19:15:08.000000000 +0000 +++ 1.2-3ubuntu1/debian/control 2012-06-19 14:03:15.000000000 +0000 @@ -1,7 +1,8 @@ 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: Michael Koch <konqueror@gmx.de>, Ludovic Claude <ludovic.claude@laposte.net> Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8), default-jdk Build-Depends-Indep: maven-ant-helper, maven-repo-helper, ant, ant-optional, libcommons-lang-java (>= 2.0), junit
  4. Download patch .pc/CLI-193.patch/src/test/org/apache/commons/cli/HelpFormatterTest.java
  5. Download patch src/java/org/apache/commons/cli/HelpFormatter.java

    --- 1.2-3/src/java/org/apache/commons/cli/HelpFormatter.java 2009-03-16 07:30:06.000000000 +0000 +++ 1.2-3ubuntu1/src/java/org/apache/commons/cli/HelpFormatter.java 2012-06-19 17:02:28.000000000 +0000 @@ -853,8 +853,9 @@ public class HelpFormatter /** * Finds the next text wrap position after <code>startPos</code> for the * text in <code>text</code> with the column width <code>width</code>. - * The wrap point is the last postion before startPos+width having a - * whitespace character (space, \n, \r). + * The wrap point is the last position before startPos+width having a + * whitespace character (space, \n, \r). If there is no whitespace character + * before startPos+width, it will return startPos+width. * * @param text The text being searched for the wrap position * @param width width of the wrapped text @@ -865,8 +866,8 @@ public class HelpFormatter */ protected int findWrapPos(String text, int width, int startPos) { - int pos = -1; - + int pos; + // the line ends before the max wrap pos or a new line char found if (((pos = text.indexOf('\n', startPos)) != -1 && pos <= width) || ((pos = text.indexOf('\t', startPos)) != -1 && pos <= width)) @@ -896,17 +897,10 @@ public class HelpFormatter return pos; } - // must look for the first whitespace chearacter after startPos - // + width + // if we didn't find one, simply chop at startPos+width pos = startPos + width; - - while ((pos <= text.length()) && ((c = text.charAt(pos)) != ' ') - && (c != '\n') && (c != '\r')) - { - ++pos; - } - - return (pos == text.length()) ? (-1) : pos; + + return pos == text.length() ? -1 : pos; } /**
  6. Download patch .pc/applied-patches

    --- 1.2-3/.pc/applied-patches 1970-01-01 00:00:00.000000000 +0000 +++ 1.2-3ubuntu1/.pc/applied-patches 2012-06-19 17:02:28.448245217 +0000 @@ -0,0 +1 @@ +CLI-193.patch
  7. Download patch debian/patches/CLI-193.patch

    --- 1.2-3/debian/patches/CLI-193.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.2-3ubuntu1/debian/patches/CLI-193.patch 2012-06-19 14:00:39.000000000 +0000 @@ -0,0 +1,88 @@ +Description: Ensure the wrap width is never exceeded and cut the words longer + that the width if necessary. +Origin: https://github.com/apache/commons-cli/commit/777cb81088d47472df21a452edd5ba568d4b3fdf +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libcommons-cli-java/+bug/944546 + +Index: libcommons-cli-java/src/java/org/apache/commons/cli/HelpFormatter.java +=================================================================== +--- libcommons-cli-java.orig/src/java/org/apache/commons/cli/HelpFormatter.java 2012-06-19 14:18:14.240915000 +0100 ++++ libcommons-cli-java/src/java/org/apache/commons/cli/HelpFormatter.java 2012-06-19 14:58:33.611532761 +0100 +@@ -853,8 +853,9 @@ + /** + * Finds the next text wrap position after <code>startPos</code> for the + * text in <code>text</code> with the column width <code>width</code>. +- * The wrap point is the last postion before startPos+width having a +- * whitespace character (space, \n, \r). ++ * The wrap point is the last position before startPos+width having a ++ * whitespace character (space, \n, \r). If there is no whitespace character ++ * before startPos+width, it will return startPos+width. + * + * @param text The text being searched for the wrap position + * @param width width of the wrapped text +@@ -865,8 +866,8 @@ + */ + protected int findWrapPos(String text, int width, int startPos) + { +- int pos = -1; +- ++ int pos; ++ + // the line ends before the max wrap pos or a new line char found + if (((pos = text.indexOf('\n', startPos)) != -1 && pos <= width) + || ((pos = text.indexOf('\t', startPos)) != -1 && pos <= width)) +@@ -896,17 +897,10 @@ + return pos; + } + +- // must look for the first whitespace chearacter after startPos +- // + width ++ // if we didn't find one, simply chop at startPos+width + pos = startPos + width; +- +- while ((pos <= text.length()) && ((c = text.charAt(pos)) != ' ') +- && (c != '\n') && (c != '\r')) +- { +- ++pos; +- } +- +- return (pos == text.length()) ? (-1) : pos; ++ ++ return pos == text.length() ? -1 : pos; + } + + /** +Index: libcommons-cli-java/src/test/org/apache/commons/cli/HelpFormatterTest.java +=================================================================== +--- libcommons-cli-java.orig/src/test/org/apache/commons/cli/HelpFormatterTest.java 2012-06-19 14:18:14.000000000 +0100 ++++ libcommons-cli-java/src/test/org/apache/commons/cli/HelpFormatterTest.java 2012-06-19 14:58:33.611532761 +0100 +@@ -44,9 +44,28 @@ + assertEquals("wrap position", 7, hf.findWrapPos(text, 8, 0)); + //starting from 8 must give -1 - the wrap pos is after end + assertEquals("wrap position 2", -1, hf.findWrapPos(text, 8, 8)); +- //if there is no a good position before width to make a wrapping look for the next one ++ ++ // words longer than the width are cut + text = "aaaa aa"; +- assertEquals("wrap position 3", 4, hf.findWrapPos(text, 3, 0)); ++ assertEquals("wrap position 3", 3, hf.findWrapPos(text, 3, 0)); ++ ++ // last word length is equal to the width ++ text = "aaaaaa aaaaaa"; ++ assertEquals("wrap position 4", 6, hf.findWrapPos(text, 6, 0)); ++ assertEquals("wrap position 4", -1, hf.findWrapPos(text, 6, 7)); ++ } ++ ++ public void testRenderWrappedTextWordCut() ++ { ++ int width = 7; ++ int padding = 0; ++ String text = "Thisisatest."; ++ String expected = "Thisisa" + EOL + ++ "test."; ++ ++ StringBuffer sb = new StringBuffer(); ++ new HelpFormatter().renderWrappedText(sb, width, padding, text); ++ assertEquals("cut and wrap", expected, sb.toString()); + } + + public void testPrintWrapped() throws Exception
  8. Download patch src/test/org/apache/commons/cli/HelpFormatterTest.java

    --- 1.2-3/src/test/org/apache/commons/cli/HelpFormatterTest.java 2009-03-16 07:30:05.000000000 +0000 +++ 1.2-3ubuntu1/src/test/org/apache/commons/cli/HelpFormatterTest.java 2012-06-19 17:02:28.000000000 +0000 @@ -44,9 +44,28 @@ public class HelpFormatterTest extends T assertEquals("wrap position", 7, hf.findWrapPos(text, 8, 0)); //starting from 8 must give -1 - the wrap pos is after end assertEquals("wrap position 2", -1, hf.findWrapPos(text, 8, 8)); - //if there is no a good position before width to make a wrapping look for the next one + + // words longer than the width are cut text = "aaaa aa"; - assertEquals("wrap position 3", 4, hf.findWrapPos(text, 3, 0)); + assertEquals("wrap position 3", 3, hf.findWrapPos(text, 3, 0)); + + // last word length is equal to the width + text = "aaaaaa aaaaaa"; + assertEquals("wrap position 4", 6, hf.findWrapPos(text, 6, 0)); + assertEquals("wrap position 4", -1, hf.findWrapPos(text, 6, 7)); + } + + public void testRenderWrappedTextWordCut() + { + int width = 7; + int padding = 0; + String text = "Thisisatest."; + String expected = "Thisisa" + EOL + + "test."; + + StringBuffer sb = new StringBuffer(); + new HelpFormatter().renderWrappedText(sb, width, padding, text); + assertEquals("cut and wrap", expected, sb.toString()); } public void testPrintWrapped() throws Exception
  9. Download patch debian/patches/series

    --- 1.2-3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 1.2-3ubuntu1/debian/patches/series 2012-06-19 13:58:30.000000000 +0000 @@ -0,0 +1 @@ +CLI-193.patch

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

Source: libcommons-dbcp-java

libcommons-dbcp-java (1.4-3ubuntu1) quantal; urgency=low * Resync from Debian unstable. * Revert package to ant buildsystem: + 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, 09 Jul 2012 10:54:50 +0100

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

    --- 1.4-3/debian/README.source 2011-09-11 15:33:49.000000000 +0000 +++ 1.4-3ubuntu1/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-3/debian/rules 2011-09-11 15:33:49.000000000 +0000 +++ 1.4-3ubuntu1/debian/rules 2012-07-09 09:16:37.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 get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
  4. Download patch debian/patches/01_build.patch

    --- 1.4-3/debian/patches/01_build.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.4-3ubuntu1/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-3/debian/control 2012-06-19 18:17:17.000000000 +0000 +++ 1.4-3ubuntu1/debian/control 2012-07-09 09:17:19.000000000 +0000 @@ -1,11 +1,12 @@ 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> -Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) -Build-Depends-Indep: libclirr-maven-plugin-java, libmaven-javadoc-plugin-java, libcommons-pool-java, - default-jdk-doc, libcommons-pool-java-doc, libgeronimo-jta-1.1-spec-java +Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, quilt +Build-Depends-Indep: libcommons-pool-java, libcommons-collections3-java, junit, + libgeronimo-jta-1.1-spec-java, maven-repo-helper, default-jdk-doc, libcommons-pool-java-doc Standards-Version: 3.9.1 Homepage: http://commons.apache.org/dbcp/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-dbcp-java/ @@ -13,8 +14,8 @@ Vcs-Browser: http://svn.debian.org/wsvn/ Package: libcommons-dbcp-java Architecture: all -Depends: ${misc:Depends}, ${maven:Depends} -Recommends: ${maven:OptionalDepends} +Depends: ${misc:Depends}, libcommons-pool-java, libcommons-collections3-java +Recommends: libgeronimo-jta-1.1-spec-java Suggests: libcommons-dbcp-java-doc Description: Database Connection Pooling Services The DBCP package provides database connection pooling services. The @@ -33,8 +34,8 @@ Description: Database Connection Pooling Package: libcommons-dbcp-java-doc Architecture: all Section: doc -Depends: ${misc:Depends}, ${maven:DocDepends} -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/applied-patches

    --- 1.4-3/.pc/applied-patches 2012-07-09 10:36:11.795883252 +0000 +++ 1.4-3ubuntu1/.pc/applied-patches 2012-07-09 10:36:12.047889156 +0000 @@ -1,2 +1,2 @@ -0001-configure-source-and-target-version-1.5.patch +01_build.patch 02_java7_compat.patch
  8. Download patch debian/maven.rules

    --- 1.4-3/debian/maven.rules 2011-09-11 15:33:49.000000000 +0000 +++ 1.4-3ubuntu1/debian/maven.rules 2012-07-09 09:18:06.000000000 +0000 @@ -1,19 +1,3 @@ -# Maven rules - transform 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 -# - 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/ - -commons-dbcp commons-dbcp jar s/.*/debian/ * * +junit junit jar s/3\..*/3.x/ * +s/org.apache.geronimo.specs/glassfish/ s/geronimo-jta_1.1_spec/javaee/ jar s/.*/debian/ +commons-collections commons-collections jar s/3\..*/3.x/
  9. Download patch build.properties

    --- 1.4-3/build.properties 1970-01-01 00:00:00.000000000 +0000 +++ 1.4-3ubuntu1/build.properties 2012-07-09 10:36:12.000000000 +0000 @@ -0,0 +1 @@ +test.failonerror=false
  10. Download patch debian/patches/0001-configure-source-and-target-version-1.5.patch

    --- 1.4-3/debian/patches/0001-configure-source-and-target-version-1.5.patch 2011-09-11 15:33:49.000000000 +0000 +++ 1.4-3ubuntu1/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> ---
  11. Download patch debian/patches/series

    --- 1.4-3/debian/patches/series 2012-06-19 18:17:17.000000000 +0000 +++ 1.4-3ubuntu1/debian/patches/series 2012-07-09 09:15:05.000000000 +0000 @@ -1,2 +1,2 @@ -0001-configure-source-and-target-version-1.5.patch +01_build.patch 02_java7_compat.patch
  12. Download patch debian/libcommons-dbcp-java-doc.install

    --- 1.4-3/debian/libcommons-dbcp-java-doc.install 2011-09-11 15:33:49.000000000 +0000 +++ 1.4-3ubuntu1/debian/libcommons-dbcp-java-doc.install 2012-07-09 09:25:16.000000000 +0000 @@ -1,2 +1,2 @@ -target/apidocs/* usr/share/doc/libcommons-dbcp-java/api +dist/docs/* usr/share/doc/libcommons-dbcp-java
  13. Download patch pom.xml

    --- 1.4-3/pom.xml 2012-07-09 10:36:11.000000000 +0000 +++ 1.4-3ubuntu1/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>
  14. Download patch debian/maven.cleanIgnoreRules

    --- 1.4-3/debian/maven.cleanIgnoreRules 2011-09-11 15:33:49.000000000 +0000 +++ 1.4-3ubuntu1/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/ -
  15. Download patch debian/maven.properties

    --- 1.4-3/debian/maven.properties 2011-09-11 15:33:49.000000000 +0000 +++ 1.4-3ubuntu1/debian/maven.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -# Include here properties to pass to Maven during the build. -# For example: -# maven.test.skip=true - -maven.test.skip=true
  16. Download patch build.xml

    --- 1.4-3/build.xml 2010-02-07 16:59:20.000000000 +0000 +++ 1.4-3ubuntu1/build.xml 2012-07-09 10:36:12.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>
  17. Download patch debian/maven.ignoreRules

    --- 1.4-3/debian/maven.ignoreRules 2011-09-11 15:33:49.000000000 +0000 +++ 1.4-3ubuntu1/debian/maven.ignoreRules 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +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 * * * * -junit junit * * * * -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 cobertura-maven-plugin * * * * -org.codehaus.mojo findbugs-maven-plugin * * * * -tomcat naming-common * * * * -tomcat naming-java * * * *
  18. Download patch debian/maven.publishedRules

    --- 1.4-3/debian/maven.publishedRules 2011-09-11 15:33:49.000000000 +0000 +++ 1.4-3ubuntu1/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/ -
  19. Download patch debian/ant.properties

    --- 1.4-3/debian/ant.properties 1970-01-01 00:00:00.000000000 +0000 +++ 1.4-3ubuntu1/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-3ubuntu2) quantal; urgency=low * No-change rebuild with openjdk-7 as default-jdk. -- James Page <james.page@ubuntu.com> Fri, 18 May 2012 11:42:23 +0100 libcommons-lang-java (2.6-3ubuntu1) precise; urgency=low * Revert to 2.6-1 packaging, as 2.6-2 would pull in a plethora of Java/maven libraries into main. -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 14 Dec 2011 14:48:44 +0100

Modifications :
  1. Download patch debian/libcommons-lang-java-doc.doc-base

    --- 2.6-3/debian/libcommons-lang-java-doc.doc-base 1970-01-01 00:00:00.000000000 +0000 +++ 2.6-3ubuntu2/debian/libcommons-lang-java-doc.doc-base 2009-07-02 12:07:30.000000000 +0000 @@ -0,0 +1,11 @@ +Document: libcommons-lang-java +Title: Programmer API for Commons Lang +Author: Apache Commons Lang developers +Abstract: The Lang Component contains a set of Java classes that provide helper + methods for standard Java classes, especially those found in the + java.lang package in the Sun JDK. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libcommons-lang-java-doc/api/index.html +Files: /usr/share/doc/libcommons-lang-java-doc/api/*
  2. Download patch debian/commons-lang.bnd

    --- 2.6-3/debian/commons-lang.bnd 2011-11-13 23:40:09.000000000 +0000 +++ 2.6-3ubuntu2/debian/commons-lang.bnd 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -version=VERSION -Extension-Name: commons-lang -Package: org.apache.commons.lang -Export-Package: org.apache.commons.lang;version=${version},\ - org.apache.commons.lang.*;version=${version} -Import-Package: * -Bundle-Version: ${version} -Bundle-Description: Commons Lang, a package of Java utility classes for \ - the classes that are in java.lang's hierarchy, or are considered to \ - be so standard as to justify existence in java.lang. -Bundle-Name: Commons Lang -Bundle-DocURL: http://commons.apache.org/lang/ -Bundle-Vendor: The Apache Software Foundation -Bundle-SymbolicName: org.apache.commons.lang -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
  3. Download patch debian/rules

    --- 2.6-3/debian/rules 2011-11-13 23:40:09.000000000 +0000 +++ 2.6-3ubuntu2/debian/rules 2011-08-02 16:51:38.000000000 +0000 @@ -1,19 +1,28 @@ #!/usr/bin/make -f -DEB_SOURCE_PACKAGE := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ') -DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//') +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk -export JAVA_HOME=/usr/lib/jvm/default-java -export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; done) +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := junit +DEB_ANT_BUILD_TARGET := jar javadoc +LAST_MODIFIED := $(shell date +%s%N | cut -c -13) +DEB_ANT_ARGS := -Dlastmodified=$(LAST_MODIFIED) -%: - dh $@ --buildsystem=ant --with maven_repo_helper +common-post-build-indep:: + mv build/apidocs build/api -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 +install/libcommons-lang-java:: + mh_installpoms -p$(PACKAGE) + mh_installjar -p$(PACKAGE) -l pom.xml build/commons-lang-$(VERSION).jar + +clean:: + -rm gjdoc_rawcomment.cache + -rm -rf docs/api/* + -rm -rf debian/tmp + mh_clean get-orig-source: -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
  4. Download patch debian/compat

    --- 2.6-3/debian/compat 2011-11-13 23:40:09.000000000 +0000 +++ 2.6-3ubuntu2/debian/compat 2009-07-02 12:07:30.000000000 +0000 @@ -1 +1 @@ -7 +6
  5. Download patch debian/control

    --- 2.6-3/debian/control 2011-12-04 01:55:14.000000000 +0000 +++ 2.6-3ubuntu2/debian/control 2011-12-14 13:49:43.000000000 +0000 @@ -1,10 +1,11 @@ Source: libcommons-lang-java Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: Michael Koch <konqueror@gmx.de>, Kumar Appaiah <akumar@debian.org> -Build-Depends: debhelper (>= 7.0.50~), default-jdk, maven-repo-helper (>= 1.7), ant -Build-Depends-Indep: libcommons-parent-java (>= 12), junit (>= 3.8.1), bnd, default-jdk-doc +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>, Michael Koch <konqueror@gmx.de>, Kumar Appaiah <akumar@debian.org> +Build-Depends: debhelper (>= 6), cdbs, default-jdk +Build-Depends-Indep: maven-repo-helper, ant, junit (>= 3.8.1), default-jdk-doc Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-lang-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-lang-java @@ -12,9 +13,8 @@ Homepage: http://commons.apache.org/lang Package: libcommons-lang-java Architecture: all -Depends: ${misc:Depends}, libcommons-parent-java (>= 12) -Suggests: libcommons-lang-java-doc -Description: Commons Lang - an extension of the java.lang package +Depends: ${misc:Depends} +Description: Extension of the java.lang package The Lang Component contains a set of Java classes that provide helper methods for standard Java classes, especially those found in the java.lang package in the Sun JDK. The following classes are included: @@ -38,8 +38,8 @@ Package: libcommons-lang-java-doc Section: doc Architecture: all Depends: ${misc:Depends} -Suggests: libcommons-lang-java, default-jdk-doc -Description: Documentation for Commons Lang - an extension of the java.lang package +Suggests: default-jdk-doc +Description: Documentation for an extension of the java.lang package The Lang Component contains a set of Java classes that provide helper methods for standard Java classes, especially those found in the java.lang package in the Sun JDK. The following classes are included:
  6. Download patch debian/libcommons-lang-java-doc.install

    --- 2.6-3/debian/libcommons-lang-java-doc.install 2011-11-13 23:40:09.000000000 +0000 +++ 2.6-3ubuntu2/debian/libcommons-lang-java-doc.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -target/apidocs/* usr/share/doc/libcommons-lang-java/api
  7. Download patch .pc/applied-patches

    --- 2.6-3/.pc/applied-patches 1970-01-01 00:00:00.000000000 +0000 +++ 2.6-3ubuntu2/.pc/applied-patches 2012-05-22 03:58:16.973359400 +0000 @@ -0,0 +1 @@ +OSGi_Manifest.patch
  8. Download patch debian/libcommons-lang-java-doc.doc-base.api

    --- 2.6-3/debian/libcommons-lang-java-doc.doc-base.api 2011-11-13 23:40:09.000000000 +0000 +++ 2.6-3ubuntu2/debian/libcommons-lang-java-doc.doc-base.api 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -Document: libcommons-lang-java -Title: Programmer API for Commons Lang -Author: Apache Commons Lang developers -Abstract: The Lang Component contains a set of Java classes that provide helper - methods for standard Java classes, especially those found in the - java.lang package in the Sun JDK. -Section: Programming - -Format: HTML -Index: /usr/share/doc/libcommons-lang-java/api/index.html -Files: /usr/share/doc/libcommons-lang-java/api/*
  9. Download patch debian/maven.rules

    --- 2.6-3/debian/maven.rules 2011-11-13 23:40:09.000000000 +0000 +++ 2.6-3ubuntu2/debian/maven.rules 2009-07-02 12:07:30.000000000 +0000 @@ -1,20 +1,2 @@ -# Maven rules - transform 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 -# - 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/ +junit junit jar s/3\..*/3.x/ -junit junit jar s/3\..*/3.x/ * * -org.apache.commons commons-parent pom s/.*/debian/ * *
  10. Download patch debian/patches/OSGi_Manifest.patch

    --- 2.6-3/debian/patches/OSGi_Manifest.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.6-3ubuntu2/debian/patches/OSGi_Manifest.patch 2011-08-02 20:02:40.000000000 +0000 @@ -0,0 +1,94 @@ +Description: Add OSGi metadata +Author: Ludovic Claude <ludovic.claude@laposte.net> +Forwarded: no +Last-Update: 2011-08-02 + +--- libcommons-lang-java-2.6.orig/build.xml ++++ libcommons-lang-java-2.6/build.xml +@@ -30,7 +30,7 @@ + <property file="${basedir}/build.properties"/> + <property file="${basedir}/default.properties"/> + <!-- The Sun Javadoc for versions prior to 1.3 are off-line. --> +- <property name="jdk.javadoc" value="http://java.sun.com/j2se/1.3/docs/api/"/> ++ <property name="jdk.javadoc" value="file:///usr/share/doc/default-jdk-doc/api/"/> + + <!-- ========== Construct compile classpath =============================== --> + <path id="compile.classpath"> +@@ -52,8 +52,12 @@ + <filter token="version" value="${component.version}"/> + <filter token="compile.source" value="${compile.source}"/> + <filter token="compile.target" value="${compile.target}"/> ++ <filter token="lastmodified" value="${lastmodified}"/> + <mkdir dir="${build.home}"/> + <available property="jdk.1.5.present" classname="java.lang.StringBuilder"/> ++ <copy todir="${build.home}/conf" filtering="on"> ++ <fileset dir="${conf.home}" includes="*.MF"/> ++ </copy> + </target> + + <!-- ========== Compile Targets ========================================= --> +@@ -159,18 +163,7 @@ + <mkdir dir="${build.home}/classes/META-INF"/> + <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/> + <copy file="NOTICE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/> +- <jar jarfile="${build.home}/${final.name}.jar"> +- <manifest> +- <attribute name="Specification-Title" value="Commons Lang"/> +- <attribute name="Specification-Version" value="${component.version}"/> +- <attribute name="Specification-Vendor" value="The Apache Software Foundation"/> +- <attribute name="Implementation-Title" value="Commons Lang"/> +- <attribute name="Implementation-Version" value="${component.version}"/> +- <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/> +- <attribute name="Implementation-Vendor-Id" value="org.apache"/> +- <attribute name="X-Compile-Source-JDK" value="${compile.source}"/> +- <attribute name="X-Compile-Target-JDK" value="${compile.target}"/> +- </manifest> ++ <jar jarfile="${build.home}/${final.name}.jar" manifest="${build.home}/conf/MANIFEST.MF"> + <fileset dir="${build.home}/classes"> + <include name="**/*.class"/> + <include name="**/LICENSE.txt"/> +--- /dev/null ++++ libcommons-lang-java-2.6/src/conf/MANIFEST.MF +@@ -0,0 +1,42 @@ ++Manifest-Version: 1.0 ++Package: org.apache.commons.lang ++Extension-Name: commons-lang ++Specification-Version: @version@ ++Specification-Vendor: The Apache Software Foundation ++Specification-Title: Commons Lang ++Implementation-Version: @version@ ++Implementation-Vendor: The Apache Software Foundation ++Implementation-Title: Commons Lang ++Implementation-Vendor-Id: org.apache ++X-Compile-Source-JDK: @compile.source@ ++X-Compile-Target-JDK: @compile.target@ ++Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt ++Import-Package: org.apache.commons.lang;version="@version@", ++ org.apache.commons.lang.builder;version="@version@", ++ org.apache.commons.lang.enum;version="@version@", ++ org.apache.commons.lang.enums;version="@version@", ++ org.apache.commons.lang.exception;version="@version@", ++ org.apache.commons.lang.math;version="@version@", ++ org.apache.commons.lang.mutable;version="@version@", ++ org.apache.commons.lang.text;version="@version@", ++ org.apache.commons.lang.time;version="@version@" ++Bnd-LastModified: @lastmodified@ ++Export-Package: org.apache.commons.lang.math;version="@version@", ++ org.apache.commons.lang.enums;version="@version@", ++ org.apache.commons.lang.builder;version="@version@", ++ org.apache.commons.lang.exception;version="@version@", ++ org.apache.commons.lang.enum;version="@version@", ++ org.apache.commons.lang.mutable;version="@version@", ++ org.apache.commons.lang.text;version="@version@", ++ org.apache.commons.lang.time;version="@version@", ++ org.apache.commons.lang;version="@version@" ++Bundle-Version: @version@ ++Bundle-Description: Commons Lang, a package of Java utility classes fo ++ r the classes that are in java.lang's hierarchy, or are considered ++ to be so standard as to justify existence in java.lang. ++Bundle-Name: Commons Lang ++Bundle-DocURL: http://commons.apache.org/lang/ ++Bundle-ManifestVersion: 2 ++Bundle-Vendor: The Apache Software Foundation ++Bundle-SymbolicName: org.apache.commons.lang ++Tool: Bnd-0.0.238
  11. Download patch src/conf/MANIFEST.MF

    --- 2.6-3/src/conf/MANIFEST.MF 1970-01-01 00:00:00.000000000 +0000 +++ 2.6-3ubuntu2/src/conf/MANIFEST.MF 2012-05-22 03:58:16.000000000 +0000 @@ -0,0 +1,42 @@ +Manifest-Version: 1.0 +Package: org.apache.commons.lang +Extension-Name: commons-lang +Specification-Version: @version@ +Specification-Vendor: The Apache Software Foundation +Specification-Title: Commons Lang +Implementation-Version: @version@ +Implementation-Vendor: The Apache Software Foundation +Implementation-Title: Commons Lang +Implementation-Vendor-Id: org.apache +X-Compile-Source-JDK: @compile.source@ +X-Compile-Target-JDK: @compile.target@ +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Import-Package: org.apache.commons.lang;version="@version@", + org.apache.commons.lang.builder;version="@version@", + org.apache.commons.lang.enum;version="@version@", + org.apache.commons.lang.enums;version="@version@", + org.apache.commons.lang.exception;version="@version@", + org.apache.commons.lang.math;version="@version@", + org.apache.commons.lang.mutable;version="@version@", + org.apache.commons.lang.text;version="@version@", + org.apache.commons.lang.time;version="@version@" +Bnd-LastModified: @lastmodified@ +Export-Package: org.apache.commons.lang.math;version="@version@", + org.apache.commons.lang.enums;version="@version@", + org.apache.commons.lang.builder;version="@version@", + org.apache.commons.lang.exception;version="@version@", + org.apache.commons.lang.enum;version="@version@", + org.apache.commons.lang.mutable;version="@version@", + org.apache.commons.lang.text;version="@version@", + org.apache.commons.lang.time;version="@version@", + org.apache.commons.lang;version="@version@" +Bundle-Version: @version@ +Bundle-Description: Commons Lang, a package of Java utility classes fo + r the classes that are in java.lang's hierarchy, or are considered + to be so standard as to justify existence in java.lang. +Bundle-Name: Commons Lang +Bundle-DocURL: http://commons.apache.org/lang/ +Bundle-ManifestVersion: 2 +Bundle-Vendor: The Apache Software Foundation +Bundle-SymbolicName: org.apache.commons.lang +Tool: Bnd-0.0.238
  12. Download patch debian/libcommons-lang-java-doc.poms

    --- 2.6-3/debian/libcommons-lang-java-doc.poms 2011-11-13 23:40:09.000000000 +0000 +++ 2.6-3ubuntu2/debian/libcommons-lang-java-doc.poms 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -# List of POM files for the package -# Format of this file is: -# <path to pom file> [option]* -# where option can be: -# --ignore: ignore this POM or -# --no-parent: remove the <parent> tag from the POM -# --package=<package>: an alternative package to use when installing this POM -# and its artifact -# --has-package-version: to indicate that the original version of the POM is the same as the upstream part -# of the version for the package. -# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM -# during a clean operation with mh_cleanpom or mh_installpom -# --artifact=<path>: path to the build artifact associated with this POM, -# it will be installed when using the command mh_install -# --java-lib: install the jar into /usr/share/java to comply with Debian -# packaging guidelines -# --usj-name=<name>: name to use when installing the library in /usr/share/java -# --usj-version=<version>: version to use when installing the library in /usr/share/java -# --no-usj-versionless: don't install the versionless link in /usr/share/java -# --dest-jar=<path>: the destination for the real jar -# it will be installed with mh_install. -# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. -# --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 --ignore-pom --has-package-version --artifact=target/commons-lang-*-javadoc.jar --classifier=javadoc
  13. Download patch debian/libcommons-lang-java-doc.docs

    --- 2.6-3/debian/libcommons-lang-java-doc.docs 1970-01-01 00:00:00.000000000 +0000 +++ 2.6-3ubuntu2/debian/libcommons-lang-java-doc.docs 2011-08-02 16:51:38.000000000 +0000 @@ -0,0 +1 @@ +build/api
  14. Download patch debian/patches/series

    --- 2.6-3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 2.6-3ubuntu2/debian/patches/series 2009-07-02 12:07:30.000000000 +0000 @@ -0,0 +1 @@ +OSGi_Manifest.patch
  15. Download patch .pc/OSGi_Manifest.patch/build.xml
  16. Download patch build.xml

    --- 2.6-3/build.xml 2011-01-13 23:05:11.000000000 +0000 +++ 2.6-3ubuntu2/build.xml 2012-05-22 03:58:16.000000000 +0000 @@ -30,7 +30,7 @@ <property file="${basedir}/build.properties"/> <property file="${basedir}/default.properties"/> <!-- The Sun Javadoc for versions prior to 1.3 are off-line. --> - <property name="jdk.javadoc" value="http://java.sun.com/j2se/1.3/docs/api/"/> + <property name="jdk.javadoc" value="file:///usr/share/doc/default-jdk-doc/api/"/> <!-- ========== Construct compile classpath =============================== --> <path id="compile.classpath"> @@ -52,8 +52,12 @@ <filter token="version" value="${component.version}"/> <filter token="compile.source" value="${compile.source}"/> <filter token="compile.target" value="${compile.target}"/> + <filter token="lastmodified" value="${lastmodified}"/> <mkdir dir="${build.home}"/> <available property="jdk.1.5.present" classname="java.lang.StringBuilder"/> + <copy todir="${build.home}/conf" filtering="on"> + <fileset dir="${conf.home}" includes="*.MF"/> + </copy> </target> <!-- ========== Compile Targets ========================================= --> @@ -159,18 +163,7 @@ <mkdir dir="${build.home}/classes/META-INF"/> <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/> <copy file="NOTICE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/> - <jar jarfile="${build.home}/${final.name}.jar"> - <manifest> - <attribute name="Specification-Title" value="Commons Lang"/> - <attribute name="Specification-Version" value="${component.version}"/> - <attribute name="Specification-Vendor" value="The Apache Software Foundation"/> - <attribute name="Implementation-Title" value="Commons Lang"/> - <attribute name="Implementation-Version" value="${component.version}"/> - <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/> - <attribute name="Implementation-Vendor-Id" value="org.apache"/> - <attribute name="X-Compile-Source-JDK" value="${compile.source}"/> - <attribute name="X-Compile-Target-JDK" value="${compile.target}"/> - </manifest> + <jar jarfile="${build.home}/${final.name}.jar" manifest="${build.home}/conf/MANIFEST.MF"> <fileset dir="${build.home}/classes"> <include name="**/*.class"/> <include name="**/LICENSE.txt"/>
  17. Download patch debian/maven.ignoreRules

    --- 2.6-3/debian/maven.ignoreRules 2011-11-13 23:40:09.000000000 +0000 +++ 2.6-3ubuntu2/debian/maven.ignoreRules 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +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/ - -org.apache.maven.plugins maven-assembly-plugin * * * *
  18. Download patch debian/libcommons-lang-java.poms

    --- 2.6-3/debian/libcommons-lang-java.poms 2011-11-13 23:40:09.000000000 +0000 +++ 2.6-3ubuntu2/debian/libcommons-lang-java.poms 2009-07-02 12:07:30.000000000 +0000 @@ -1,27 +1 @@ -# List of POM files for the package -# Format of this file is: -# <path to pom file> [option]* -# where option can be: -# --ignore: ignore this POM or -# --no-parent: remove the <parent> tag from the POM -# --package=<package>: an alternative package to use when installing this POM -# and its artifact -# --has-package-version: to indicate that the original version of the POM is the same as the upstream part -# of the version for the package. -# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM -# during a clean operation with mh_cleanpom or mh_installpom -# --artifact=<path>: path to the build artifact associated with this POM, -# it will be installed when using the command mh_install -# --java-lib: install the jar into /usr/share/java to comply with Debian -# packaging guidelines -# --usj-name=<name>: name to use when installing the library in /usr/share/java -# --usj-version=<version>: version to use when installing the library in /usr/share/java -# --no-usj-versionless: don't install the versionless link in /usr/share/java -# --dest-jar=<path>: the destination for the real jar -# it will be installed with mh_install. -# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. -# --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 --no-parent
  19. Download patch debian/build-classpath

    --- 2.6-3/debian/build-classpath 2011-11-13 23:40:09.000000000 +0000 +++ 2.6-3ubuntu2/debian/build-classpath 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/usr/share/java/junit.jar
  20. Download patch debian/copyright

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

Source: libcommons-logging-java

libcommons-logging-java (1.2-1ubuntu1) utopic; urgency=medium * Switch back to using libservlet3.0-java to avoid switch from tomcat7->tomcat8 in Ubuntu main and associated Maven MIR. -- James Page <james.page@ubuntu.com> Mon, 11 Aug 2014 15:42:08 +0100

Modifications :
  1. Download patch debian/rules

    --- 1.2-1/debian/rules 2014-07-13 23:59:29.000000000 +0000 +++ 1.2-1ubuntu1/debian/rules 2014-08-11 14:35:39.000000000 +0000 @@ -7,7 +7,7 @@ PACKAGE := $(DEB_SOURCE_PAC VERSION := $(DEB_UPSTREAM_VERSION) JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILD_TARGET := dist -DEB_JARS := commons-logging log4j-1.2 excalibur-logkit avalon-framework servlet-api-3.1 junit ant-junit +DEB_JARS := commons-logging log4j-1.2 excalibur-logkit avalon-framework servlet-api-3.0 junit ant-junit DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt makebuilddir/lib$(PACKAGE)-java::
  2. Download patch debian/control

    --- 1.2-1/debian/control 2014-07-13 23:30:07.000000000 +0000 +++ 1.2-1ubuntu1/debian/control 2014-08-11 14:37:27.000000000 +0000 @@ -1,7 +1,8 @@ Source: libcommons-logging-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: Varun Hiremath <varun@debian.org>, Niels Thykier <niels@thykier.net>, Emmanuel Bourg <ebourg@apache.org>, Jakub Adam <jakub.adam@ktknet.cz> Build-Depends: ant-optional, cdbs, debhelper (>= 9), default-jdk @@ -10,7 +11,7 @@ Build-Depends-Indep: junit, libcommons-parent-java, libexcalibur-logkit-java, liblog4j1.2-java, - libservlet3.1-java, + libservlet3.0-java, maven-repo-helper Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libcommons-logging-java
  3. Download patch debian/maven.rules

    --- 1.2-1/debian/maven.rules 2014-07-13 23:31:55.000000000 +0000 +++ 1.2-1ubuntu1/debian/maven.rules 2014-08-11 14:36:05.000000000 +0000 @@ -1,6 +1,6 @@ junit junit jar s/3\..*/3.x/ log4j log4j jar s/1\.2\..*/1.2.x/ -# force using servlet 3.1 -javax.servlet * * s/.*/3.1/ +# force using servlet 3.0 +javax.servlet * * s/.*/3.0/ s/avalon-framework/org.apache.avalon/ avalon-framework jar s/.*/debian/
  4. Download patch debian/ant.properties

    --- 1.2-1/debian/ant.properties 2014-07-13 23:47:25.000000000 +0000 +++ 1.2-1ubuntu1/debian/ant.properties 2014-08-11 14:36:12.000000000 +0000 @@ -3,5 +3,5 @@ log4j12.jar=/usr/share/java/log4j-1.2.ja logkit.jar=/usr/share/java/excalibur-logkit.jar avalon-framework.jar=/usr/share/java/avalon-framework.jar junit.jar=/usr/share/java/junit.jar -servletapi.jar=/usr/share/java/servlet-api-3.1.jar +servletapi.jar=/usr/share/java/servlet-api-3.0.jar test.failonerror=false

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

Source: libgnumail-java

libgnumail-java (1.1.2-9ubuntu3) trusty; urgency=medium * d/p/add-osgi-metadata.patch: Drop requirement for javax.activiation, fixing FTBFS in eclipse-* packages. -- James Page <james.page@ubuntu.com> Thu, 27 Mar 2014 09:34:49 +0000 libgnumail-java (1.1.2-9ubuntu2) trusty; urgency=medium * Merge with Debian; remaining changes: - Don't use bnd to generate OSGi metadata. -- Matthias Klose <doko@ubuntu.com> Mon, 06 Jan 2014 13:57:10 +0100

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

    --- 1.1.2-9/debian/patches/add-osgi-metadata.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.2-9ubuntu3/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-9/debian/rules 2013-05-27 12:54:33.000000000 +0000 +++ 1.1.2-9ubuntu3/debian/rules 2014-01-06 13:01:15.000000000 +0000 @@ -13,9 +13,6 @@ 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 ./gnumail-$(VERSION).jar ./gnumail-$(VERSION).jar - install/$(PACKAGE):: mh_installpom -p$(PACKAGE) debian/gnumail.pom mh_installjar -p$(PACKAGE) --java-lib debian/gnumail.pom ./gnumail-$(VERSION).jar
  4. Download patch debian/gnumail.bnd

    --- 1.1.2-9/debian/gnumail.bnd 2013-05-27 12:54:33.000000000 +0000 +++ 1.1.2-9ubuntu3/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-9/debian/control 2013-05-27 12:54:33.000000000 +0000 +++ 1.1.2-9ubuntu3/debian/control 2014-03-27 09:17:20.000000000 +0000 @@ -1,10 +1,11 @@ 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> Build-Depends: debhelper (>= 8), cdbs (>= 0.4.5.3), ant, maven-repo-helper -Build-Depends-Indep: default-jdk, libgnuinet-java, bnd, default-jdk-doc +Build-Depends-Indep: default-jdk, libgnuinet-java, default-jdk-doc Standards-Version: 3.9.4 Homepage: http://savannah.gnu.org/projects/classpathx Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libgnumail-java/
  6. Download patch .pc/applied-patches

    --- 1.1.2-9/.pc/applied-patches 2014-03-27 12:06:38.083404849 +0000 +++ 1.1.2-9ubuntu3/.pc/applied-patches 2014-03-27 12:06:38.307410710 +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-9/debian/patches/series 2013-05-27 12:54:33.000000000 +0000 +++ 1.1.2-9ubuntu3/debian/patches/series 2014-01-06 12:59:57.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-9/build.xml 2014-03-27 12:06:38.000000000 +0000 +++ 1.1.2-9ubuntu3/build.xml 2014-03-27 12:06:38.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: libhamcrest-java

libhamcrest-java (1.3-5ubuntu1) utopic; urgency=medium * Drop integration component, removing dependency on easymock and associated dependency chain which pulls Maven into main: - d/rules: Don't install the integration jar. - d/p/disable-integration.patch: Drop integration classes from bigjar target and general compilation. - d/control: Drop BD on libeasymock-java. - d/rules: Rename EasyMock dependent files during package build. -- James Page <james.page@ubuntu.com> Mon, 19 May 2014 11:27:15 +0100

Modifications :
  1. Download patch debian/rules

    --- 1.3-5/debian/rules 2014-03-25 23:17:21.000000000 +0000 +++ 1.3-5ubuntu1/debian/rules 2014-05-19 10:06:06.000000000 +0000 @@ -6,9 +6,9 @@ include /usr/share/cdbs/1/rules/debhelpe JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILDFILE := build.xml DEB_ANT_BUILD_TARGET := bigjar unit-test javadoc -DEB_JARS := easymock jmock qdox ant-junit +DEB_JARS := jmock qdox ant-junit ANT_OPTS := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -Dversion=$(DEB_UPSTREAM_VERSION) -POMS := core generator integration library all +POMS := core generator library all DEST_DIR = $(DEB_DESTDIR)/usr/share/java @@ -40,6 +40,16 @@ clean:: rm -fr debian/.mh/ rm -f *.jar mkdir -p lib/integration + for f in `cat debian/integration-unit-tests`; do \ + i_f=$${f}.ignore; \ + [ -f $$i_f ] && mv $$i_f $$f || : ;\ + done + +pre-build:: + for f in `cat debian/integration-unit-tests`; do \ + i_f=$${f}.ignore; \ + [ -f $$f ] && mv $$f $$i_f || : ;\ + done get-orig-source: -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --debug --rename
  2. Download patch debian/control

    --- 1.3-5/debian/control 2013-12-23 23:22:39.000000000 +0000 +++ 1.3-5ubuntu1/debian/control 2014-05-14 15:30:43.000000000 +0000 @@ -1,13 +1,14 @@ Source: libhamcrest-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: Varun Hiremath <varun@debian.org>, Damien Raude-Morvan <drazzib@debian.org>, Brian Thomason <brian.thomason@gmail.com>, Emmanuel Bourg <ebourg@apache.org> Build-Depends: cdbs, debhelper (>= 9), ant, ant-optional, default-jdk, maven-repo-helper -Build-Depends-Indep: libqdox-java, libeasymock-java, libjmock-java, libjarjar-java, +Build-Depends-Indep: libqdox-java, libjmock-java, libjarjar-java, default-jdk-doc, junit-doc, junit4-doc, junit, junit4 Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libhamcrest-java
  3. Download patch debian/integration-unit-tests

    --- 1.3-5/debian/integration-unit-tests 1970-01-01 00:00:00.000000000 +0000 +++ 1.3-5ubuntu1/debian/integration-unit-tests 2014-05-19 10:03:49.000000000 +0000 @@ -0,0 +1,3 @@ +hamcrest-unit-test/src/main/java/org/hamcrest/JavaLangMatcherAssertTest.java +hamcrest-unit-test/src/main/java/org/hamcrest/integration/EasyMock2AdapterTest.java +hamcrest-unit-test/src/main/java/org/hamcrest/integration/JMock1AdapterTest.java
  4. Download patch .pc/applied-patches

    --- 1.3-5/.pc/applied-patches 2014-05-19 12:06:45.975721378 +0000 +++ 1.3-5ubuntu1/.pc/applied-patches 2014-05-19 12:06:46.179726762 +0000 @@ -1,2 +1,3 @@ 001-build.patch 002-fix-random-compilation-failure.patch +disable-integration.patch
  5. Download patch debian/patches/disable-integration.patch

    --- 1.3-5/debian/patches/disable-integration.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.3-5ubuntu1/debian/patches/disable-integration.patch 2014-05-19 10:21:53.000000000 +0000 @@ -0,0 +1,73 @@ +--- a/build.xml ++++ b/build.xml +@@ -84,18 +84,16 @@ + build/hamcrest-library-${version}.jar"/> + </target> + +- <target name="unit-test" depends="core, library, integration, generator" description="Build and run unit tests."> ++ <target name="unit-test" depends="core, library, generator" description="Build and run unit tests."> + <java-to-jar srcdir="hamcrest-unit-test/src/main/java" modulename="hamcrest-unit-test" + classpath="build/hamcrest-core-${version}.jar; + build/hamcrest-library-${version}.jar; +- build/hamcrest-integration-${version}.jar; + build/hamcrest-generator-${version}.jar"/> + <junit printsummary="no" fork="no" haltonfailure="${haltonfailure}"> + <formatter type="brief" usefile="no"/> + <classpath> + <pathelement path="build/hamcrest-core-${version}.jar"/> + <pathelement path="build/hamcrest-library-${version}.jar"/> +- <pathelement path="build/hamcrest-integration-${version}.jar"/> + <pathelement path="build/hamcrest-generator-${version}.jar"/> + <pathelement path="build/hamcrest-unit-test-${version}.jar"/> + <fileset dir="/usr/share/java"> +@@ -109,6 +107,7 @@ + <fileset dir="hamcrest-unit-test/src/main/java"> + <include name="**/*Test*"/> + <exclude name="**/Abstract*"/> ++ <exclude name="**/integration/*"/> + </fileset> + </batchtest> + </junit> +@@ -122,7 +121,7 @@ + build/hamcrest-integration-${version}.jar"/> + </target> + +- <target name="bigjar" depends="core, library, integration, generator" ++ <target name="bigjar" depends="core, library, generator" + description="Build a single Jar (hamcrest-all.jar) that contains core, library, generator and integration."> + <mkdir dir="build/temp/hamcrest-all-${version}.jar.manifest"/> + <manifest file="build/temp/hamcrest-all-${version}.jar.manifest/MANIFEST.MF"> +@@ -136,13 +135,11 @@ + <zipfileset src="build/hamcrest-core-${version}.jar"/> + <zipfileset src="build/hamcrest-library-${version}.jar"/> + <zipfileset src="build/hamcrest-generator-${version}.jar"/> +- <zipfileset src="build/hamcrest-integration-${version}.jar"/> + </jar> + <jar jarfile="build/hamcrest-all-${version}-sources.jar" duplicate="preserve" manifest="build/temp/hamcrest-all-${version}.jar.manifest/MANIFEST.MF"> + <zipfileset src="build/hamcrest-core-${version}-sources.jar"/> + <zipfileset src="build/hamcrest-library-${version}-sources.jar"/> + <zipfileset src="build/hamcrest-generator-${version}-sources.jar"/> +- <zipfileset src="build/hamcrest-integration-${version}-sources.jar"/> + </jar> + </target> + +@@ -150,7 +147,6 @@ + <java-to-javadoc-jar modulename="hamcrest-generator-nodeps"/> + <java-to-javadoc-jar modulename="hamcrest-core"/> + <java-to-javadoc-jar modulename="hamcrest-library"/> +- <java-to-javadoc-jar modulename="hamcrest-integration"/> + <copy file="build/hamcrest-generator-nodeps-${version}-javadoc.jar" tofile="build/hamcrest-generator-${version}-javadoc.jar"/> + + <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes" +@@ -163,11 +159,9 @@ + </classpath> + <packageset dir="build/temp/hamcrest-core-${version}-sources.jar.contents"/> + <packageset dir="build/temp/hamcrest-library-${version}-sources.jar.contents" excludes="org/hamcrest/internal"/> +- <packageset dir="build/temp/hamcrest-integration-${version}-sources.jar.contents"/> + + <group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/> + <group title="Matcher Library" packages="org.hamcrest.*"/> +- <group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/> + + <link offline="false" href="/usr/share/doc/junit-doc/javadoc/"/> + <link offline="false" href="/usr/share/doc/junit4-doc/javadoc_40/"/>
  6. Download patch .pc/disable-integration.patch/build.xml
  7. Download patch debian/patches/series

    --- 1.3-5/debian/patches/series 2014-03-25 23:08:27.000000000 +0000 +++ 1.3-5ubuntu1/debian/patches/series 2014-05-19 09:46:16.000000000 +0000 @@ -1,2 +1,3 @@ 001-build.patch 002-fix-random-compilation-failure.patch +disable-integration.patch
  8. Download patch build.xml

    --- 1.3-5/build.xml 2014-05-19 12:06:45.000000000 +0000 +++ 1.3-5ubuntu1/build.xml 2014-05-19 12:06:46.000000000 +0000 @@ -84,18 +84,16 @@ build/hamcrest-library-${version}.jar"/> </target> - <target name="unit-test" depends="core, library, integration, generator" description="Build and run unit tests."> + <target name="unit-test" depends="core, library, generator" description="Build and run unit tests."> <java-to-jar srcdir="hamcrest-unit-test/src/main/java" modulename="hamcrest-unit-test" classpath="build/hamcrest-core-${version}.jar; build/hamcrest-library-${version}.jar; - build/hamcrest-integration-${version}.jar; build/hamcrest-generator-${version}.jar"/> <junit printsummary="no" fork="no" haltonfailure="${haltonfailure}"> <formatter type="brief" usefile="no"/> <classpath> <pathelement path="build/hamcrest-core-${version}.jar"/> <pathelement path="build/hamcrest-library-${version}.jar"/> - <pathelement path="build/hamcrest-integration-${version}.jar"/> <pathelement path="build/hamcrest-generator-${version}.jar"/> <pathelement path="build/hamcrest-unit-test-${version}.jar"/> <fileset dir="/usr/share/java"> @@ -109,6 +107,7 @@ <fileset dir="hamcrest-unit-test/src/main/java"> <include name="**/*Test*"/> <exclude name="**/Abstract*"/> + <exclude name="**/integration/*"/> </fileset> </batchtest> </junit> @@ -122,7 +121,7 @@ build/hamcrest-integration-${version}.jar"/> </target> - <target name="bigjar" depends="core, library, integration, generator" + <target name="bigjar" depends="core, library, generator" description="Build a single Jar (hamcrest-all.jar) that contains core, library, generator and integration."> <mkdir dir="build/temp/hamcrest-all-${version}.jar.manifest"/> <manifest file="build/temp/hamcrest-all-${version}.jar.manifest/MANIFEST.MF"> @@ -136,13 +135,11 @@ <zipfileset src="build/hamcrest-core-${version}.jar"/> <zipfileset src="build/hamcrest-library-${version}.jar"/> <zipfileset src="build/hamcrest-generator-${version}.jar"/> - <zipfileset src="build/hamcrest-integration-${version}.jar"/> </jar> <jar jarfile="build/hamcrest-all-${version}-sources.jar" duplicate="preserve" manifest="build/temp/hamcrest-all-${version}.jar.manifest/MANIFEST.MF"> <zipfileset src="build/hamcrest-core-${version}-sources.jar"/> <zipfileset src="build/hamcrest-library-${version}-sources.jar"/> <zipfileset src="build/hamcrest-generator-${version}-sources.jar"/> - <zipfileset src="build/hamcrest-integration-${version}-sources.jar"/> </jar> </target> @@ -150,7 +147,6 @@ <java-to-javadoc-jar modulename="hamcrest-generator-nodeps"/> <java-to-javadoc-jar modulename="hamcrest-core"/> <java-to-javadoc-jar modulename="hamcrest-library"/> - <java-to-javadoc-jar modulename="hamcrest-integration"/> <copy file="build/hamcrest-generator-nodeps-${version}-javadoc.jar" tofile="build/hamcrest-generator-${version}-javadoc.jar"/> <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes" @@ -163,11 +159,9 @@ </classpath> <packageset dir="build/temp/hamcrest-core-${version}-sources.jar.contents"/> <packageset dir="build/temp/hamcrest-library-${version}-sources.jar.contents" excludes="org/hamcrest/internal"/> - <packageset dir="build/temp/hamcrest-integration-${version}-sources.jar.contents"/> <group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/> <group title="Matcher Library" packages="org.hamcrest.*"/> - <group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/> <link offline="false" href="/usr/share/doc/junit-doc/javadoc/"/> <link offline="false" href="/usr/share/doc/junit4-doc/javadoc_40/"/>

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: libjogl2-java

libjogl2-java (2.1.5-1ubuntu3) trusty; urgency=medium * Build again with the serve VM on AArch64 (builds locally). -- Matthias Klose <doko@ubuntu.com> Tue, 01 Apr 2014 18:25:04 +0200 libjogl2-java (2.1.5-1ubuntu2) trusty; urgency=medium * Build using the client VM on AArch64. -- Matthias Klose <doko@ubuntu.com> Fri, 28 Mar 2014 02:46:57 +0100 libjogl2-java (2.1.5-1ubuntu1) trusty; urgency=medium * Build using the zero VM on AArch64. -- Matthias Klose <doko@ubuntu.com> Tue, 25 Mar 2014 11:19:37 +0100

Modifications :
  1. Download patch debian/rules

    --- 2.1.5-1/debian/rules 2014-02-11 14:03:09.000000000 +0000 +++ 2.1.5-1ubuntu3/debian/rules 2014-04-01 16:25:01.000000000 +0000 @@ -17,6 +17,10 @@ ifeq ($(DEB_HOST_ARCH),armhf) DEB_ANT_ARGS += -DisAbiEabiGnuArmhf=true endif +#ifeq ($(DEB_HOST_ARCH),arm64) +# JAVACMD += -client +#endif + build-indep: # Disable the build of the help on slow archs. It takes forever (a few hours) ifneq (,$(findstring $(DEB_HOST_ARCH),$(ENABLE_BUILD_HELP_ARCHS)))

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

Source: libmx4j-java

libmx4j-java (3.0.2-13ubuntu1) saucy; urgency=low * Merge from Debian unstable. Remaining changes: - d/control: Drop optional jython dependencies to reduce main requirements in Ubuntu. -- James Page <james.page@ubuntu.com> Thu, 11 Jul 2013 11:26:43 +0100

Modifications :
  1. Download patch debian/control

    --- 3.0.2-13/debian/control 2013-05-17 10:52:06.000000000 +0000 +++ 3.0.2-13ubuntu1/debian/control 2013-07-11 10:25:34.000000000 +0000 @@ -1,12 +1,13 @@ Source: libmx4j-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>, Niels Thykier <niels@thykier.net> Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant, liblog4j1.2-java, libcommons-logging-java, libbcel-java (>=5.0), - libgnumail-java, libservlet3.0-java, jython, + libgnumail-java, libservlet3.0-java, libaxis-java, javahelper, libhessian-java Standards-Version: 3.9.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libmx4j-java @@ -18,7 +19,7 @@ Architecture: all Depends: libbcel-java (>=5.0), liblog4j1.2-java, ${misc:Depends} -Suggests: libservlet3.0-java, libgnumail-java, jython, libjetty-java, libhessian-java +Suggests: libservlet3.0-java, libgnumail-java, libjetty-java, libhessian-java Description: Open Source implementation of the JMX(TM) technology JMX defines the architecture, the patterns , the API and services to build manageable Java applications. It provide flexible framework to

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

Source: libnative-platform-java

libnative-platform-java (0.3~rc2-2ubuntu1) trusty; urgency=low * debian/patches/make_buildsystem.diff: move ld libs to end of linking command (LP: #1238322) -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org> Sun, 12 Jan 2014 20:33:29 +0200

Modifications :
  1. Download patch Makefile

    --- 0.3~rc2-2/Makefile 2014-01-13 01:08:31.000000000 +0000 +++ 0.3~rc2-2ubuntu1/Makefile 2014-01-13 01:08:32.000000000 +0000 @@ -28,7 +28,7 @@ $(ODIR)/libnative-platform.so: $(OBJ_STD $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -o $@ $^ $(ODIR)/libnative-platform-curses.so: $(OBJ_CURSES) - $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -lcurses -shared -o $@ $^ + $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -o $@ $^ -lcurses $(JCLASSESDIR)/%.class: javafiles-list mkdir -p $(JCLASSESDIR)
  2. Download patch debian/patches/make_buildsystem.diff

    --- 0.3~rc2-2/debian/patches/make_buildsystem.diff 2013-05-05 23:26:09.000000000 +0000 +++ 0.3~rc2-2ubuntu1/debian/patches/make_buildsystem.diff 2014-01-12 09:08:26.000000000 +0000 @@ -38,7 +38,7 @@ Forwarded: no + $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -o $@ $^ + +$(ODIR)/libnative-platform-curses.so: $(OBJ_CURSES) -+ $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -lcurses -shared -o $@ $^ ++ $(CXX) $(CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -o $@ $^ -lcurses + +$(JCLASSESDIR)/%.class: javafiles-list + mkdir -p $(JCLASSESDIR)

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

Source: lwjgl

lwjgl (2.7.1+dfsg-3ubuntu1) saucy; urgency=low * Drop Build-Conflict on binutils-gold, now that binutils provides it. -- Adam Conrad <adconrad@ubuntu.com> Wed, 31 Jul 2013 20:31:45 +0100

Modifications :
  1. Download patch debian/control

    --- 2.7.1+dfsg-3/debian/control 2012-05-07 18:45:05.000000000 +0000 +++ 2.7.1+dfsg-3ubuntu1/debian/control 2013-07-31 19:32:17.000000000 +0000 @@ -1,7 +1,8 @@ Source: lwjgl 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: Gabriele Giacone <1o5g4r8o@gmail.com>, Michael Gilbert <mgilbert@debian.org>, @@ -18,8 +19,6 @@ Build-Depends: libxt-dev, Build-Depends-Indep: default-jdk-doc, -Build-Conflicts: - binutils-gold, Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/git/pkg-java/lwjgl.git Vcs-Browser: http://git.debian.org/?p=pkg-java/lwjgl.git

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

Source: netbeans

netbeans (7.0.1+dfsg1-5ubuntu2) quantal; urgency=low * Keep the build dependency on default-jdk to find jni.h. -- Matthias Klose <doko@ubuntu.com> Thu, 11 Oct 2012 11:48:20 +0200 netbeans (7.0.1+dfsg1-5ubuntu1) quantal; urgency=low * Explicitly build using OpenJDK 6, to fix the build failure. 7.0.1 is not ready to build using Java 7. -- Matthias Klose <doko@ubuntu.com> Wed, 19 Sep 2012 18:23:18 +0200

Modifications :
  1. Download patch debian/rules

    --- 7.0.1+dfsg1-5/debian/rules 2012-02-19 22:17:16.000000000 +0000 +++ 7.0.1+dfsg1-5ubuntu2/debian/rules 2012-09-19 16:34:34.000000000 +0000 @@ -1,6 +1,8 @@ #!/usr/bin/make -f -export JAVA_HOME=/usr/lib/jvm/default-java +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) + +export JAVA_HOME=/usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH) #package names pkg-platform := platform13
  2. Download patch debian/control

    --- 7.0.1+dfsg1-5/debian/control 2012-02-19 22:17:16.000000000 +0000 +++ 7.0.1+dfsg1-5ubuntu2/debian/control 2012-10-11 09:48:15.000000000 +0000 @@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg Uploaders: Yulia Novozhilova <Yulia.Novozhilova@sun.com>, Andres Mejia <mcitadel@gmail.com>, Andrew Ross <ubuntu@rossfamily.co.uk> Build-Depends: debhelper (>= 7.0.50~), javahelper, ant (>= 1.7.0), - ant-optional (>= 1.7.0), default-jdk, mingw32, maven-repo-helper, + ant-optional (>= 1.7.0), default-jdk, openjdk-6-jdk, mingw32, maven-repo-helper, w3c-dtd-xhtml, javacc, libjemmy2-java, javahelp2, libbindex-java, libswing-layout-java (>= 1.0.3), libjna-java (>= 3.2.7-2~),

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

Source: service-wrapper-java

service-wrapper-java (3.5.22-2ubuntu1) trusty; urgency=low * debian/patches/0001-fix-as-needed-ppc to fix FTBFS on ppc: "[exec] wrapper.c:(.text+0xd7e8): undefined reference to `ceil'" -- Andreas Moog <amoog@ubuntu.com> Wed, 27 Nov 2013 23:18:47 +0100

Modifications :
  1. Download patch src/c/Makefile-linux-ppc-64.make

    --- 3.5.22-2/src/c/Makefile-linux-ppc-64.make 2013-10-08 06:19:51.000000000 +0000 +++ 3.5.22-2ubuntu1/src/c/Makefile-linux-ppc-64.make 2013-11-27 23:37:17.000000000 +0000 @@ -33,7 +33,7 @@ init: if test ! -d .deps; then mkdir .deps; fi wrapper: $(wrapper_SOURCE) - $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper + $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper libwrapper.so: $(libwrapper_so_OBJECTS) ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
  2. Download patch debian/control

    --- 3.5.22-2/debian/control 2013-11-22 05:27:22.000000000 +0000 +++ 3.5.22-2ubuntu1/debian/control 2013-11-27 22:20:04.000000000 +0000 @@ -1,7 +1,8 @@ Source: service-wrapper-java Section: java Priority: optional -Maintainer: Rémi Debay <debay.remi@gmail.com> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Rémi Debay <debay.remi@gmail.com> Uploaders: tony mancill <tmancill@debian.org> Build-Depends: debhelper (>= 9), javahelper,
  3. Download patch debian/patches/0001-fix-as-needed-ppc.patch

    --- 3.5.22-2/debian/patches/0001-fix-as-needed-ppc.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.5.22-2ubuntu1/debian/patches/0001-fix-as-needed-ppc.patch 2013-11-27 22:20:51.000000000 +0000 @@ -0,0 +1,27 @@ +Description: Fix FTBFS on ppc: + "[exec] wrapper.c:(.text+0xd7e8): undefined reference to `ceil'" +Author: Andreas Moog <amoog@ubuntu.com> +Bug: https://sourceforge.net/p/wrapper/bugs/285/ + +--- service-wrapper-java-3.5.22.orig/src/c/Makefile-linux-ppc-32.make ++++ service-wrapper-java-3.5.22/src/c/Makefile-linux-ppc-32.make +@@ -33,7 +33,7 @@ init: + if test ! -d .deps; then mkdir .deps; fi + + wrapper: $(wrapper_SOURCE) +- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper ++ $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper + + libwrapper.so: $(libwrapper_so_OBJECTS) + ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so +--- service-wrapper-java-3.5.22.orig/src/c/Makefile-linux-ppc-64.make ++++ service-wrapper-java-3.5.22/src/c/Makefile-linux-ppc-64.make +@@ -33,7 +33,7 @@ init: + if test ! -d .deps; then mkdir .deps; fi + + wrapper: $(wrapper_SOURCE) +- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper ++ $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper + + libwrapper.so: $(libwrapper_so_OBJECTS) + ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
  4. Download patch .pc/applied-patches

    --- 3.5.22-2/.pc/applied-patches 2013-11-27 23:37:17.467112780 +0000 +++ 3.5.22-2ubuntu1/.pc/applied-patches 2013-11-27 23:37:17.707119121 +0000 @@ -1,2 +1,3 @@ bashisms_690722.patch 0002-kfreebsd-support.patch +0001-fix-as-needed-ppc.patch
  5. Download patch .pc/0001-fix-as-needed-ppc.patch/src/c/Makefile-linux-ppc-32.make

    --- 3.5.22-2/.pc/0001-fix-as-needed-ppc.patch/src/c/Makefile-linux-ppc-32.make 1970-01-01 00:00:00.000000000 +0000 +++ 3.5.22-2ubuntu1/.pc/0001-fix-as-needed-ppc.patch/src/c/Makefile-linux-ppc-32.make 2013-10-08 06:19:50.000000000 +0000 @@ -0,0 +1,48 @@ +# Copyright (c) 1999, 2013 Tanuki Software, Ltd. +# http://www.tanukisoftware.com +# All rights reserved. +# +# This software is the proprietary information of Tanuki Software. +# You shall use it only in accordance with the terms of the +# license agreement you entered into with Tanuki Software. +# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html + +COMPILE = gcc -O3 -m32 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE + +INCLUDE=$(JAVA_HOME)/include + +DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux + +wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c + +libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o + +BIN = ../../bin +LIB = ../../lib + +all: init wrapper libwrapper.so + +clean: + rm -f *.o + +cleanall: clean + rm -rf *~ .deps + rm -f $(BIN)/wrapper $(LIB)/libwrapper.so + +init: + if test ! -d .deps; then mkdir .deps; fi + +wrapper: $(wrapper_SOURCE) + $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper + +libwrapper.so: $(libwrapper_so_OBJECTS) + ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp
  6. Download patch debian/patches/series

    --- 3.5.22-2/debian/patches/series 2013-11-22 05:27:22.000000000 +0000 +++ 3.5.22-2ubuntu1/debian/patches/series 2013-11-27 22:20:15.000000000 +0000 @@ -1,2 +1,3 @@ bashisms_690722.patch 0002-kfreebsd-support.patch +0001-fix-as-needed-ppc.patch
  7. Download patch src/c/Makefile-linux-ppc-32.make

    --- 3.5.22-2/src/c/Makefile-linux-ppc-32.make 2013-10-08 06:19:50.000000000 +0000 +++ 3.5.22-2ubuntu1/src/c/Makefile-linux-ppc-32.make 2013-11-27 23:37:17.000000000 +0000 @@ -33,7 +33,7 @@ init: if test ! -d .deps; then mkdir .deps; fi wrapper: $(wrapper_SOURCE) - $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper + $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper libwrapper.so: $(libwrapper_so_OBJECTS) ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
  8. Download patch .pc/0001-fix-as-needed-ppc.patch/src/c/Makefile-linux-ppc-64.make

    --- 3.5.22-2/.pc/0001-fix-as-needed-ppc.patch/src/c/Makefile-linux-ppc-64.make 1970-01-01 00:00:00.000000000 +0000 +++ 3.5.22-2ubuntu1/.pc/0001-fix-as-needed-ppc.patch/src/c/Makefile-linux-ppc-64.make 2013-10-08 06:19:51.000000000 +0000 @@ -0,0 +1,48 @@ +# Copyright (c) 1999, 2013 Tanuki Software, Ltd. +# http://www.tanukisoftware.com +# All rights reserved. +# +# This software is the proprietary information of Tanuki Software. +# You shall use it only in accordance with the terms of the +# license agreement you entered into with Tanuki Software. +# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html + +COMPILE = gcc -O3 -m64 -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE + +INCLUDE=$(JAVA_HOME)/include + +DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux + +wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c + +libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o + +BIN = ../../bin +LIB = ../../lib + +all: init wrapper libwrapper.so + +clean: + rm -f *.o + +cleanall: clean + rm -rf *~ .deps + rm -f $(BIN)/wrapper $(LIB)/libwrapper.so + +init: + if test ! -d .deps; then mkdir .deps; fi + +wrapper: $(wrapper_SOURCE) + $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper + +libwrapper.so: $(libwrapper_so_OBJECTS) + ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp

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

Source: sikuli

sikuli (1.0~x~rc3.tesseract3-dfsg1-7ubuntu1) saucy; urgency=low * Merge from Debian unstable. * Dropped patches: - jgoodies-1.6-compat.patch: superseeded by new snapshot * debian/patches/force-java6-target.patch: fix lintian warning for java bytecode -- Yolanda Robla <yolanda.robla@canonical.com> Wed, 24 Jul 2013 13:10:29 +0200

Modifications :
  1. Download patch .pc/force-java6-target.patch/sikuli-script/src/main/java/CMakeLists.txt

    --- 1.0~x~rc3.tesseract3-dfsg1-7/.pc/force-java6-target.patch/sikuli-script/src/main/java/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ 1.0~x~rc3.tesseract3-dfsg1-7ubuntu1/.pc/force-java6-target.patch/sikuli-script/src/main/java/CMakeLists.txt 2012-02-13 21:41:27.000000000 +0000 @@ -0,0 +1,82 @@ +# Copyright 2010-2011, Sikuli.org +# Released under the MIT License. +IF(APPLE) + SET(OS_EXTRA_SOURCE_FILES + org/sikuli/script/MacUtil.java + org/sikuli/script/internal/hotkey/MacHotkeyManager.java + ) +ELSEIF(LINUX) + SET(OS_EXTRA_SOURCE_FILES + org/sikuli/script/LinuxUtil.java + org/sikuli/script/internal/hotkey/LinuxHotkeyManager.java + ) +ELSEIF(WIN32) + SET(OS_EXTRA_SOURCE_FILES + org/sikuli/script/Win32Util.java + org/sikuli/script/internal/hotkey/WindowsHotkeyManager.java + ) +ENDIF() + + +SET(JAVA_SOURCE_FILES + ${CMAKE_SWIG_OUTDIR}/*.java + ${OS_EXTRA_SOURCE_FILES} + org/sikuli/script/AppearEvent.java + org/sikuli/script/CapturePrompt.java + org/sikuli/script/ChangeEvent.java + org/sikuli/script/Clipboard.java + org/sikuli/script/Debug.java + org/sikuli/script/DummyOSUtil.java + org/sikuli/script/Env.java + org/sikuli/script/EventManager.java + org/sikuli/script/FindFailed.java + org/sikuli/script/Finder.java + org/sikuli/script/KeyCodeConverter.java + org/sikuli/script/Location.java + org/sikuli/script/Match.java + org/sikuli/script/OS.java + org/sikuli/script/OSUtil.java + org/sikuli/script/Observer.java + org/sikuli/script/OpenCV.java + org/sikuli/script/ScreenHighlighter.java + org/sikuli/script/Pattern.java + org/sikuli/script/Region.java + org/sikuli/script/Screen.java + org/sikuli/script/ScreenImage.java + org/sikuli/script/ScriptRunner.java + org/sikuli/script/Settings.java + org/sikuli/script/SikuliEvent.java + org/sikuli/script/SikuliEventAdapter.java + org/sikuli/script/SikuliEventObserver.java + org/sikuli/script/SikuliScript.java + org/sikuli/script/Subject.java + org/sikuli/script/UnionScreen.java + org/sikuli/script/VDictProxy.java + org/sikuli/script/VanishEvent.java + org/sikuli/script/App.java + org/sikuli/script/ImageLocator.java + org/sikuli/script/ResourceExtractor.java + org/sikuli/script/SikuliException.java + org/sikuli/script/AppNotFound.java + org/sikuli/script/Animator.java + org/sikuli/script/TransparentWindow.java + org/sikuli/script/ExtensionManager.java + org/sikuli/script/Key.java + org/sikuli/script/KeyModifier.java + org/sikuli/script/Button.java + org/sikuli/script/Constants.java + org/sikuli/script/internal/hotkey/HotkeyManager.java +) + +add_custom_target( ${PROJECT_NAME}.classes + COMMAND ${JAVA_COMPILE} -d ${BINARY_CLASS_DIR} -classpath "${CLASSPATH}" + ${JAVA_SOURCE_FILES} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + + +add_custom_target( ${JAR_FILE}.classes-in-jar + COMMAND ${CMAKE_COMMAND} -E copy_directory ${BINARY_CLASS_DIR} ${JAR_DIR} +) + +add_dependencies(${JAR_FILE}.classes-in-jar ${PROJECT_NAME}.classes) +add_dependencies(${PROJECT_NAME}.classes VisionProxy)
  2. Download patch debian/control

    --- 1.0~x~rc3.tesseract3-dfsg1-7/debian/control 2013-07-13 16:20:36.000000000 +0000 +++ 1.0~x~rc3.tesseract3-dfsg1-7ubuntu1/debian/control 2013-07-30 12:01:55.000000000 +0000 @@ -1,11 +1,12 @@ Source: sikuli Section: java 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: Gilles Filippini <pini@debian.org> -Build-Depends: debhelper (>= 8.1.3~), javahelper, default-jdk (>= 1:1.6), cmake, jython, libopencv-dev, libcommons-cli-java, junit, libswing-layout-java, libswingx-java, libjxgrabkey-java, libjgoodies-forms-java, libjson-simple-java, libmac-widgets-java, zip, exuberant-ctags, libtesseract-dev, swig, - default-jdk-doc, jython-doc, junit-doc, libswing-layout-java-doc, libswingx-java-doc, libjxgrabkey-doc, libjgoodies-forms-java-doc, libjson-simple-doc, libmac-widgets-doc, - python-sphinx +Build-Depends: debhelper (>= 8.1.3~), javahelper, default-jdk (>= 1:1.6), cmake, jython, libopencv-dev, libcommons-cli-java, junit, libswing-layout-java, libswingx-java, libjxgrabkey-java, + libjgoodies-forms-java, libjson-simple-java, libmac-widgets-java, zip, exuberant-ctags, libtesseract-dev, swig, default-jdk-doc, jython-doc, junit-doc, libswing-layout-java-doc, + libswingx-java-doc, libjxgrabkey-doc, libjgoodies-forms-java-doc, libjson-simple-doc, libmac-widgets-doc, python-sphinx Standards-Version: 3.9.3 Homepage: http://sikuli.org Vcs-Git: git://anonscm.debian.org/collab-maint/sikuli.git
  3. Download patch .pc/force-java6-target.patch/sikuli-ide/src/main/java/CMakeLists.txt

    --- 1.0~x~rc3.tesseract3-dfsg1-7/.pc/force-java6-target.patch/sikuli-ide/src/main/java/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ 1.0~x~rc3.tesseract3-dfsg1-7ubuntu1/.pc/force-java6-target.patch/sikuli-ide/src/main/java/CMakeLists.txt 2012-02-13 21:41:27.000000000 +0000 @@ -0,0 +1,79 @@ +# Copyright 2010-2011, Sikuli.org +# Released under the MIT License. +IF(APPLE) + SET(OS_EXTRA_SOURCE_FILES org/sikuli/ide/NativeLayerForMac.java) +ELSEIF(LINUX) + SET(OS_EXTRA_SOURCE_FILES org/sikuli/ide/NativeLayerForLinux.java) +ELSEIF(WIN32) + SET(OS_EXTRA_SOURCE_FILES org/sikuli/ide/NativeLayerForWindows.java) +ENDIF() + +SET(JAVA_SOURCE_FILES + ${OS_EXTRA_SOURCE_FILES} + org/sikuli/ide/AutoUpdater.java + org/sikuli/ide/ButtonGenCommand.java + org/sikuli/ide/CaptureButton.java + org/sikuli/ide/CloseableTabbedPane.java + org/sikuli/ide/CloseableTabbedPaneListener.java + org/sikuli/ide/CommandArgs.java + org/sikuli/ide/ConsolePane.java + org/sikuli/ide/CurrentLineHighlighter.java + org/sikuli/ide/FileChooser.java + org/sikuli/ide/I18N.java + org/sikuli/ide/IDESettings.java + org/sikuli/ide/ImageButton.java + org/sikuli/ide/LineNumberView.java + org/sikuli/ide/MyDocument.java + org/sikuli/ide/NativeLayer.java + org/sikuli/ide/Observer.java + org/sikuli/ide/PatternWindow.java + org/sikuli/ide/PreferencesWin.java + org/sikuli/ide/RegionButton.java + org/sikuli/ide/ScreenshotPane.java + org/sikuli/ide/sikuli_test/CounterPanel.java + org/sikuli/ide/sikuli_test/DefaultFailureDetailView.java + org/sikuli/ide/sikuli_test/FailureRunView.java + org/sikuli/ide/sikuli_test/ProgressBar.java + org/sikuli/ide/sikuli_test/TestHierarchyRunView.java + org/sikuli/ide/sikuli_test/TestRunContext.java + org/sikuli/ide/sikuli_test/TestRunView.java + org/sikuli/ide/sikuli_test/TestSuitePanel.java + org/sikuli/ide/sikuli_test/TestTreeModel.java + org/sikuli/ide/sikuli_test/TextUnitTestRunner.java + org/sikuli/ide/sikuli_test/UnitTestRunner.java + org/sikuli/ide/SikuliDocument.java + org/sikuli/ide/SikuliEditorKit.java + org/sikuli/ide/SikuliIDE.java + org/sikuli/ide/SikuliPane.java + org/sikuli/ide/SikuliView.java + org/sikuli/ide/SikuliViewFactory.java + org/sikuli/ide/SimilaritySlider.java + org/sikuli/ide/StatusBar.java + org/sikuli/ide/Subject.java + org/sikuli/ide/TargetOffsetPane.java + org/sikuli/ide/ToolbarButton.java + org/sikuli/ide/UserPreferences.java + org/sikuli/ide/Utils.java + org/sikuli/ide/NamingPane.java + org/sikuli/ide/ModernTabbedPaneUI.java + org/sikuli/ide/UndoManager.java + org/sikuli/ide/BevelDividerPainter.java + org/sikuli/ide/extmanager/ExtensionItem.java + org/sikuli/ide/extmanager/ExtensionManagerFrame.java + org/sikuli/ide/indentation/PythonIndentation.java + org/sikuli/ide/indentation/PythonState.java + org/sikuli/ide/util/GifDecoder.java + org/sikuli/ide/util/LoadingSpinner.java +) + +add_custom_target( ${PROJECT_NAME}.classes + COMMAND ${JAVA_COMPILE} -d ${BINARY_CLASS_DIR} -classpath "${CLASSPATH}" + ${JAVA_SOURCE_FILES} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + + +add_custom_target( ${JAR_FILE}.classes-in-jar + COMMAND ${CMAKE_COMMAND} -E copy_directory ${BINARY_CLASS_DIR} ${JAR_DIR} +) + +add_dependencies(${JAR_FILE}.classes-in-jar ${PROJECT_NAME}.classes)
  4. Download patch .pc/applied-patches

    --- 1.0~x~rc3.tesseract3-dfsg1-7/.pc/applied-patches 2013-07-30 14:19:16.226798236 +0000 +++ 1.0~x~rc3.tesseract3-dfsg1-7ubuntu1/.pc/applied-patches 2013-07-30 14:19:17.334827308 +0000 @@ -8,3 +8,4 @@ tessdata.patch gcc-4.7.patch no-opencv-surf-module.patch setTextAndMnemonic.patch +force-java6-target.patch
  5. Download patch sikuli-script/src/main/java/CMakeLists.txt

    --- 1.0~x~rc3.tesseract3-dfsg1-7/sikuli-script/src/main/java/CMakeLists.txt 2012-02-13 21:41:27.000000000 +0000 +++ 1.0~x~rc3.tesseract3-dfsg1-7ubuntu1/sikuli-script/src/main/java/CMakeLists.txt 2013-07-30 14:19:17.000000000 +0000 @@ -70,7 +70,7 @@ SET(JAVA_SOURCE_FILES add_custom_target( ${PROJECT_NAME}.classes COMMAND ${JAVA_COMPILE} -d ${BINARY_CLASS_DIR} -classpath "${CLASSPATH}" - ${JAVA_SOURCE_FILES} + ${JAVA_SOURCE_FILES} -source 1.6 -target 1.6 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
  6. Download patch debian/patches/series

    --- 1.0~x~rc3.tesseract3-dfsg1-7/debian/patches/series 2013-07-13 14:05:45.000000000 +0000 +++ 1.0~x~rc3.tesseract3-dfsg1-7ubuntu1/debian/patches/series 2013-07-30 12:01:55.000000000 +0000 @@ -8,3 +8,4 @@ tessdata.patch gcc-4.7.patch no-opencv-surf-module.patch setTextAndMnemonic.patch +force-java6-target.patch
  7. Download patch debian/patches/force-java6-target.patch

    --- 1.0~x~rc3.tesseract3-dfsg1-7/debian/patches/force-java6-target.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.0~x~rc3.tesseract3-dfsg1-7ubuntu1/debian/patches/force-java6-target.patch 2013-07-30 12:01:55.000000000 +0000 @@ -0,0 +1,30 @@ +Description: Force java 6 when building targets + This patch forces Java 6 when building targets. If not, it builds for + Java 7 by default. +Author: Yolanda Robla <yolanda.robla@canonical.com> +Index: sikuli-1.0~x~rc3/sikuli-ide/src/main/java/CMakeLists.txt +=============================================================== +--- sikuli/sikuli-ide/src/main/java/CMakeLists.txt 2013-06-21 15:37:19.488132999 +0000 ++++ sikuli.orig/sikuli-ide/src/main/java/CMakeLists.txt 2013-06-25 09:26:31.936132999 +0000 +@@ -68,7 +68,7 @@ + + add_custom_target( ${PROJECT_NAME}.classes + COMMAND ${JAVA_COMPILE} -d ${BINARY_CLASS_DIR} -classpath "${CLASSPATH}" +- ${JAVA_SOURCE_FILES} ++ ${JAVA_SOURCE_FILES} -source 1.6 -target 1.6 + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + + +Index: sikuli-1.0~x~rc3/sikuli-script/src/main/java/CMakeLists.txt +================================================================== +--- sikuli/sikuli-script/src/main/java/CMakeLists.txt 2013-06-25 11:20:48.357858000 +0000 ++++ sikuli/sikuli-script/src/main/java/CMakeLists.txt 2013-06-25 11:21:08.328132999 +0000 +@@ -70,7 +70,7 @@ + + add_custom_target( ${PROJECT_NAME}.classes + COMMAND ${JAVA_COMPILE} -d ${BINARY_CLASS_DIR} -classpath "${CLASSPATH}" +- ${JAVA_SOURCE_FILES} ++ ${JAVA_SOURCE_FILES} -source 1.6 -target 1.6 + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + +
  8. Download patch sikuli-ide/src/main/java/CMakeLists.txt

    --- 1.0~x~rc3.tesseract3-dfsg1-7/sikuli-ide/src/main/java/CMakeLists.txt 2012-02-13 21:41:27.000000000 +0000 +++ 1.0~x~rc3.tesseract3-dfsg1-7ubuntu1/sikuli-ide/src/main/java/CMakeLists.txt 2013-07-30 14:19:17.000000000 +0000 @@ -68,7 +68,7 @@ SET(JAVA_SOURCE_FILES add_custom_target( ${PROJECT_NAME}.classes COMMAND ${JAVA_COMPILE} -d ${BINARY_CLASS_DIR} -classpath "${CLASSPATH}" - ${JAVA_SOURCE_FILES} + ${JAVA_SOURCE_FILES} -source 1.6 -target 1.6 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

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

Source: wagon

wagon (1.0.0-2ubuntu2) precise; urgency=low * Fix FTBFS in offline build environments: - d/rules: Switch to using 'install' target instead of default 'package' target for build to ensure that artifacts built by this package can be accessed locally during javadoc generation. - d/control: Added libmaven-install-plugin-java to BDI's. * d/libwagon-java.poms: Added --java-lib to ensure that jar files are also installed into /usr/share/java. -- James Page <james.page@ubuntu.com> Tue, 24 Apr 2012 12:46:02 +0100 wagon (1.0.0-2ubuntu1) precise; urgency=low * Build-depend on junit4 (>= 4.8.1) for wagon-tck-http (LP: #935483). -- Colin Watson <cjwatson@ubuntu.com> Fri, 20 Apr 2012 19:32:32 +0100

Modifications :
  1. Download patch debian/rules

    --- 1.0.0-2/debian/rules 2011-08-29 20:35:14.000000000 +0000 +++ 1.0.0-2ubuntu2/debian/rules 2012-04-24 11:45:46.000000000 +0000 @@ -5,6 +5,7 @@ include /usr/share/cdbs/1/class/maven.mk JAVA_HOME := /usr/lib/jvm/default-java DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate +DEB_MAVEN_BUILD_TARGET := install get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
  2. Download patch debian/libwagon-java.poms

    --- 1.0.0-2/debian/libwagon-java.poms 2011-08-29 20:35:14.000000000 +0000 +++ 1.0.0-2ubuntu2/debian/libwagon-java.poms 2012-04-24 11:32:04.000000000 +0000 @@ -24,18 +24,18 @@ # temporarily for certain artifacts such as Javadoc jars. # pom.xml --no-parent --has-package-version -wagon-provider-api/pom.xml --has-package-version -wagon-providers/pom.xml --has-package-version -wagon-providers/wagon-file/pom.xml --has-package-version -wagon-providers/wagon-ftp/pom.xml --has-package-version -wagon-providers/wagon-http-lightweight/pom.xml --has-package-version -wagon-providers/wagon-http/pom.xml --has-package-version -wagon-providers/wagon-http-shared/pom.xml --has-package-version -wagon-providers/wagon-scm/pom.xml --has-package-version -wagon-providers/wagon-ssh-external/pom.xml --has-package-version -wagon-providers/wagon-ssh-common/pom.xml --has-package-version -wagon-providers/wagon-ssh-common-test/pom.xml --has-package-version -wagon-providers/wagon-ssh/pom.xml --has-package-version -wagon-provider-test/pom.xml --has-package-version -wagon-tcks/pom.xml --has-package-version -wagon-tcks/wagon-tck-http/pom.xml --has-package-version +wagon-provider-api/pom.xml --has-package-version --java-lib +wagon-providers/pom.xml --has-package-version --java-lib +wagon-providers/wagon-file/pom.xml --has-package-version --java-lib +wagon-providers/wagon-ftp/pom.xml --has-package-version --java-lib +wagon-providers/wagon-http-lightweight/pom.xml --has-package-version --java-lib +wagon-providers/wagon-http/pom.xml --has-package-version --java-lib +wagon-providers/wagon-http-shared/pom.xml --has-package-version --java-lib +wagon-providers/wagon-scm/pom.xml --has-package-version --java-lib +wagon-providers/wagon-ssh-external/pom.xml --has-package-version --java-lib +wagon-providers/wagon-ssh-common/pom.xml --has-package-version --java-lib +wagon-providers/wagon-ssh-common-test/pom.xml --has-package-version --java-lib +wagon-providers/wagon-ssh/pom.xml --has-package-version --java-lib +wagon-provider-test/pom.xml --has-package-version --java-lib +wagon-tcks/pom.xml --has-package-version --java-lib +wagon-tcks/wagon-tck-http/pom.xml --has-package-version --java-lib
  3. Download patch debian/control

    --- 1.0.0-2/debian/control 2012-01-09 21:34:26.000000000 +0000 +++ 1.0.0-2ubuntu2/debian/control 2012-04-24 11:05:44.000000000 +0000 @@ -1,12 +1,14 @@ Source: wagon 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>, Ludovic Claude <ludovic.claude@laposte.net> Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper (>= 1.4) Build-Depends-Indep: default-jdk-doc, junit (>= 3.8.1), + junit4 (>= 4.8.1), libcommons-codec-java, libcommons-codec-java-doc, libcommons-httpclient-java, @@ -21,6 +23,7 @@ Build-Depends-Indep: default-jdk-doc, libjetty-java-doc, libjsch-java, libjsoup-java, + libmaven-install-plugin-java, libmaven-enforcer-plugin-java, libmaven-javadoc-plugin-java, libmaven-scm-java,

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

Source: wsdl4j

wsdl4j (1.6.3-1ubuntu2) trusty; urgency=medium * Drop the Ubuntu changes, package is in universe again. Can be synced next time from Debian. -- Matthias Klose <doko@ubuntu.com> Tue, 25 Mar 2014 13:35:48 +0100 wsdl4j (1.6.3-1ubuntu1) saucy; urgency=low * Resync with Debian unstable. * d/control,rules: Drop use of bnd to generate OSGi headers as its not in main. -- James Page <james.page@ubuntu.com> Thu, 16 May 2013 14:31:04 +0100

Modifications :
  1. There are no changes

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

Source: xmlgraphics-commons

xmlgraphics-commons (1.5-4ubuntu1) trusty; urgency=low * Merge from Debian unstable. Remaining changes: - d/rules,control: Drop dependencies required for unit testing as they include libmockito-java which would pull maven into main, disable unit test execution. -- James Page <james.page@ubuntu.com> Tue, 19 Nov 2013 17:54:32 +0000

Modifications :
  1. Download patch debian/control

    --- 1.5-4/debian/control 2013-11-07 22:29:30.000000000 +0000 +++ 1.5-4ubuntu1/debian/control 2013-11-19 17:42:51.000000000 +0000 @@ -1,11 +1,12 @@ Source: xmlgraphics-commons 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: Vincent Fourmond <fourmond@debian.org>, Mathieu Malaterre <malat@debian.org> Build-Depends: debhelper (>= 9), javahelper -Build-Depends-Indep: default-jdk, default-jdk-doc, ant-optional, libmockito-java, - libcommons-io-java (>= 1.3.1), junit4, libcommons-logging-java, maven-repo-helper +Build-Depends-Indep: default-jdk, default-jdk-doc, ant-optional, + libcommons-io-java (>= 1.3.1), libcommons-logging-java, maven-repo-helper Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/xmlgraphics-commons Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/xmlgraphics-commons
  1. animal-sniffer
  2. antlr3
  3. apache-log4j1.2
  4. batik
  5. commons-daemon
  6. commons-vfs
  7. dom4j
  8. doxia
  9. doxia-sitetools
  10. fop
  11. freemind
  12. geronimo-jta-1.1-spec
  13. gluegen2
  14. gradle
  15. guava-libraries
  16. jakarta-taglibs-standard
  17. jarjar
  18. java3d
  19. javatools
  20. jmagick
  21. jsch
  22. junitperf
  23. libcommons-cli-java
  24. libcommons-dbcp-java
  25. libcommons-discovery-java
  26. libcommons-lang-java
  27. libcommons-logging-java
  28. libgnumail-java
  29. libhamcrest-java
  30. libjaxen-java
  31. libjaxp1.3-java
  32. libjogl2-java
  33. libmx4j-java
  34. libnative-platform-java
  35. lwjgl
  36. netbeans
  37. service-wrapper-java
  38. sikuli
  39. wagon
  40. wsdl4j
  41. xmlgraphics-commons