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

axis (1.4-20ubuntu3) trusty; urgency=medium * Revert: d/control,rules: Drop use of bnd to generate OSGi headers. Package is in universe again. -- Matthias Klose <doko@ubuntu.com> Tue, 25 Mar 2014 15:01:16 +0100 axis (1.4-20ubuntu2) trusty; urgency=medium * d/control,rules,libaxis-java.manifest: Add missing OSGi data to manifests for axis jar files using javahelper (LP: #894302). -- James Page <james.page@ubuntu.com> Tue, 04 Mar 2014 11:00:06 +0000 axis (1.4-20ubuntu1) saucy; urgency=low * Merge from Debian unstable. Remaining changes: - d/control,rules: Drop use of bnd to generate OSGi headers as its not in main. * Dropped changes (now in Debian): - Transition libservlet2.5-java -> libservlet3.0-java. -- James Page <james.page@ubuntu.com> Mon, 03 Jun 2013 11:19:00 +0100

Modifications :
  1. Download patch debian/rules

    --- 1.4-20/debian/rules 2013-05-27 12:30:02.000000000 +0000 +++ 1.4-20ubuntu3/debian/rules 2014-03-25 14:16:56.000000000 +0000 @@ -8,14 +8,14 @@ DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.j DEB_ANT_BUILD_TARGET := compile javadocs -DEB_INSTALL_CHANGELOGS_ALL := changelog.html - common-post-build-indep:: for BNDFILE in debian/*.bnd; do \ JARPATH=build/lib/`basename $$BNDFILE .bnd`.jar; \ bnd wrap -properties $$BNDFILE -output $$JARPATH $$JARPATH; \ done +DEB_INSTALL_CHANGELOGS_ALL := changelog.html + install/libaxis-java:: mh_installpoms -plibaxis-java -e$(DEB_UPSTREAM_VERSION) mh_installjar -plibaxis-java -l debian/poms/axis.xml build/lib/axis.jar
  2. Download patch debian/control

    --- 1.4-20/debian/control 2013-05-27 12:30:02.000000000 +0000 +++ 1.4-20ubuntu3/debian/control 2014-03-25 14:17:33.000000000 +0000 @@ -1,7 +1,8 @@ Source: axis Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Torsten Werner <twerner@debian.org>, Damien Raude-Morvan <drazzib@debian.org>, Jakub Adam <jakub.adam@ktknet.cz>,

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

groovy (2.0.0~beta2+isreally1.8.6-0ubuntu1) precise; urgency=low * New upstream release. * Fix jar naming issues caused by +isreally (LP: #953533): - d/rules: Figure out real upstream version number and install jars to /usr/share/groovy/lib with the correct versioning. -- James Page <james.page@ubuntu.com> Thu, 15 Mar 2012 13:25:54 +0000 groovy (2.0.0~beta2+isreally1.8.5-0ubuntu1) precise; urgency=low * Upload 1.8.5 as 2.0.0 due to accidental sync of 2.0.0 beta from Debian experimental. -- James Page <james.page@ubuntu.com> Wed, 18 Jan 2012 10:27:54 +0100

Modifications :
  1. Download patch debian/patches/0002-ant-build.diff.patch
  2. Download patch src/main/groovy/util/ObservableMap.java

    --- 2.0.0~beta2-1/src/main/groovy/util/ObservableMap.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/util/ObservableMap.java 2012-02-09 20:55:10.000000000 +0000 @@ -325,8 +325,36 @@ public class ObservableMap implements Ma } public abstract static class PropertyEvent extends PropertyChangeEvent { + /** + * deprecated + */ + public static final int ADDED = ChangeType.ADDED.ordinal(); + /** + * deprecated + */ + public static final int UPDATED = ChangeType.UPDATED.ordinal(); + /** + * deprecated + */ + public static final int REMOVED = ChangeType.REMOVED.ordinal(); + /** + * deprecated + */ + public static final int CLEARED = ChangeType.CLEARED.ordinal(); + /** + * deprecated + */ + public static final int MULTI = ChangeType.MULTI.ordinal(); + private ChangeType type; + /** + * @deprecated + */ + public PropertyEvent(Object source, String propertyName, Object oldValue, Object newValue, int type) { + this(source, propertyName, oldValue, newValue, ChangeType.resolve(type)); + } + public PropertyEvent(Object source, String propertyName, Object oldValue, Object newValue, ChangeType type) { super(source, propertyName, oldValue, newValue); this.type = type; @@ -364,6 +392,10 @@ public class ObservableMap implements Ma } public static class PropertyClearedEvent extends PropertyEvent { + /** + * @deprecated + */ + public static final String CLEAR_PROPERTY = ObservableMap.CLEARED_PROPERTY; private Map values = new HashMap(); public PropertyClearedEvent(Object source, Map values) {
  3. Download patch src/main/groovy/util/ObservableList.java

    --- 2.0.0~beta2-1/src/main/groovy/util/ObservableList.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/util/ObservableList.java 2012-02-09 20:55:10.000000000 +0000 @@ -503,10 +503,41 @@ public class ObservableList implements L } public abstract static class ElementEvent extends PropertyChangeEvent { + /** + * deprecated + */ + public static final int ADDED = ChangeType.ADDED.ordinal(); + /** + * deprecated + */ + public static final int UPDATED = ChangeType.UPDATED.ordinal(); + /** + * deprecated + */ + public static final int REMOVED = ChangeType.REMOVED.ordinal(); + /** + * deprecated + */ + public static final int CLEARED = ChangeType.CLEARED.ordinal(); + /** + * deprecated + */ + public static final int MULTI_ADD = ChangeType.MULTI_ADD.ordinal(); + /** + * deprecated + */ + public static final int MULTI_REMOVE = ChangeType.MULTI_REMOVE.ordinal(); private final ChangeType type; private final int index; + /** + * @deprecated + */ + public ElementEvent(Object source, Object oldValue, Object newValue, int index, int type) { + this(source, oldValue, newValue, index, ChangeType.resolve(type)); + } + public ElementEvent(Object source, Object oldValue, Object newValue, int index, ChangeType type) { super(source, ObservableList.CONTENT_PROPERTY, oldValue, newValue); this.type = type;
  4. Download patch src/main/org/codehaus/groovy/antlr/AntlrParserPlugin.java

    --- 2.0.0~beta2-1/src/main/org/codehaus/groovy/antlr/AntlrParserPlugin.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/org/codehaus/groovy/antlr/AntlrParserPlugin.java 2012-02-09 20:55:10.000000000 +0000 @@ -670,6 +670,7 @@ public class AntlrParserPlugin extends A ClassNode oldNode = classNode; enumClass.addAnnotations(annotations); classNode = enumClass; + configureAST(classNode, enumNode); assertNodeType(OBJBLOCK, node); objectBlock(node); classNode = oldNode; @@ -1207,10 +1208,8 @@ public class AntlrParserPlugin extends A statement = variableDef(node); break; - case LABELED_STAT: - statement = labelledStatement(node); - break; + return labelledStatement(node); case LITERAL_assert: statement = assertStatement(node); @@ -1570,8 +1569,7 @@ public class AntlrParserPlugin extends A // let's do the catch nodes List<CatchStatement> catches = new ArrayList<CatchStatement>(); for (; node != null && isType(LITERAL_catch, node); node = node.getNextSibling()) { - final List<CatchStatement> catchStatements = catchStatement(node); - catches.addAll(catchStatements); + catches.add(catchStatement(node)); } if (isType(LITERAL_finally, node)) { @@ -1591,37 +1589,17 @@ public class AntlrParserPlugin extends A return tryCatchStatement; } - protected List<CatchStatement> catchStatement(AST catchNode) { + protected CatchStatement catchStatement(AST catchNode) { AST node = catchNode.getFirstChild(); - List<CatchStatement> catches = new LinkedList<CatchStatement>(); - Statement code = statement(node.getNextSibling()); - if (MULTICATCH == node.getType()) { - AST variableNode = node.getNextSibling(); - final AST multicatches = node.getFirstChild(); - if (multicatches.getType() != MULTICATCH_TYPES) { - // catch (e) - // catch (def e) - String variable = identifier(multicatches); - Parameter catchParameter = new Parameter(ClassHelper.DYNAMIC_TYPE, variable); - CatchStatement answer = new CatchStatement(catchParameter, code); - configureAST(answer, catchNode); - catches.add(answer); - } else { - // catch (Exception e) - // catch (Exception1 | Exception2 e) - AST exceptionNodes = multicatches.getFirstChild(); - String variable = identifier(multicatches.getNextSibling()); - while (exceptionNodes != null) { - ClassNode exceptionType = buildName(exceptionNodes); - Parameter catchParameter = new Parameter(exceptionType, variable); - CatchStatement answer = new CatchStatement(catchParameter, code); - configureAST(answer, catchNode); - catches.add(answer); - exceptionNodes = exceptionNodes.getNextSibling(); - } - } - } - return catches; + Parameter parameter = parameter(node); + ClassNode exceptionType = parameter.getType(); + String variable = parameter.getName(); + node = node.getNextSibling(); + Statement code = statement(node); + Parameter catchParameter = new Parameter(exceptionType, variable); + CatchStatement answer = new CatchStatement(catchParameter, code); + configureAST(answer, catchNode); + return answer; } protected Statement whileStatement(AST whileNode) { @@ -2858,8 +2836,9 @@ public class AntlrParserPlugin extends A private ClassNode addTypeArguments(ClassNode basicType, AST node) { List<GenericsType> typeArgumentList = getTypeArgumentsList(node); - // a 0-length type argument list means we face the diamond operator - basicType.setGenericsTypes(typeArgumentList.toArray(new GenericsType[typeArgumentList.size()])); + if (typeArgumentList.size() > 0) { + basicType.setGenericsTypes(typeArgumentList.toArray(new GenericsType[typeArgumentList.size()])); + } return basicType; }
  5. Download patch src/main/groovy/util/Node.java
  6. Download patch src/main/groovy/transform/InheritConstructors.java

    --- 2.0.0~beta2-1/src/main/groovy/transform/InheritConstructors.java 2011-12-06 17:28:16.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/transform/InheritConstructors.java 2012-02-07 18:53:16.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2008-2010 the original author or authors. + * Copyright 2008-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -101,7 +101,7 @@ import java.lang.annotation.Target; * this AST transformation. This means that you can't override (i.e. not * inherit) the constructors with signatures that Groovy adds later. * If you get it wrong you will get a compile-time error about the duplication. - * <p> + * </p> * * @author Paul King * @since 1.7.3
  7. Download patch src/main/groovy/swing/factory/ColumnModelFactory.groovy

    --- 2.0.0~beta2-1/src/main/groovy/swing/factory/ColumnModelFactory.groovy 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/swing/factory/ColumnModelFactory.groovy 2012-02-09 20:55:10.000000000 +0000 @@ -16,6 +16,7 @@ package groovy.swing.factory +import java.util.logging.Logger import javax.swing.JTable import javax.swing.table.TableColumnModel import groovy.util.logging.Log
  8. Download patch src/main/groovy/swing/factory/ColumnFactory.groovy

    --- 2.0.0~beta2-1/src/main/groovy/swing/factory/ColumnFactory.groovy 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/swing/factory/ColumnFactory.groovy 2012-02-09 20:55:10.000000000 +0000 @@ -16,6 +16,7 @@ package groovy.swing.factory +import java.util.logging.Logger import javax.swing.table.TableCellRenderer import javax.swing.table.TableColumn import javax.swing.table.TableColumnModel
  9. Download patch gradlew

    --- 2.0.0~beta2-1/gradlew 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/gradlew 2012-02-09 20:55:10.000000000 +0000 @@ -7,25 +7,21 @@ ############################################################################## # Uncomment those lines to set JVM options. GRADLE_OPTS and JAVA_OPTS can be used together. -# GRADLE_OPTS="$GRADLE_OPTS -Xmx512m" +GRADLE_OPTS="$GRADLE_OPTS -Xmx640m" # JAVA_OPTS="$JAVA_OPTS -Xmx512m" GRADLE_APP_NAME=Gradle -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - warn ( ) { - echo "$*" + echo "${PROGNAME}: $*" } die ( ) { - echo - echo "$*" - echo + warn "$*" exit 1 } + # OS specific support (must be 'true' or 'false'). cygwin=false msys=false @@ -83,31 +79,12 @@ if [ -z "$JAVACMD" ] ; then fi fi if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." + die "JAVA_HOME is not defined correctly, can not execute: $JAVACMD" fi if [ -z "$JAVA_HOME" ] ; then warn "JAVA_HOME environment variable is not set" fi -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - # For Darwin, add GRADLE_APP_NAME to the JAVA_OPTS as -Xdock:name if $darwin; then JAVA_OPTS="$JAVA_OPTS -Xdock:name=$GRADLE_APP_NAME" @@ -160,7 +137,7 @@ fi GRADLE_APP_BASE_NAME=`basename "$0"` -exec "$JAVACMD" $JAVA_OPTS $GRADLE_OPTS \ +"$JAVACMD" $JAVA_OPTS $GRADLE_OPTS \ -classpath "$CLASSPATH" \ -Dorg.gradle.appname="$GRADLE_APP_BASE_NAME" \ -Dorg.gradle.wrapper.properties="$WRAPPER_PROPERTIES" \
  10. Download patch README.md

    --- 2.0.0~beta2-1/README.md 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/README.md 2012-02-09 20:55:10.000000000 +0000 @@ -1,47 +1,46 @@ -Groovy -=== - -[Groovy][Groovy] is an agile and dynamic language for the Java Virtual Machine. It builds upon the strengths of Java, but has additional power features inspired by languages like Python, Ruby and Smalltalk. Groovy makes modern programming features available to Java developers with almost-zero learning curve as well as supports Domain-Specific Languages and other compact syntax so your code becomes easy to read and maintain. Groovy makes writing shell and build scripts easy with its powerful processing primitives, OO abilities and an Ant DSL. It also increases developer productivity by reducing scaffolding code when developing web, GUI, database or console applications. Groovy simplifies testing by supporting unit testing and mocking out-of-the-box. Groovy also seamlessly integrates with all existing Java classes and libraries and compiles straight to Java bytecode so you can use it anywhere you can use Java. -[Groovy]: http://groovy.codehaus.org/ - -Building ---- - -To build you will need: - -* [JDK 1.5+](http://www.oracle.com/technetwork/java/javase/downloads) - -Plus one of the following (Gradle will download itself if needed): - -* [Apache Ant 1.7+](http://ant.apache.org) -* [Gradle 0.9.2+](http://gradle.org/) - -For detailed instructions please see: - -* [http://groovy.codehaus.org/Building+Groovy+from+Source](http://groovy.codehaus.org/Building+Groovy+from+Source) - -To build everything using ant (including running tests and creating a complete installation): - - ant install - -To build without running tests or creating OSGi information: - - ant install -DskipTests=true -DskipOsgi=true - -To run tests from gradle (will download gradle the first time): - - gradlew test - -To build from Eclipse: - -* ant install -* ensure that the M2_REPO classpath variable exists and points to the correct place (typically ~/.m2/repository) - * To Change this, go to Preferences -> Java -> Build Path -> Classpath variables -* Project -> Clean... and then build. Should compile with no errors. But if there are errors, then send a message to the groovy users mailing list -* You will *not* be able to run the tests from inside of Eclipse. - -License ---- - -Groovy is licensed under the terms of the [Apache License, Version 2.0][Apache License, Version 2.0]. -[Apache License, Version 2.0]: http://www.apache.org/licenses/LICENSE-2.0.html +Groovy +=== + +[Groovy][Groovy] is an agile and dynamic language for the Java Virtual Machine. It builds upon the strengths of Java, but has additional power features inspired by languages like Python, Ruby and Smalltalk. Groovy makes modern programming features available to Java developers with almost-zero learning curve as well as supports Domain-Specific Languages and other compact syntax so your code becomes easy to read and maintain. Groovy makes writing shell and build scripts easy with its powerful processing primitives, OO abilities and an Ant DSL. It also increases developer productivity by reducing scaffolding code when developing web, GUI, database or console applications. Groovy simplifies testing by supporting unit testing and mocking out-of-the-box. Groovy also seamlessly integrates with all existing Java classes and libraries and compiles straight to Java bytecode so you can use it anywhere you can use Java. +[Groovy]: http://groovy.codehaus.org/ + +Building +--- + +To build you will need: + +* [JDK 1.5+](http://www.oracle.com/technetwork/java/javase/downloads) + +Plus one of the following (Gradle will download itself if needed): +* [Apache Ant 1.7+](http://ant.apache.org) +* [Gradle 0.9.2+](http://gradle.org/) + +For detailed instructions please see: + +* [http://groovy.codehaus.org/Building+Groovy+from+Source](http://groovy.codehaus.org/Building+Groovy+from+Source) + +To build everything using ant (including running tests and creating a complete installation): + + ant install + +To build without running tests or creating OSGi information: + + ant install -DskipTests=true -DskipOsgi=true + +To run tests from gradle (will download gradle the first time): + + gradlew test + +To build from Eclipse: + +* ant install +* ensure that the M2_REPO classpath variable exists and points to the correct place (typically ~/.m2/repository) + * To Change this, go to Preferences -> Java -> Build Path -> Classpath variables +* Project -> Clean... and then build. Should compile with no errors. But if there are errors, then send a message to the groovy users mailing list +* You will *not* be able to run the tests from inside of Eclipse. + +License +--- + +Groovy is licensed under the terms of the [Apache License, Version 2.0][Apache License, Version 2.0]. +[Apache License, Version 2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
  11. Download patch gradle/pomconfigurer.gradle

    --- 2.0.0~beta2-1/gradle/pomconfigurer.gradle 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/gradle/pomconfigurer.gradle 2012-02-09 20:55:10.000000000 +0000 @@ -23,7 +23,7 @@ project.pomConfigureClosure = { modelVersion '4.0.0' groupId 'org.codehaus.groovy' artifactId 'groovy' - version '1.9.0-beta-2-SNAPSHOT' + version '1.8.6-SNAPSHOT' name 'Groovy' description 'Groovy: A powerful, dynamic language for the JVM' url 'http://groovy.codehaus.org/' @@ -39,6 +39,7 @@ project.pomConfigureClosure = { organization 'SpringSource' roles { role 'Project Manager' + role 'Despot' role 'Developer' } } @@ -188,6 +189,7 @@ project.pomConfigureClosure = { email 'blackdrag@gmx.org' roles { role 'Developer' + role 'Despot' } } developer { @@ -233,6 +235,7 @@ project.pomConfigureClosure = { organization 'ASERT, Australia' roles { role 'Developer' + role 'Despot' } } developer { @@ -306,6 +309,14 @@ project.pomConfigureClosure = { role 'Developer' } } + developer { + id 'melix' + name 'Cdric Champeau' + email 'cedric.champeau@gmail.com' + roles { + role 'Developer' + } + } } contributors { contributor { @@ -443,14 +454,17 @@ project.pomConfigureClosure = { name 'Adam Murdoch' } contributor { - name 'Cdric Champeau' - } - contributor { name 'David Durham' } contributor { name 'Daniel Henrique Alves Lima' } + contributor { + name 'John Wagenleitner' + } + contributor { + name 'Colin Harrington' + } } mailingLists { mailingList { @@ -466,6 +480,13 @@ project.pomConfigureClosure = { archive 'http://dir.gmane.org/gmane.comp.lang.groovy.user' } } + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + distribution 'repo' + } + } scm { connection 'scm:svn:http://svn.groovy.codehaus.org/browse/groovy/trunk/groovy/groovy-core' developerConnection 'scm:svn:https://${maven.username}@svn.groovy.codehaus.org/browse/groovy/trunk/groovy/groovy-core' @@ -558,4 +579,4 @@ project.pomConfigureClosure = { } } } -} \ No newline at end of file +}
  12. Download patch src/main/groovy/transform/ToString.java

    --- 2.0.0~beta2-1/src/main/groovy/transform/ToString.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/transform/ToString.java 2012-02-09 20:55:10.000000000 +0000 @@ -76,8 +76,11 @@ import java.lang.annotation.Target; * <pre> * AgedThing(age:5, super:NamedThing(Lassie)) * </pre> + * {@code @ToString} can also be used in conjunction with {@code @Canonical} and {@code @Immutable}. * * @author Paul King + * @see Immutable + * @see Canonical * @since 1.8.0 */ @java.lang.annotation.Documented
  13. Download patch src/main/groovy/lang/Binding.java

    --- 2.0.0~beta2-1/src/main/groovy/lang/Binding.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/lang/Binding.java 2012-02-09 20:55:10.000000000 +0000 @@ -22,6 +22,7 @@ import java.util.Map; * Represents the variable bindings of a script which can be altered * from outside the script object or created outside of a script and passed * into it. + * * <p> Binding instances are not supposed to be used in a multithreaded context. * * @author <a href="mailto:james@coredevelopers.net">James Strachan</a> @@ -75,6 +76,15 @@ public class Binding extends GroovyObjec variables = new LinkedHashMap(); variables.put(name, value); } + + /** + * Simple check for whether the binding contains a particular variable or not. + * + * @param name the name of the variable to check for + */ + public boolean hasVariable(String name) { + return variables != null && variables.containsKey(name); + } public Map getVariables() { if (variables == null) @@ -107,5 +117,5 @@ public class Binding extends GroovyObjec setVariable(property, newValue); } } - + }
  14. Download patch src/main/groovy/json/JsonOutput.groovy

    --- 2.0.0~beta2-1/src/main/groovy/json/JsonOutput.groovy 2011-12-16 05:24:20.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/json/JsonOutput.groovy 2012-01-24 20:27:40.000000000 +0000 @@ -139,10 +139,12 @@ class JsonOutput { * @return a JSON object representation for a map */ static String toJson(Map m) { - if(m.containsKey(null)) { - throw new IllegalArgumentException('Null key for a Map not allowed') - } - "{" + m.collect { k, v -> toJson(k.toString()) + ':' + toJson(v) }.join(',') + "}" + "{" + m.collect { k, v -> + if (k == null) { + throw new IllegalArgumentException('Null key for a Map not allowed') + } + toJson(k.toString()) + ':' + toJson(v) + }.join(',') + "}" } /**
  15. Download patch .gradle/1.0-milestone-6/outputFileStates/cache.properties.lock

    --- 2.0.0~beta2-1/.gradle/1.0-milestone-6/outputFileStates/cache.properties.lock 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/.gradle/1.0-milestone-6/outputFileStates/cache.properties.lock 2012-01-27 14:59:06.000000000 +0000 @@ -0,0 +1 @@ + \ No newline at end of file Binary files 2.0.0~beta2-1/.gradle/1.0-milestone-6/taskArtifacts/cache.bin and 2.0.0~beta2+isreally1.8.6-0ubuntu1/.gradle/1.0-milestone-6/taskArtifacts/cache.bin differ
  16. Download patch .gradle/1.0-milestone-6/fileSnapshots/cache.properties.lock

    --- 2.0.0~beta2-1/.gradle/1.0-milestone-6/fileSnapshots/cache.properties.lock 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/.gradle/1.0-milestone-6/fileSnapshots/cache.properties.lock 2012-01-27 14:59:06.000000000 +0000 @@ -0,0 +1 @@ + \ No newline at end of file Binary files 2.0.0~beta2-1/.gradle/1.0-milestone-6/outputFileStates/cache.bin and 2.0.0~beta2+isreally1.8.6-0ubuntu1/.gradle/1.0-milestone-6/outputFileStates/cache.bin differ
  17. Download patch src/main/groovy/lang/MetaObjectProtocol.java

    --- 2.0.0~beta2-1/src/main/groovy/lang/MetaObjectProtocol.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/lang/MetaObjectProtocol.java 2012-02-09 20:55:10.000000000 +0000 @@ -111,7 +111,7 @@ public interface MetaObjectProtocol { * argument values to establish the chosen MetaMethod * * @param name The name of the MetaMethod - * @param args Array containing - 1) the argument values (using which their types are then inferred), or 2) the corresponding argument types + * @param args Array containing - 1) the argument values (using which their types are then inferred), or 2) the corresponding argument types * @return A MetaMethod or null if it doesn't exist */ MetaMethod getMetaMethod(String name, Object[] args);
  18. Download patch .pc/0003-disable-bnd.diff.patch/build.xml
  19. Download patch src/main/groovy/util/GroovyLog.java

    --- 2.0.0~beta2-1/src/main/groovy/util/GroovyLog.java 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/util/GroovyLog.java 2012-02-09 20:55:10.000000000 +0000 @@ -0,0 +1,83 @@ +/* + * Copyright 2003-2007 the original author or authors. + * + * Licensed 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 groovy.util; + +import groovy.lang.GroovyObjectSupport; + +import org.codehaus.groovy.runtime.DefaultGroovyMethods; + +// +// FIXME: This class really isn't all that useful. It would be *much* better if there +// was a simple log API in groovy to dynamically switch to the logging facade that +// is actually installed. +// + +/** + * Represents an arbitrary logging service. By default this outputs to + * System.out though derivations of this class could log to Jakarta Commons Logging + * or log4j or JDK 1.5 logging etc + * + * @author <a href="mailto:james@coredevelopers.net">James Strachan</a> + * @version $Revision$ + */ +@Deprecated +public class GroovyLog extends GroovyObjectSupport { + + String prefix; + + /** + * Factory method to create new instances + */ + public static GroovyLog newInstance(Class aClass) { + return new GroovyLog(aClass); + } + + public GroovyLog() { + this(""); + } + + public GroovyLog(Class type) { + this(type.getName()); + } + + public GroovyLog(Object obj) { + this(obj.getClass()); + } + + public GroovyLog(String prefix) { + // + // FIXME: This kinda sucks as a default... shouldn't tack on any [ or : muck + // + + this.prefix = (prefix != null && prefix.length() > 0) ? "[" + prefix + ":" : "["; + } + + public Object invokeMethod(String name, Object args) { + if (args != null && args.getClass().isArray()) { + args = DefaultGroovyMethods.join((Object[])args, ","); + } + + // + // FIXME: This kinda sucks as an output format, should probably ucase name and then + // warp prefix in [] and then output the args. Basically what the SimpleLog + // does in JCL. + // + + System.out.println(prefix + name + "] " + args); + + return null; + } +}
  20. Download patch src/bin/groovysh

    --- 2.0.0~beta2-1/src/bin/groovysh 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/bin/groovysh 2012-02-09 20:55:10.000000000 +0000 @@ -30,4 +30,8 @@ DIRNAME=`dirname "$PRG"` . "$DIRNAME/startGroovy" -startGroovy org.codehaus.groovy.tools.shell.Main "$@" +if [ "x$OLDSHELL" != "x" ]; then + startGroovy groovy.ui.InteractiveShell "$@" +else + startGroovy org.codehaus.groovy.tools.shell.Main "$@" +fi
  21. Download patch debian/rules

    --- 2.0.0~beta2-1/debian/rules 2011-10-15 02:55:46.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/debian/rules 2012-03-15 13:12:40.000000000 +0000 @@ -5,7 +5,6 @@ include /usr/share/cdbs/1/class/ant.mk PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) -DEB_UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION)| sed 's/~beta/-beta-/') JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILDFILE := build.xml DEB_ANT_BUILD_TARGET := install doc @@ -15,15 +14,18 @@ DEB_JARS := ant mockobjects- asm3-util asm3-tree asm3-analysis ivy bnd qdox jarjar jansi ant-nodeps API_DOCS := target/html/api +# Ubuntu hack to work around +isreally to backout 2.0.0 +UBUNTU_UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/.*isreally//') + binary-post-install/$(PACKAGE):: chmod a+x debian/groovy/usr/share/groovy/bin/* sed -i \ -e"1s,.*,#!/bin/sh," \ debian/groovy/usr/share/groovy/bin/startGroovy - mh_installpoms -p$(PACKAGE) + mh_installpoms -p$(PACKAGE) # without bnd: - mh_installjar -p$(PACKAGE) -dusr/share/groovy/lib/groovy-$(DEB_UPSTREAM_VERSION).jar -l pom.xml target/dist/groovy.jar - mh_installjar -p$(PACKAGE) -dusr/share/groovy/embeddable/groovy-all-$(DEB_UPSTREAM_VERSION).jar -l target/groovy-all.pom target/dist/groovy-all.jar + mh_installjar -p$(PACKAGE) -dusr/share/groovy/lib/groovy-$(UBUNTU_UPSTREAM_VERSION).jar -l pom.xml target/dist/groovy.jar + mh_installjar -p$(PACKAGE) -dusr/share/groovy/embeddable/groovy-all-$(UBUNTU_UPSTREAM_VERSION).jar -l target/groovy-all.pom target/dist/groovy-all.jar # with bnd: #mh_installjar -p$(PACKAGE) -dusr/share/groovy/lib/groovy-$(DEB_UPSTREAM_VERSION).jar -l pom.xml target/install/lib/groovy-$(DEB_UPSTREAM_VERSION).jar #mh_installjar -p$(PACKAGE) -dusr/share/groovy/embeddable/groovy-all-$(DEB_UPSTREAM_VERSION).jar -l target/groovy-all.pom target/install/embeddable/groovy-all-$(DEB_UPSTREAM_VERSION).jar
  22. Download patch src/main/groovy/servlet/AbstractHttpServlet.java

    --- 2.0.0~beta2-1/src/main/groovy/servlet/AbstractHttpServlet.java 2011-08-30 16:20:16.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/servlet/AbstractHttpServlet.java 2012-02-06 15:05:22.000000000 +0000 @@ -296,13 +296,20 @@ public abstract class AbstractHttpServle /** * Parses the http request for the real script or template source file. - * - * @param request the http request to analyze - * @return a file object using an absolute file path name + * + * @param request + * the http request to analyze + * @return a file object using an absolute file path name, or <code>null</code> if the + * servlet container cannot translate the virtual path to a real + * path for any reason (such as when the content is being made + * available from a .war archive). */ protected File getScriptUriAsFile(HttpServletRequest request) { String uri = getScriptUri(request); String real = servletContext.getRealPath(uri); + if (real == null) { + return null; + } return new File(real).getAbsoluteFile(); }
  23. Download patch src/main/groovy/beans/BindableASTTransformation.java

    --- 2.0.0~beta2-1/src/main/groovy/beans/BindableASTTransformation.java 2011-12-06 17:28:16.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/beans/BindableASTTransformation.java 2012-02-06 15:05:22.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 the original author or authors. + * Copyright 2008-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -267,9 +267,9 @@ public class BindableASTTransformation i /** * Snoops through the declaring class and all parents looking for methods - * void addPropertyChangeListener(PropertyChangeListener), - * void removePropertyChangeListener(PropertyChangeListener), and - * void firePropertyChange(String, Object, Object). If any are defined all + * <code>void addPropertyChangeListener(PropertyChangeListener)</code>, + * <code>void removePropertyChangeListener(PropertyChangeListener)</code>, and + * <code>void firePropertyChange(String, Object, Object)</code>. If any are defined all * must be defined or a compilation error results. * * @param declaringClass the class to search @@ -316,14 +316,18 @@ public class BindableASTTransformation i * Adds the necessary field and methods to support property change support. * <p/> * Adds a new field: + * <pre> * <code>protected final java.beans.PropertyChangeSupport this$PropertyChangeSupport = new java.beans.PropertyChangeSupport(this)</code>" + * </pre> * <p/> * Also adds support methods: + * <pre> * <code>public void addPropertyChangeListener(java.beans.PropertyChangeListener)</code> * <code>public void addPropertyChangeListener(String, java.beans.PropertyChangeListener)</code> * <code>public void removePropertyChangeListener(java.beans.PropertyChangeListener)</code> * <code>public void removePropertyChangeListener(String, java.beans.PropertyChangeListener)</code> * <code>public java.beans.PropertyChangeListener[] getPropertyChangeListeners()</code> + * </pre> * * @param declaringClass the class to which we add the support field and methods */
  24. Download patch benchmark/bench/ary.groovy

    --- 2.0.0~beta2-1/benchmark/bench/ary.groovy 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/benchmark/bench/ary.groovy 2012-02-09 20:55:10.000000000 +0000 @@ -9,10 +9,10 @@ public class ary { - public static void main(String[] args) { + public static void main(String args[]) { int i, j, k, n = Integer.parseInt(args[0]); - int[] x = new int[n]; - int[] y = new int[n]; + int x[] = new int[n]; + int y[] = new int[n]; for (i = 0; i < n; i++) x[i] = i + 1;
  25. Download patch debian/control

    --- 2.0.0~beta2-1/debian/control 2011-10-15 02:55:46.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/debian/control 2012-03-15 13:06:56.000000000 +0000 @@ -1,7 +1,8 @@ Source: groovy 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> DM-Upload-Allowed: yes Uploaders: Torsten Werner <twerner@debian.org>, Varun Hiremath <varun@debian.org>, Ludovic Claude <ludovic.claude@laposte.net>, Miguel Landaeta <miguel@miguel.cc> Build-Depends: debhelper (>= 7), cdbs @@ -12,8 +13,8 @@ Build-Depends-Indep: maven-repo-helper, tofrodos, ivy, libqdox-java, libjarjar-java, libjansi-java Standards-Version: 3.9.2 Homepage: http://groovy.codehaus.org/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/branches/groovy/1.9 -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/branches/groovy/1.9 +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/groovy/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/groovy/ Package: groovy Architecture: all
  26. Download patch build.gradle

    --- 2.0.0~beta2-1/build.gradle 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/build.gradle 2012-02-09 20:55:10.000000000 +0000 @@ -27,12 +27,12 @@ configurations { dependencies { groovy files("$buildDir/classes") - groovy "asm:asm:3.3.1" + groovy "asm:asm:3.2" groovy "antlr:antlr:2.7.7" - groovy "asm:asm-commons:3.3.1" - groovy "asm:asm-util:3.3.1" - groovy "asm:asm-analysis:3.3.1" - groovy "asm:asm-tree:3.3.1" + groovy "asm:asm-commons:3.2" + groovy "asm:asm-util:3.2" + groovy "asm:asm-analysis:3.2" + groovy "asm:asm-tree:3.2" compile("bsf:bsf:2.4.0") { exclude(group: 'commons-logging', module: 'commons-logging') @@ -76,7 +76,7 @@ dependencies { // todo this was provided compile "org.livetribe:livetribe-jsr223:2.0.6" - tools "com.googlecode.jarjar:jarjar:1.1" + tools "com.google.code:jarjar:1.1" tools("checkstyle:checkstyle:4.4") { exclude(module: 'junit') } @@ -86,7 +86,7 @@ dependencies { exclude(module: 'asm') exclude(module: 'ant') } - tools "asm:asm:3.3.1" + tools "asm:asm:3.2" tools "com.thoughtworks.qdox:qdox:1.12" tools "biz.aQute:bnd:0.0.401"
  27. Download patch src/main/groovy/xml/MarkupBuilder.java

    --- 2.0.0~beta2-1/src/main/groovy/xml/MarkupBuilder.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/xml/MarkupBuilder.java 2012-02-09 20:55:10.000000000 +0000 @@ -310,7 +310,40 @@ public class MarkupBuilder extends Build protected Object getName(String methodName) { return super.getName(methodName); } - + + /** + * Returns a String with special XML characters escaped as entities so that + * output XML is valid. Escapes the following characters as corresponding + * entities: + * <ul> + * <li>\' as &amp;apos;</li> + * <li>&amp; as &amp;amp;</li> + * <li>&lt; as &amp;lt;</li> + * <li>&gt; as &amp;gt;</li> + * </ul> + * + * @param value to be searched and replaced for XML special characters. + * @return value with XML characters escaped + * @see #escapeXmlValue(String, boolean) + * @deprecated + */ + protected String transformValue(String value) { + // & has to be checked and replaced before others + if (value.matches(".*&.*")) { + value = value.replaceAll("&", "&amp;"); + } + if (value.matches(".*\\'.*")) { + value = value.replaceAll("\'", "&apos;"); + } + if (value.matches(".*<.*")) { + value = value.replaceAll("<", "&lt;"); + } + if (value.matches(".*>.*")) { + value = value.replaceAll(">", "&gt;"); + } + return value; + } + /** * Escapes a string so that it can be used directly as an XML * attribute value.
  28. Download patch gradlew.bat

    --- 2.0.0~beta2-1/gradlew.bat 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/gradlew.bat 2012-02-09 20:55:10.000000000 +0000 @@ -5,6 +5,10 @@ @rem ## @rem ########################################################################## +@rem +@rem $Revision: 10602 $ $Date: 2008-01-25 02:49:54 +0100 (ven., 25 janv. 2008) $ +@rem + @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal @@ -15,29 +19,69 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=.\ -@rem Find java.exe -set JAVA_EXE=java.exe -if not defined JAVA_HOME goto init - -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init +@rem Determine the command interpreter to execute the "CD" later +set COMMAND_COM="cmd.exe" +if exist "%SystemRoot%\system32\cmd.exe" set COMMAND_COM="%SystemRoot%\system32\cmd.exe" +if exist "%SystemRoot%\command.com" set COMMAND_COM="%SystemRoot%\command.com" + +@rem Use explicit find.exe to prevent cygwin and others find.exe from being used +set FIND_EXE="find.exe" +if exist "%SystemRoot%\system32\find.exe" set FIND_EXE="%SystemRoot%\system32\find.exe" +if exist "%SystemRoot%\command\find.exe" set FIND_EXE="%SystemRoot%\command\find.exe" + +:check_JAVA_HOME +@rem Make sure we have a valid JAVA_HOME +if not "%JAVA_HOME%" == "" goto have_JAVA_HOME echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo ERROR: Environment variable JAVA_HOME has not been set. echo. echo Please set the JAVA_HOME variable in your environment to match the echo location of your Java installation. echo. goto end +:have_JAVA_HOME +@rem Validate JAVA_HOME +%COMMAND_COM% /C DIR "%JAVA_HOME%" 2>&1 | %FIND_EXE% /I /C "%JAVA_HOME%" >nul +if not errorlevel 1 goto init + +echo. +echo ERROR: JAVA_HOME might be set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation if there are problems. +echo. + :init +@rem get name of script to launch with full path @rem Get command-line arguments, handling Windowz variants +SET _marker=%JAVA_HOME: =% +@rem IF NOT "%_marker%" == "%JAVA_HOME%" ECHO JAVA_HOME "%JAVA_HOME%" contains spaces. Please change to a location without spaces if this causes problems. if not "%OS%" == "Windows_NT" goto win9xME_args if "%eval[2+2]" == "4" goto 4NT_args +IF "%_marker%" == "%JAVA_HOME%" goto :win9xME_args + +set _FIXPATH= +call :fixpath "%JAVA_HOME%" +set JAVA_HOME=%_FIXPATH:~1% + +goto win9xME_args + +:fixpath +if not %1.==. ( +for /f "tokens=1* delims=;" %%a in (%1) do ( +call :shortfilename "%%a" & call :fixpath "%%b" +) +) +goto :EOF +:shortfilename +for %%i in (%1) do set _FIXPATH=%_FIXPATH%;%%~fsi +goto :EOF + + :win9xME_args @rem Slurp the command line arguments. set CMD_LINE_ARGS= @@ -59,10 +103,10 @@ set CMD_LINE_ARGS=%$ set STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain set CLASSPATH=%DIRNAME%\gradle\wrapper\gradle-wrapper.jar set WRAPPER_PROPERTIES=%DIRNAME%\gradle\wrapper\gradle-wrapper.properties +set JAVA_EXE=%JAVA_HOME%\bin\java.exe set GRADLE_OPTS=%JAVA_OPTS% %GRADLE_OPTS% -Dorg.gradle.wrapper.properties="%WRAPPER_PROPERTIES%" -@rem Execute Gradle "%JAVA_EXE%" %GRADLE_OPTS% -classpath "%CLASSPATH%" %STARTER_MAIN_CLASS% %CMD_LINE_ARGS% :end
  29. Download patch src/main/groovy/swing/factory/WidgetFactory.groovy

    --- 2.0.0~beta2-1/src/main/groovy/swing/factory/WidgetFactory.groovy 2011-08-30 16:20:16.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/swing/factory/WidgetFactory.groovy 2012-02-07 18:53:16.000000000 +0000 @@ -18,6 +18,8 @@ package groovy.swing.factory import java.awt.Component import java.awt.Window +import javax.swing.JComponent +import static groovy.swing.factory.LayoutFactory.DEFAULT_DELEGATE_PROPERTY_CONSTRAINT public class WidgetFactory extends AbstractFactory { @@ -52,6 +54,9 @@ public class WidgetFactory extends Abstr def constraints = builder.context.constraints if (constraints != null) { LayoutFactory.getLayoutTarget(parent).add(child, constraints) + if (child instanceof JComponent) { + child.putClientProperty(DEFAULT_DELEGATE_PROPERTY_CONSTRAINT, constraints) + } builder.context.remove('constraints') } else { LayoutFactory.getLayoutTarget(parent).add(child)
  30. Download patch src/main/groovy/lang/MetaClassImpl.java

    --- 2.0.0~beta2-1/src/main/groovy/lang/MetaClassImpl.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/lang/MetaClassImpl.java 2012-02-09 20:55:10.000000000 +0000 @@ -76,21 +76,9 @@ import java.lang.reflect.Modifier; import java.lang.reflect.Proxy; import java.net.URL; import java.security.AccessController; -import java.security.PrivilegedAction; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * Allows methods to be dynamically added to existing classes at runtime @@ -119,6 +107,11 @@ public class MetaClassImpl implements Me private static final Class[] METHOD_MISSING_ARGS = new Class[]{String.class, Object.class}; private static final Class[] GETTER_MISSING_ARGS = new Class[]{String.class}; private static final Class[] SETTER_MISSING_ARGS = METHOD_MISSING_ARGS; + private static final Comparator<CachedClass> CACHED_CLASS_NAME_COMPARATOR = new Comparator<CachedClass>() { + public int compare(final CachedClass o1, final CachedClass o2) { + return o1.getName().compareTo(o2.getName()); + } + }; protected final Class theClass; protected final CachedClass theCachedClass; @@ -878,6 +871,7 @@ public class MetaClassImpl implements Me /** * Invokes the given method on the object. + * TODO: should this be deprecated? If so, we have to propogate to many places. */ public Object invokeMethod(Object object, String methodName, Object[] originalArguments) { return invokeMethod(theClass, object, methodName, originalArguments, false, false); @@ -1368,6 +1362,15 @@ public class MetaClassImpl implements Me } } + /** + * Warning, this method will be removed + * + * @deprecated use invokeConstructor instead + */ + public Object invokeConstructorAt(Class at, Object[] arguments) { + return invokeConstructor(arguments); + } + public Object invokeConstructor(Object[] arguments) { return invokeConstructor(theClass, arguments); } @@ -1933,21 +1936,27 @@ public class MetaClassImpl implements Me * This will build up the property map (Map of MetaProperty objects, keyed on * property name). */ + @SuppressWarnings("unchecked") private void setupProperties(PropertyDescriptor[] propertyDescriptors) { if (theCachedClass.isInterface) { LinkedList<CachedClass> superClasses = new LinkedList<CachedClass>(); superClasses.add(ReflectionCache.OBJECT_CLASS); Set interfaces = theCachedClass.getInterfaces(); - classPropertyIndexForSuper = classPropertyIndex; - final SingleKeyHashMap cPI = classPropertyIndex.getNotNull(theCachedClass); - for (Iterator interfaceIter = interfaces.iterator(); interfaceIter.hasNext();) { - CachedClass iclass = (CachedClass) interfaceIter.next(); - SingleKeyHashMap iPropertyIndex = cPI; + LinkedList<CachedClass> superInterfaces = new LinkedList<CachedClass>(interfaces); + // sort interfaces so that we may ensure a deterministic behaviour in case of + // ambiguous fields (class implementing two interfaces using the same field) + if (superInterfaces.size()>1) { + Collections.sort(superInterfaces, CACHED_CLASS_NAME_COMPARATOR); + } + + SingleKeyHashMap iPropertyIndex = classPropertyIndex.getNotNull(theCachedClass); + for (CachedClass iclass : superInterfaces) { + SingleKeyHashMap sPropertyIndex = classPropertyIndex.getNotNull(iclass); + copyNonPrivateFields(sPropertyIndex, iPropertyIndex); addFields(iclass, iPropertyIndex); - classPropertyIndex.put(iclass, iPropertyIndex); } - classPropertyIndex.put(ReflectionCache.OBJECT_CLASS, cPI); + addFields(theCachedClass, iPropertyIndex); applyPropertyDescriptors(propertyDescriptors); applyStrayPropertyMethods(superClasses, classPropertyIndex, true); @@ -1955,7 +1964,12 @@ public class MetaClassImpl implements Me makeStaticPropertyIndex(); } else { LinkedList<CachedClass> superClasses = getSuperClasses(); - Set interfaces = theCachedClass.getInterfaces(); + LinkedList<CachedClass> interfaces = new LinkedList<CachedClass>(theCachedClass.getInterfaces()); + // sort interfaces so that we may ensure a deterministic behaviour in case of + // ambiguous fields (class implementing two interfaces using the same field) + if (interfaces.size()>1) { + Collections.sort(interfaces, CACHED_CLASS_NAME_COMPARATOR); + } // if this an Array, then add the special read-only "length" property if (theCachedClass.isArray) { @@ -1964,7 +1978,7 @@ public class MetaClassImpl implements Me classPropertyIndex.put(theCachedClass, map); } - inheritStaticInterfaceFields(superClasses, interfaces); + inheritStaticInterfaceFields(superClasses, new LinkedHashSet(interfaces)); inheritFields(superClasses); applyPropertyDescriptors(propertyDescriptors); @@ -2924,6 +2938,10 @@ public class MetaClassImpl implements Me Method[] listenerMethods = descriptor.getListenerMethods(); for (Method listenerMethod : listenerMethods) { final MetaMethod metaMethod = CachedMethod.find(descriptor.getAddListenerMethod()); + // GROOVY-5202 + // there might be a non public listener of some kind + // we skip that here + if (metaMethod==null) continue; addToAllMethodsIfPublic(metaMethod); String name = listenerMethod.getName(); if (listeners.containsKey(name)) { @@ -3307,6 +3325,13 @@ public class MetaClassImpl implements Me } /** + * @deprecated use pickMethod instead + */ + protected MetaMethod retrieveMethod(String methodName, Class[] arguments) { + return pickMethod(methodName, arguments); + } + + /** * remove all method call cache entries. This should be done if a * method is added during runtime, but not by using a category. */
  31. Download patch src/main/groovy/text/GStringTemplateEngine.java

    --- 2.0.0~beta2-1/src/main/groovy/text/GStringTemplateEngine.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/text/GStringTemplateEngine.java 2012-02-09 20:55:10.000000000 +0000 @@ -177,12 +177,12 @@ public class GStringTemplateEngine exten templateExpressions.append("}.asWritable()}"); - final GroovyClassLoader loader = parentLoader instanceof GroovyClassLoader?(GroovyClassLoader)parentLoader:( + final GroovyClassLoader loader = (GroovyClassLoader) AccessController.doPrivileged(new PrivilegedAction() { public Object run() { return new GroovyClassLoader(parentLoader); } - })); + }); final Class groovyClass; try { groovyClass = loader.parseClass(new GroovyCodeSource(templateExpressions.toString(), "GStringTemplateScript" + counter++ + ".groovy", "x"));
  32. Download patch src/main/groovy/xml/XmlUtil.java

    --- 2.0.0~beta2-1/src/main/groovy/xml/XmlUtil.java 2011-12-06 17:28:16.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/xml/XmlUtil.java 2012-02-06 15:03:26.000000000 +0000 @@ -15,6 +15,7 @@ */ package groovy.xml; +import groovy.lang.GroovyRuntimeException; import groovy.lang.Writable; import groovy.util.Node; import groovy.util.XmlNodePrinter; @@ -253,7 +254,7 @@ public class XmlUtil { transformer.transform(source, target); } catch (TransformerException e) { - // ignore + throw new GroovyRuntimeException(e.getMessage()); } }
  33. Download patch src/main/groovy/lang/GroovyClassLoader.java

    --- 2.0.0~beta2-1/src/main/groovy/lang/GroovyClassLoader.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/lang/GroovyClassLoader.java 2012-02-09 20:55:10.000000000 +0000 @@ -147,6 +147,18 @@ public class GroovyClassLoader extends U } /** + * Loads the given class node returning the implementation Class + * + * @param classNode + * @return a class + * @deprecated + */ + public Class defineClass(ClassNode classNode, String file) { + //return defineClass(classNode, file, "/groovy/defineClass"); + throw new DeprecationException("the method GroovyClassLoader#defineClass(ClassNode, String) is no longer used and removed"); + } + + /** * Loads the given class node returning the implementation Class. * <p/> * WARNING: this compilation is not synchronized @@ -213,6 +225,17 @@ public class GroovyClassLoader extends U Math.abs(text.hashCode()) + ".groovy"); } + /** + * Parses the given character stream into a Java class capable of being run + * + * @param in an InputStream + * @return the main class defined in the given script + * @deprecated Prefer using methods taking a Reader rather than an InputStream to avoid wrong encoding issues. + */ + public Class parseClass(InputStream in) throws CompilationFailedException { + return parseClass(in, generateScriptName()); + } + public synchronized String generateScriptName() { scriptNameCounter++; return "script" + scriptNameCounter + ".groovy"; @@ -329,6 +352,27 @@ public class GroovyClassLoader extends U return ret; } + /** + * expands the classpath + * + * @param pathList an empty list that will contain the elements of the classpath + * @param classpath the classpath specified as a single string + * @deprecated + */ + protected void expandClassPath(List pathList, String base, String classpath, boolean isManifestClasspath) { + throw new DeprecationException("the method groovy.lang.GroovyClassLoader#expandClassPath(List,String,String,boolean) is no longer used internally and removed"); + } + + /** + * A helper method to allow bytecode to be loaded. spg changed name to + * defineClass to make it more consistent with other ClassLoader methods + * + * @deprecated + */ + protected Class defineClass(String name, byte[] bytecode, ProtectionDomain domain) { + throw new DeprecationException("the method groovy.lang.GroovyClassLoader#defineClass(String,byte[],ProtectionDomain) is no longer used internally and removed"); + } + protected PermissionCollection getPermissions(CodeSource codeSource) { PermissionCollection perms; try { @@ -832,6 +876,10 @@ public class GroovyClassLoader extends U return ret; } + private URL getSourceFile(String name) { + return getSourceFile(name, config.getDefaultScriptExtension()); + } + /** * Decides if the given source is newer than a class. *
  34. Download patch build.properties

    --- 2.0.0~beta2-1/build.properties 2011-12-23 19:01:16.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/build.properties 2012-02-09 22:26:34.000000000 +0000 @@ -1,6 +1,6 @@ -groovyVersion = 2.0.0-beta-2 +groovyVersion = 1.8.6 # bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3 only digits) -groovyBundleVersion = 2.0.0.beta-2 +groovyBundleVersion = 1.8.6 # Many people have reported problems testing UberTestCaseGroovySourceSubPackages, others have no difficulties with the default # values ant junit task uses. The decision has been taken to provide the values to try and cause the least
  35. Download patch src/main/groovy/time/BaseDuration.java

    --- 2.0.0~beta2-1/src/main/groovy/time/BaseDuration.java 2011-08-30 16:20:16.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/time/BaseDuration.java 2012-02-07 18:53:16.000000000 +0000 @@ -27,7 +27,7 @@ import java.util.ArrayList; * @see Duration * @author John Wilson tug@wilson.co.uk */ -public abstract class BaseDuration { +public abstract class BaseDuration implements Comparable<BaseDuration> { protected final int years; protected final int months; protected final int days; @@ -118,6 +118,10 @@ public abstract class BaseDuration { public abstract From getFrom(); + public int compareTo(BaseDuration otherDuration) { + return Long.signum(toMilliseconds() - otherDuration.toMilliseconds()); + } + public abstract static class From { public abstract Date getNow();
  36. Download patch src/main/groovy/lang/PackageScope.java

    --- 2.0.0~beta2-1/src/main/groovy/lang/PackageScope.java 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/lang/PackageScope.java 2012-02-09 20:55:10.000000000 +0000 @@ -0,0 +1,42 @@ +/* + * Copyright 2008-2010 the original author or authors. + * + * Licensed 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 groovy.lang; + +import org.codehaus.groovy.transform.GroovyASTTransformationClass; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Class or field annotation used for turning off Groovy's auto property + * conversion of default or package scoped fields. Place it on the field(s) + * of interest or on the class to apply for all package-scoped fields. + * + * This transformation is normally only used in conjunction with a third-party + * library or framework which requires package scoping. + * + * @author Paul King + * @deprecated use groovy.transform.PackageScope + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE, ElementType.FIELD}) +@GroovyASTTransformationClass("org.codehaus.groovy.transform.PackageScopeASTTransformation") +@Deprecated +public @interface PackageScope { +} \ No newline at end of file
  37. Download patch src/main/groovy/util/ConfigObject.groovy

    --- 2.0.0~beta2-1/src/main/groovy/util/ConfigObject.groovy 2011-12-16 05:24:20.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/util/ConfigObject.groovy 2012-02-09 20:55:10.000000000 +0000 @@ -101,7 +101,7 @@ class ConfigObject extends LinkedHashMap * @return The result of the merge */ Map merge(ConfigObject other) { - return doMerge(this,other) + return merge(this,other) } @@ -128,7 +128,7 @@ class ConfigObject extends LinkedHashMap return props } - private doMerge(Map config, Map other) { + private merge(Map config, Map other) { for(entry in other) { def configEntry = config[entry.key] @@ -139,7 +139,7 @@ class ConfigObject extends LinkedHashMap else { if(configEntry instanceof Map && configEntry.size() > 0 && entry.value instanceof Map) { // recur - doMerge(configEntry, entry.value) + merge(configEntry, entry.value) } else { config[entry.key] = entry.value
  38. Download patch src/main/groovy/swing/factory/RootPaneContainerFactory.groovy

    --- 2.0.0~beta2-1/src/main/groovy/swing/factory/RootPaneContainerFactory.groovy 2011-08-30 16:20:16.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/swing/factory/RootPaneContainerFactory.groovy 2012-02-07 18:53:16.000000000 +0000 @@ -18,7 +18,9 @@ package groovy.swing.factory import java.awt.Component import java.awt.Window +import javax.swing.JComponent import javax.swing.JButton +import static groovy.swing.factory.LayoutFactory.DEFAULT_DELEGATE_PROPERTY_CONSTRAINT abstract class RootPaneContainerFactory extends AbstractFactory { @@ -33,6 +35,9 @@ abstract class RootPaneContainerFactory def constraints = builder.context.constraints if (constraints != null) { parent.contentPane.add(child, constraints) + if (child instanceof JComponent) { + child.putClientProperty(DEFAULT_DELEGATE_PROPERTY_CONSTRAINT, constraints) + } builder.context.remove('constraints') } else { parent.contentPane.add(child)
  39. Download patch debian/orig-tar.sh

    --- 2.0.0~beta2-1/debian/orig-tar.sh 2011-10-15 02:55:46.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/debian/orig-tar.sh 2012-03-15 13:06:56.000000000 +0000 @@ -2,8 +2,7 @@ # called by uscan with '--upstream-version' <version> <file> TAR=../groovy_$2.orig.tar.gz -VERSION=$(echo $2 | sed 's/~beta/-beta-/g') -DIR=groovy-$VERSION +DIR=groovy-$2 # clean up the upstream tarball unzip $3
  40. Download patch .gradle/1.0-milestone-6/fileHashes/cache.properties.lock

    --- 2.0.0~beta2-1/.gradle/1.0-milestone-6/fileHashes/cache.properties.lock 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/.gradle/1.0-milestone-6/fileHashes/cache.properties.lock 2012-01-27 14:59:06.000000000 +0000 @@ -0,0 +1 @@ + \ No newline at end of file Binary files 2.0.0~beta2-1/.gradle/1.0-milestone-6/fileSnapshots/cache.bin and 2.0.0~beta2+isreally1.8.6-0ubuntu1/.gradle/1.0-milestone-6/fileSnapshots/cache.bin differ
  41. Download patch debian/patches/0003-disable-bnd.diff.patch

    --- 2.0.0~beta2-1/debian/patches/0003-disable-bnd.diff.patch 2011-10-15 02:55:46.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/debian/patches/0003-disable-bnd.diff.patch 2012-03-15 13:06:56.000000000 +0000 @@ -11,13 +11,12 @@ diff --git a/build.xml b/build.xml index ab54309..e97dfce 100644 --- a/build.xml +++ b/build.xml -@@ -635,7 +635,7 @@ $Date: 2010-04-02 16:02:23 +0200 (Fr, 02. Apr 2010) $ - </move> - </target> - -- <target name="install" depends="createJars,updateJarsForOsgi,skipOsgi" unless="testFailed" -+ <target name="install" depends="createJars,skipOsgi" unless="testFailed" - description="Create an installation hierarchy in target/install."> - - <!-- --- +@@ -644,7 +644,7 @@ + </move> + </target> + +- <target name="install" depends="createJars,updateJarsForOsgi,skipOsgi" unless="testFailed" ++ <target name="install" depends="createJars,skipOsgi" unless="testFailed" + description="Create an installation hierarchy in target/install."> + + <!--
  42. Download patch .gradle/1.0-milestone-6/fileSnapshots/cache.properties

    --- 2.0.0~beta2-1/.gradle/1.0-milestone-6/fileSnapshots/cache.properties 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/.gradle/1.0-milestone-6/fileSnapshots/cache.properties 2012-01-27 14:18:30.000000000 +0000 @@ -0,0 +1 @@ +#Fri Jan 27 09:48:29 CET 2012
  43. Download patch src/main/groovy/transform/Immutable.java

    --- 2.0.0~beta2-1/src/main/groovy/transform/Immutable.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/transform/Immutable.java 2012-02-09 20:55:10.000000000 +0000 @@ -87,7 +87,13 @@ import java.lang.annotation.Target; * </ul> * <p/> * Immutable classes are particularly useful for functional and concurrent styles of programming - * and for use as key values within maps. + * and for use as key values within maps. If you want similar functionality to what this annotation + * provides but don't need immutability then consider using {@code @Canonical}. + * <p/> + * Customising behaviour: + * <p/> + * You can customise the toString() method provided for you by {@code @Immutable} + * by also adding the {@code @ToString} annotation to your class definition. * <p/> * Limitations: * <ul> @@ -113,6 +119,8 @@ import java.lang.annotation.Target; * </ul> * * @author Paul King + * @see ToString + * @see Canonical * @since 1.7 */ @java.lang.annotation.Documented
  44. Download patch src/main/groovy/inspect/swingui/TableSorter.java

    --- 2.0.0~beta2-1/src/main/groovy/inspect/swingui/TableSorter.java 2011-12-06 17:28:16.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/inspect/swingui/TableSorter.java 2012-02-06 15:03:26.000000000 +0000 @@ -193,7 +193,6 @@ space and avoid unnecessary heap allocat } public void tableChanged(TableModelEvent e) { - System.out.println("Sorter: tableChanged"); reallocateIndexes(); super.tableChanged(e);
  45. Download patch src/main/groovy/swing/factory/TableLayoutFactory.groovy

    --- 2.0.0~beta2-1/src/main/groovy/swing/factory/TableLayoutFactory.groovy 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/swing/factory/TableLayoutFactory.groovy 2012-02-09 20:55:10.000000000 +0000 @@ -33,7 +33,7 @@ public class TableLayoutFactory extends public void setParent(FactoryBuilderSupport builder, Object parent, Object child) { if (builder.getParentFactory()) { - builder.getParentFactory().setChild (builder, parent, child); + builder.getParentFactory().setChild (builder, parent, child.getComponent()); } } }
  46. Download patch src/main/groovy/sql/GroovyRowResult.java

    --- 2.0.0~beta2-1/src/main/groovy/sql/GroovyRowResult.java 2011-08-30 16:20:16.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/sql/GroovyRowResult.java 2012-02-06 15:05:22.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2003-2007 the original author or authors. + * Copyright 2003-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,20 +47,10 @@ public class GroovyRowResult extends Gro */ public Object getProperty(String property) { try { - Object value = result.get(property); - if (value != null) - return value; - // if property exists and value is null, return null - if (result.containsKey(property)) - return null; - // with some databases/drivers, the columns names are stored uppercase. - String propertyUpper = property.toUpperCase(); - value = result.get(propertyUpper); - if (value != null) - return value; - // if property exists and value is null, return null - if (result.containsKey(propertyUpper)) - return null; + Object key = lookupKeyIgnoringCase(property); + if (key != null) { + return result.get(key); + } throw new MissingPropertyException(property, GroovyRowResult.class); } catch (Exception e) { @@ -68,6 +58,22 @@ public class GroovyRowResult extends Gro } } + private Object lookupKeyIgnoringCase(Object key) { + // try some special cases first for efficiency + if (result.containsKey(key)) + return key; + if (!(key instanceof CharSequence)) + return null; + String keyStr = key.toString(); + for (Object next : result.keySet()) { + if (!(next instanceof String)) + continue; + if (keyStr.equalsIgnoreCase((String)next)) + return next; + } + return null; + } + /** * Retrieve the value of the property by its index. * A negative index will count backwards from the last column. @@ -90,7 +96,7 @@ public class GroovyRowResult extends Gro it.next(); i++; } - return (obj); + return obj; } catch (Exception e) { throw new MissingPropertyException(Integer.toString(index), GroovyRowResult.class, e); @@ -98,12 +104,12 @@ public class GroovyRowResult extends Gro } public String toString() { - return (result.toString()); + return result.toString(); } /* * The following methods are needed for implementing the Map interface. - * They are just delegating the request to the internal LinkedHashMap + * They are mostly delegating the request to the provided Map. */ public void clear() { @@ -111,7 +117,7 @@ public class GroovyRowResult extends Gro } public boolean containsKey(Object key) { - return result.containsKey(key); + return lookupKeyIgnoringCase(key) != null; } public boolean containsValue(Object value) { @@ -129,8 +135,7 @@ public class GroovyRowResult extends Gro public Object get(Object property) { if (property instanceof String) return getProperty((String)property); - else - return null; + return null; } public int hashCode() { @@ -153,8 +158,8 @@ public class GroovyRowResult extends Gro result.putAll(t); } - public Object remove(Object key) { - return result.remove(key); + public Object remove(Object rawKey) { + return result.remove(lookupKeyIgnoringCase(rawKey)); } public int size() {
  47. Download patch .gradle/1.0-milestone-6/taskArtifacts/cache.properties.lock

    --- 2.0.0~beta2-1/.gradle/1.0-milestone-6/taskArtifacts/cache.properties.lock 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/.gradle/1.0-milestone-6/taskArtifacts/cache.properties.lock 2012-01-27 14:59:06.000000000 +0000 @@ -0,0 +1 @@ + \ No newline at end of file
  48. Download patch src/main/org/codehaus/groovy/ant/Groovyc.java

    --- 2.0.0~beta2-1/src/main/org/codehaus/groovy/ant/Groovyc.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/org/codehaus/groovy/ant/Groovyc.java 2012-02-09 20:55:10.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2003-2010 the original author or authors. + * Copyright 2003-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,11 +36,11 @@ import org.apache.tools.ant.util.SourceF import org.codehaus.groovy.control.CompilationUnit; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.SourceExtensionHandler; +import org.codehaus.groovy.runtime.DefaultGroovyMethods; import org.codehaus.groovy.tools.ErrorReporter; import org.codehaus.groovy.tools.FileSystemCompiler; import org.codehaus.groovy.tools.RootLoader; import org.codehaus.groovy.tools.javac.JavaAwareCompilationUnit; -import org.codehaus.groovy.runtime.DefaultGroovyMethods; import java.io.File; import java.io.FileWriter; @@ -51,6 +51,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.nio.charset.Charset; import java.util.ArrayList; +import java.util.Arrays; import java.util.Enumeration; import java.util.Iterator; import java.util.LinkedHashSet; @@ -750,7 +751,7 @@ public class Groovyc extends MatchingTas String optionStr = st.nextToken(); String replaced = optionStr.replace("-X", "-FX"); if(optionStr == replaced) { - replaced = optionStr.replace("-W", "-FW"); // GROOVY-5063 + replaced = optionStr.replace("-W", "-FW"); // GROOVY-5063 } jointOptions.add(replaced); } @@ -862,6 +863,7 @@ public class Groovyc extends MatchingTas final Execute executor = new Execute(); // new LogStreamHandler ( attributes , Project.MSG_INFO , Project.MSG_WARN ) ) ; executor.setAntRun(getProject()); executor.setWorkingDirectory(getProject().getBaseDir()); + executor.setEnvironment(addClasspathToEnvironment(executor.getEnvironment(), classpath.toString())); executor.setCommandline(commandLine); try { executor.execute(); @@ -937,6 +939,12 @@ public class Groovyc extends MatchingTas } } + private String[] addClasspathToEnvironment(String[] oldEnvironment, String classpath) { + List<String> newEnvironmentList = (oldEnvironment == null) ? new ArrayList<String>() : Arrays.asList(oldEnvironment); + newEnvironmentList.add("classpath=" + classpath); + return newEnvironmentList.toArray(new String[newEnvironmentList.size()]); + } + protected CompilationUnit makeCompileUnit() { Map<String, Object> options = configuration.getJointCompilationOptions(); if (options != null) {
  49. Download patch src/main/groovy/transform/Canonical.java

    --- 2.0.0~beta2-1/src/main/groovy/transform/Canonical.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/transform/Canonical.java 2012-02-09 20:55:10.000000000 +0000 @@ -77,6 +77,9 @@ import java.lang.annotation.Target; * If an "underscore" version of the respective method already exists, then no default implementation is provided. * </ul> * <p/> + * If you want similar functionality to what this annotation provides but also require immutability, see the + * {@code @Immutable} annotation. + * <p/> * Limitations: * <ul> * <li> @@ -88,6 +91,7 @@ import java.lang.annotation.Target; * @see groovy.transform.EqualsAndHashCode * @see groovy.transform.ToString * @see groovy.transform.TupleConstructor + * @see groovy.transform.Immutable * @since 1.8.0 */ @java.lang.annotation.Documented
  50. Download patch src/main/groovy/swing/impl/ComponentFacade.java

    --- 2.0.0~beta2-1/src/main/groovy/swing/impl/ComponentFacade.java 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/swing/impl/ComponentFacade.java 2012-02-09 20:55:10.000000000 +0000 @@ -0,0 +1,31 @@ +/* + * Copyright 2003-2007 the original author or authors. + * + * Licensed 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 groovy.swing.impl; + +import java.awt.Component; + +/** + * A facade to an object which contains a component. + * + * @author <a href="mailto:james@coredevelopers.net">James Strachan</a> + * @version $Revision$ + * @deprecated This interface is no longer used internally and there + * exists no equivalent functionality + * Superceded by FactoryBuilderSupport handling. + */ +public interface ComponentFacade { + Component getComponent(); +}
  51. Download patch .classpath

    --- 2.0.0~beta2-1/.classpath 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/.classpath 2012-02-09 20:55:10.000000000 +0000 @@ -1,13 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/main"/> - <classpathentry excluding="groovy/bugs/Groovy1759_Bug.groovy|groovy/MultiCatchTest.groovy|org/codehaus/groovy/benchmarks/alioth/|groovy/PropertyTest.groovy|groovy/annotations/package-info.groovy" kind="src" output="bin" path="src/test"/> - <classpathentry kind="src" path="subprojects/groovy-bsf/src/main/java"/> - <classpathentry kind="src" output="bin" path="subprojects/groovy-bsf/src/test/java"/> - <classpathentry kind="src" path="subprojects/groovy-jmx/src/main/groovy"/> - <classpathentry kind="src" path="subprojects/groovy-jmx/src/main/java"/> - <classpathentry kind="src" output="bin" path="subprojects/groovy-jmx/src/test/groovy"/> - <classpathentry kind="src" output="bin" path="subprojects/groovy-jmx/src/test/java"/> + <classpathentry kind="src" output="target/test-classes" path="src/test"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.8.1/ant-1.8.1.jar"/> <classpathentry kind="var" path="M2_REPO/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/> @@ -16,7 +10,7 @@ <classpathentry kind="var" path="M2_REPO/bsf/bsf/2.4.0/bsf-2.4.0.jar"/> <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/> <classpathentry kind="var" path="M2_REPO/jmock/jmock-cglib/1.2.0/jmock-cglib-1.2.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.8.2/ant-junit-1.8.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.8.1/ant-junit-1.8.1.jar"/> <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.0/commons-cli-1.0.jar"/> <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar"/> <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar"/> @@ -28,20 +22,12 @@ <classpathentry kind="var" path="M2_REPO/asm/asm-util/3.2/asm-util-3.2.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.8.1/ant-launcher-1.8.1.jar"/> <classpathentry kind="lib" path="security/GroovyJarTest.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.9/log4j-1.2.9.jar"/> <classpathentry kind="var" path="M2_REPO/jline/jline/0.9.94/jline-0.9.94.jar"/> + <classpathentry kind="var" path="M2_REPO"/> <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-testutil/1.8.2/ant-testutil-1.8.2.jar"/> <classpathentry kind="var" path="M2_REPO/junit/junit/4.8.2/junit-4.8.2.jar"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> <classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.3/xmlunit-1.3.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/ivy/ivy/2.2.0/ivy-2.2.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/fusesource/jansi/jansi/1.2.1/jansi-1.2.1.jar"/> - <classpathentry kind="var" path="M2_REPO/ch/qos/logback/logback-classic/0.9.21/logback-classic-0.9.21.jar"/> - <classpathentry kind="var" path="M2_REPO/org/objectweb/asm/com.springsource.org.objectweb.asm.commons/2.2.3/com.springsource.org.objectweb.asm.commons-2.2.3.jar"/> - <classpathentry kind="var" path="M2_REPO/com/thoughtworks/qdox/qdox/1.8/qdox-1.8.jar"/> - <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar"/> - <classpathentry kind="var" path="M2_REPO/ch/qos/logback/logback-core/0.9.21/logback-core-0.9.21.jar"/> - <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"/> - <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/> - <classpathentry kind="lib" path="target/classes"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="output" path="target/classes"/> </classpath>
  52. Download patch src/main/groovy/inspect/TextNode.groovy

    --- 2.0.0~beta2-1/src/main/groovy/inspect/TextNode.groovy 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/inspect/TextNode.groovy 2012-02-09 20:55:10.000000000 +0000 @@ -21,6 +21,8 @@ */ package groovy.inspect +import groovy.inspect.swingui.AstBrowserNodeMaker + class TextNode { Object userObject List<List<String>> properties
  53. Download patch src/main/groovy/inspect/swingui/AstBrowser.groovy

    --- 2.0.0~beta2-1/src/main/groovy/inspect/swingui/AstBrowser.groovy 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/inspect/swingui/AstBrowser.groovy 2012-02-09 20:55:10.000000000 +0000 @@ -33,12 +33,7 @@ import javax.swing.tree.TreeNode import javax.swing.tree.TreeSelectionModel import org.codehaus.groovy.control.Phases import static java.awt.GridBagConstraints.* -import org.codehaus.groovy.ast.ClassNode -import groovy.lang.GroovyClassLoader.ClassCollector -import org.codehaus.groovy.control.CompilationUnit -import org.codehaus.groovy.control.SourceUnit -import org.objectweb.asm.ClassReader -import org.objectweb.asm.util.TraceClassVisitor +import java.awt.Component /** * This object is a GUI for looking at the AST that Groovy generates. @@ -53,15 +48,15 @@ import org.objectweb.asm.util.TraceClass public class AstBrowser { - private inputArea, rootElement, decompiledSource, jTree, propertyTable, splitterPane, mainSplitter, bytecodeView + private inputArea, rootElement, decompiledSource, jTree, propertyTable, splitterPane, mainSplitter boolean showScriptFreeForm, showScriptClass, showTreeView - GeneratedBytecodeAwareGroovyClassLoader classLoader + GroovyClassLoader classLoader def prefs = new AstBrowserUiPreferences() AstBrowser(inputArea, rootElement, classLoader) { this.inputArea = inputArea this.rootElement = rootElement - this.classLoader = new GeneratedBytecodeAwareGroovyClassLoader(classLoader) + this.classLoader = classLoader } def swing, frame @@ -167,10 +162,7 @@ public class AstBrowser { mainSplitter = splitPane( orientation: JSplitPane.VERTICAL_SPLIT, topComponent: splitterPane, - bottomComponent: tabbedPane { - widget(decompiledSource = new groovy.ui.ConsoleTextEditor(editable: false, showLineNumbers: false), title:'Source') - widget(bytecodeView = new groovy.ui.ConsoleTextEditor(editable: false, showLineNumbers: false), title:'Bytecode') - }, + bottomComponent: decompiledSource = new groovy.ui.ConsoleTextEditor(editable: false, showLineNumbers: false), constraints: gbc(gridx: 0, gridy: 2, gridwidth: 3, gridheight: 1, weightx: 1.0, weighty: 1.0, anchor: NORTHWEST, fill: BOTH, insets: [2, 2, 2, 2])) { } } @@ -208,23 +200,6 @@ public class AstBrowser { inputArea.moveCaretPosition(inputArea.getCaretPosition()) } } - - boolean classNode = node.properties.any { it[0]=='class' && it[1] in['class org.codehaus.groovy.ast.ClassNode', 'class org.codehaus.groovy.ast.InnerClassNode'] } - if (classNode) { - def className = node.properties.find { it[0]=='name' }[1] - def bytecode = classLoader.getBytecode(className) - if (bytecode) { - def writer = new StringWriter() - def visitor = new TraceClassVisitor(new PrintWriter(writer)); - def reader = new ClassReader(bytecode) - reader.accept(visitor, 0) - bytecodeView.textEditor.text = writer.toString() - } else { - bytecodeView.textEditor.text = '// No bytecode available at this phase' - } - } else { - bytecodeView.textEditor.text = '' - } } propertyTable.model.fireTableDataChanged() } as TreeSelectionListener) @@ -337,7 +312,6 @@ public class AstBrowser { try { def nodeMaker = new SwingTreeNodeMaker() def adapter = new ScriptToTreeNodeAdapter(classLoader, showScriptFreeForm, showScriptClass, nodeMaker) - classLoader.clearBytecodeTable() def result = adapter.compile(script, compilePhase) swing.doLater { model.setRoot(result) @@ -482,43 +456,3 @@ class SwingTreeNodeMaker implements AstB new TreeNodeWithProperties(userObject, properties) } } - -class BytecodeCollector extends ClassCollector { - - Map<String, byte[]> bytecode - - BytecodeCollector(ClassCollector delegate, Map<String,byte[]> bytecode) { - super(delegate.cl, delegate.unit, delegate.su) - this.bytecode = bytecode - } - - @Override - protected Class createClass(byte[] code, ClassNode classNode) { - bytecode[classNode.name] = code - return super.createClass(code, classNode) - } - -} - -class GeneratedBytecodeAwareGroovyClassLoader extends GroovyClassLoader { - - private final Map<String, byte[]> bytecode = new HashMap<String, byte[]>(); - - GeneratedBytecodeAwareGroovyClassLoader(final GroovyClassLoader parent) { - super(parent) - } - - @Override - protected ClassCollector createCollector(CompilationUnit unit, SourceUnit su) { - def collector = super.createCollector(unit, su) - new BytecodeCollector(collector, bytecode) - } - - public void clearBytecodeTable() { - bytecode.clear() - } - - public byte[] getBytecode(final String className) { - bytecode[className] - } -} \ No newline at end of file
  54. Download patch benchmark/bench.groovy

    --- 2.0.0~beta2-1/benchmark/bench.groovy 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/benchmark/bench.groovy 2012-02-09 20:55:10.000000000 +0000 @@ -4,8 +4,8 @@ import org.codehaus.groovy.tools.FileSys def benchData = [ hello : [1], ackermann : [5, 6, 7, 8], - ary : [10,100,1000,1000000], -/* binarytrees : [1], +/* ary : [1], + binarytrees : [1], chameneos : [1], echo : [1], except : [1], @@ -58,7 +58,7 @@ println "Groovy benchmarking test" showJavaVersion() println "Groovy lib: $GROOVY_LIB" horizontalBreak() -def executeBench= { bench, input -> +benchData.each { bench, input -> println "Benchmark $bench" [".java", ".groovy"].each { ending -> println("\t$bench$ending :") @@ -73,12 +73,6 @@ def executeBench= { bench, input -> } horizontalBreak() } -if (args.length==0) { - benchData.each(executeBench) -} else { - executeBench(args[0],benchData[args[0]]) -} - void horizontalBreak() { println "-" * 80
  55. Download patch src/main/groovy/swing/impl/ContainerFacade.java

    --- 2.0.0~beta2-1/src/main/groovy/swing/impl/ContainerFacade.java 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/swing/impl/ContainerFacade.java 2012-02-09 20:55:10.000000000 +0000 @@ -0,0 +1,31 @@ +/* + * Copyright 2003-2007 the original author or authors. + * + * Licensed 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 groovy.swing.impl; + +import java.awt.Component; + +/** + * A facade to an object to which components can be added. + * + * @author <a href="mailto:james@coredevelopers.net">James Strachan</a> + * @version $Revision$ + * @deprecated This interface is no longer used internally and there + * exists no equivalent functionality + * Superceded by FactoryBuilderSupport handling. + */ +public interface ContainerFacade { + void addComponent(Component component); +}
  56. Download patch src/main/groovy/inspect/swingui/ScriptToTreeNodeAdapter.groovy

    --- 2.0.0~beta2-1/src/main/groovy/inspect/swingui/ScriptToTreeNodeAdapter.groovy 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/inspect/swingui/ScriptToTreeNodeAdapter.groovy 2012-02-09 20:55:10.000000000 +0000 @@ -94,7 +94,6 @@ class ScriptToTreeNodeAdapter { def scriptName = "script" + System.currentTimeMillis() + ".groovy" GroovyCodeSource codeSource = new GroovyCodeSource(script, scriptName, "/groovy/script") CompilationUnit cu = new CompilationUnit(CompilerConfiguration.DEFAULT, codeSource.codeSource, classLoader) - cu.setClassgenCallback(classLoader.createCollector(cu, null)) TreeNodeBuildingNodeOperation operation = new TreeNodeBuildingNodeOperation(this, showScriptFreeForm, showScriptClass) cu.addPhaseOperation(operation, compilePhase) cu.addSource(codeSource.getName(), script);
  57. Download patch gradle/wrapper/gradle-wrapper.properties

    --- 2.0.0~beta2-1/gradle/wrapper/gradle-wrapper.properties 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/gradle/wrapper/gradle-wrapper.properties 2012-02-09 20:55:10.000000000 +0000 @@ -1,4 +1,4 @@ -#Mon May 02 20:57:32 EST 2011 +#Tue Jan 04 21:15:37 EST 2011 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME Binary files 2.0.0~beta2-1/.gradle/1.0-milestone-6/fileHashes/cache.bin and 2.0.0~beta2+isreally1.8.6-0ubuntu1/.gradle/1.0-milestone-6/fileHashes/cache.bin differ
  58. Download patch gradle/docs.gradle

    --- 2.0.0~beta2-1/gradle/docs.gradle 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/gradle/docs.gradle 2012-02-09 20:55:10.000000000 +0000 @@ -1,72 +1,71 @@ -task doc(dependsOn: [javadoc, groovydoc, 'docGDK']) { - footer = "Copyright &amp;copy; 2003-2011 The Codehaus. All rights reserved." - title = "Groovy ${groovyVersion}" -} - -javadoc { - maxMemory = javaDoc_mx - project.configure(options) { - windowTitle = doc.title - docTitle = doc.title - encoding = "ISO-8859-1" - author = true - version = true - overview = "src/main/overview.html" - footer = doc.footer - source = "1.5" - links("http://java.sun.com/javase/6/docs/api", "http://www.dpml.net/api/ant/1.7.0", - "http://commons.apache.org/cli/api-release", "http://junit.sourceforge.net/junit3.8.1/javadoc", - "http://java.sun.com/j2ee/1.4/docs/api", "http://www.antlr2.org/javadoc") - } -} - -groovydoc { - dependsOn classes - groovyClasspath = configurations.compile - use = true - windowtitle = doc.title - doctitle = doc.title - header = doc.title - footer = doc.footer - overview = file("src/main/overview.html") - includePrivate = false - link "http://java.sun.com/j2ee/1.4/docs/api", "javax.servlet.", "javax.management." - link "http://java.sun.com/javase/6/docs/api", "java.", "org.xml.", "javax.", "org.xml." - link "http://www.dpml.net/api/ant/1.7.0", "org.apache.ant.", "org.apache.tools.ant." - link "http://junit.sourceforge.net/junit3.8.1/javadoc", "org.junit.", "junit." - link "http://www.antlr2.org/javadoc", "antlr." - link "http://commons.apache.org/cli/api-release", "org.apache.commons.cli." -} - -task docGDK { - destinationDir = "$buildDir/html/groovy-jdk" - inputs.files sourceSets.tools.runtimeClasspath - outputs.dir destinationDir - doFirst {task -> - ant { - java(classname: "org.codehaus.groovy.tools.DocGenerator", fork: "yes", failonerror: "true", - classpath: sourceSets.tools.runtimeClasspath.asPath, - errorproperty: 'edr', - outputproperty: 'odr') { - arg(value: "org.codehaus.groovy.runtime.DefaultGroovyMethods") - arg(value: "org.codehaus.groovy.runtime.SqlGroovyMethods") - arg(value: "org.codehaus.groovy.runtime.SwingGroovyMethods") - arg(value: "org.codehaus.groovy.runtime.XmlGroovyMethods") - arg(value: "org.codehaus.groovy.runtime.EncodingGroovyMethods") - arg(value: "org.codehaus.groovy.runtime.DateGroovyMethods") - arg(value: "org.codehaus.groovy.runtime.ProcessGroovyMethods") - arg(value: "org.codehaus.groovy.runtime.DefaultGroovyStaticMethods") - arg(value: "org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods") - arg(value: "org.codehaus.groovy.vmplugin.v6.PluginDefaultGroovyMethods") - arg(value: "org.codehaus.groovy.vmplugin.v6.PluginStaticGroovyMethods") - } -// println "Out: " + ant.properties.edr -// println "Err: " + ant.properties.odr - } - copy { - into task.destinationDir - from "src/tools/org/codehaus/groovy/tools/groovy.ico", "src/tools/org/codehaus/groovy/tools/stylesheet.css" - } - } -} - +task doc(dependsOn: [javadoc, groovydoc, 'docGDK']) { + footer = "Copyright &amp;copy; 2003-2012 The Codehaus. All rights reserved." + title = "Groovy ${groovyVersion}" +} + +javadoc { + maxMemory = javaDoc_mx + project.configure(options) { + windowTitle = doc.title + docTitle = doc.title + encoding = "ISO-8859-1" + author = true + version = true + overview = "src/main/overview.html" + footer = doc.footer + source = "1.5" + links("http://docs.oracle.com/javase/6/docs/api/", "http://evgeny-goldin.org/javadoc/ant/api/", + "http://commons.apache.org/cli/api-release", "http://kentbeck.github.com/junit/javadoc/latest/", + "http://docs.oracle.com/javaee/6/api/", "http://www.antlr2.org/javadoc") + } +} + +groovydoc { + dependsOn classes + groovyClasspath = configurations.compile + use = true + windowtitle = doc.title + doctitle = doc.title + header = doc.title + footer = doc.footer + overview = file("src/main/overview.html") + includePrivate = false + link "http://docs.oracle.com/javaee/6/api/", "javax.servlet.", "javax.management." + link "http://docs.oracle.com/javase/6/docs/api/", "java.", "org.xml.", "javax.", "org.w3c." + link "http://evgeny-goldin.org/javadoc/ant/api/", "org.apache.ant.", "org.apache.tools.ant." + link "http://kentbeck.github.com/junit/javadoc/latest/", "org.junit.", "junit." + link "http://www.antlr2.org/javadoc", "antlr." + link "http://commons.apache.org/cli/api-release", "org.apache.commons.cli." +} + +task docGDK { + destinationDir = "$buildDir/html/groovy-jdk" + inputs.files sourceSets.tools.runtimeClasspath + outputs.dir destinationDir + doFirst {task -> + ant { + java(classname: "org.codehaus.groovy.tools.DocGenerator", fork: "yes", failonerror: "true", + classpath: sourceSets.tools.runtimeClasspath.asPath, + errorproperty: 'edr', + outputproperty: 'odr') { + arg(value: "org.codehaus.groovy.runtime.DefaultGroovyMethods") + arg(value: "org.codehaus.groovy.runtime.SqlGroovyMethods") + arg(value: "org.codehaus.groovy.runtime.SwingGroovyMethods") + arg(value: "org.codehaus.groovy.runtime.XmlGroovyMethods") + arg(value: "org.codehaus.groovy.runtime.EncodingGroovyMethods") + arg(value: "org.codehaus.groovy.runtime.DateGroovyMethods") + arg(value: "org.codehaus.groovy.runtime.ProcessGroovyMethods") + arg(value: "org.codehaus.groovy.runtime.DefaultGroovyStaticMethods") + arg(value: "org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods") + arg(value: "org.codehaus.groovy.vmplugin.v6.PluginDefaultGroovyMethods") + arg(value: "org.codehaus.groovy.vmplugin.v6.PluginStaticGroovyMethods") + } +// println "Out: " + ant.properties.edr +// println "Err: " + ant.properties.odr + } + copy { + into task.destinationDir + from "src/tools/org/codehaus/groovy/tools/groovy.ico", "src/tools/org/codehaus/groovy/tools/stylesheet.css" + } + } +}
  59. Download patch debian/watch

    --- 2.0.0~beta2-1/debian/watch 2011-10-15 02:55:46.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/debian/watch 2012-03-15 13:06:56.000000000 +0000 @@ -1,3 +1,2 @@ version=3 -opts="uversionmangle=s/-beta-/~beta/" \ -http://dist.groovy.codehaus.org/distributions/ groovy-src-(.*).zip debian debian/orig-tar.sh +http://dist.groovy.codehaus.org/distributions/ groovy-src-(.*1\.8.*).zip debian debian/orig-tar.sh
  60. Download patch src/main/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java

    --- 2.0.0~beta2-1/src/main/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java 2012-02-09 20:55:10.000000000 +0000 @@ -76,7 +76,7 @@ public class StreamingMarkupWriter exten StreamingMarkupWriter.this.writingAttribute = writingAttribute; } - public Writer escaped() { + public Writer excaped() { return escapedWriter; }
  61. Download patch src/main/groovy/servlet/TemplateServlet.java
  62. Download patch .gradle/1.0-milestone-6/fileHashes/cache.properties

    --- 2.0.0~beta2-1/.gradle/1.0-milestone-6/fileHashes/cache.properties 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/.gradle/1.0-milestone-6/fileHashes/cache.properties 2012-01-27 14:22:02.000000000 +0000 @@ -0,0 +1 @@ +#Fri Jan 27 09:52:02 CET 2012
  63. Download patch src/main/groovy/xml/dom/DOMCategory.java
  64. Download patch src/main/groovy/grape/GrapeIvy.groovy

    --- 2.0.0~beta2-1/src/main/groovy/grape/GrapeIvy.groovy 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/grape/GrapeIvy.groovy 2012-02-09 20:55:10.000000000 +0000 @@ -194,7 +194,7 @@ class GrapeIvy implements GrapeEngine { public IvyGrabRecord createGrabRecord(Map deps) { // parse the actual dependency arguments String module = deps.module ?: deps.artifactId ?: deps.artifact - if (!module) { + if (!module) { throw new RuntimeException('grab requires at least a module: or artifactId: or artifact: argument') }
  65. Download patch pom.xml

    --- 2.0.0~beta2-1/pom.xml 2011-12-23 19:01:28.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/pom.xml 2012-02-09 22:26:50.000000000 +0000 @@ -8,7 +8,7 @@ <name>Groovy</name> <packaging>jar</packaging> - <version>2.0.0-beta-2</version> + <version>1.8.6</version> <description> Groovy: A powerful, dynamic language for the JVM @@ -44,6 +44,14 @@ </mailingList> </mailingLists> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <distributionManagement> <repository> <id>codehaus.org</id> @@ -377,6 +385,15 @@ <role>Developer</role> </roles> </developer> + <developer> + <name>Cédric Champeau</name> + <id>melix</id> + <email>cedric.champeau@gmail.com</email> + <organization></organization> + <roles> + <role>Developer</role> + </roles> + </developer> </developers> <contributors> @@ -557,15 +574,23 @@ <email></email> </contributor> <contributor> - <name>Cédric Champeau</name> + <name>David Durham</name> <email></email> </contributor> <contributor> - <name>David Durham</name> + <name>Daniel Henrique Alves Lima</name> <email></email> </contributor> <contributor> - <name>Daniel Henrique Alves Lima</name> + <name>John Wagenleitner</name> + <email></email> + </contributor> + <contributor> + <name>Colin Harrington</name> + <email></email> + </contributor> + <contributor> + <name>Brian Alexander</name> <email></email> </contributor> </contributors> @@ -582,7 +607,7 @@ <dependency> <groupId>asm</groupId> <artifactId>asm</artifactId> - <version>3.3.1</version> + <version>3.2</version> <scope>compile</scope> </dependency> <dependency> @@ -659,25 +684,25 @@ <dependency> <groupId>asm</groupId> <artifactId>asm-commons</artifactId> - <version>3.3.1</version> + <version>3.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>asm</groupId> <artifactId>asm-util</artifactId> - <version>3.3.1</version> + <version>3.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>asm</groupId> <artifactId>asm-analysis</artifactId> - <version>3.3.1</version> + <version>3.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>asm</groupId> <artifactId>asm-tree</artifactId> - <version>3.3.1</version> + <version>3.2</version> <scope>compile</scope> </dependency> @@ -856,6 +881,14 @@ <version>1.8.2</version> <scope>test</scope> </dependency> +<!-- + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>test</scope> + </dependency> +--> </dependencies> <!--
  66. Download patch NOTICE.txt

    --- 2.0.0~beta2-1/NOTICE.txt 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/NOTICE.txt 2012-02-09 20:55:10.000000000 +0000 @@ -11,4 +11,3 @@ This product includes software developed by The Groovy community (http://groovy.codehaus.org/). -
  67. Download patch src/main/groovy/swing/impl/TableLayout.java

    --- 2.0.0~beta2-1/src/main/groovy/swing/impl/TableLayout.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/swing/impl/TableLayout.java 2012-02-09 20:55:10.000000000 +0000 @@ -15,6 +15,7 @@ */ package groovy.swing.impl; +import java.awt.Component; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.Insets; @@ -35,6 +36,14 @@ public class TableLayout extends JPanel public TableLayout() { setLayout(new GridBagLayout()); } + + /** + * @deprecated Simply returns this + * @return this + */ + public Component getComponent() { + return this; + } public int getCellpadding() { return cellpadding;
  68. Download patch src/main/groovy/lang/GroovyCodeSource.java

    --- 2.0.0~beta2-1/src/main/groovy/lang/GroovyCodeSource.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/lang/GroovyCodeSource.java 2012-02-09 20:55:10.000000000 +0000 @@ -95,6 +95,31 @@ public class GroovyCodeSource { } } + /** + * Construct a GroovyCodeSource for an inputStream of groovyCode that has an + * unknown provenance -- meaning it didn't come from a File or a URL (e.g.&nbsp;a String). + * The supplied codeBase will be used to construct a File URL that should match up + * with a java Policy entry that determines the grants to be associated with the + * class that will be built from the InputStream. + * <p/> + * The permission groovy.security.GroovyCodeSourcePermission will be used to determine if the given codeBase + * may be specified. That is, the current Policy set must have a GroovyCodeSourcePermission that implies + * the codeBase, or an exception will be thrown. This is to prevent callers from hijacking + * existing codeBase policy entries unless explicitly authorized by the user. + * + * @deprecated Prefer using methods taking a Reader rather than an InputStream to avoid wrong encoding issues. + */ + @Deprecated + public GroovyCodeSource(InputStream inputStream, String name, String codeBase) { + this.name = name; + this.codeSource = createCodeSource(codeBase); + try { + this.scriptText = DefaultGroovyMethods.getText(inputStream); + } catch (IOException e) { + throw new RuntimeException("Impossible to read the text content from that input stream, for script: " + name + " with codeBase: " + codeBase, e); + } + } + public GroovyCodeSource(final File infile, final String encoding) throws IOException { // avoid files which confuse us like ones with .. in path final File file = new File(infile.getCanonicalPath()); @@ -176,6 +201,34 @@ public class GroovyCodeSource { return codeSource; } + /** + * @deprecated Prefer using methods taking a Reader rather than an InputStream to avoid wrong encoding issues. + */ + @Deprecated + public InputStream getInputStream() { + IOException ioe; + if (file == null) { + try { + return new ByteArrayInputStream(scriptText.getBytes("UTF-8")); + } catch (UnsupportedEncodingException e) { + ioe = e; + } + } else { + try { + return new FileInputStream(file); + } catch (FileNotFoundException e) { + ioe = e; + } + } + + String errorMsg = "Impossible to read the bytes from the associated script: " + scriptText + " with name: " + name; + if (ioe != null) { + throw new RuntimeException(errorMsg, ioe); + } else { + throw new RuntimeException(errorMsg); + } + } + public String getScriptText() { return scriptText; }
  69. Download patch src/main/groovy/util/GroovyScriptEngine.java

    --- 2.0.0~beta2-1/src/main/groovy/util/GroovyScriptEngine.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/util/GroovyScriptEngine.java 2012-02-09 20:55:10.000000000 +0000 @@ -16,6 +16,7 @@ package groovy.util; import groovy.lang.Binding; +import groovy.lang.DeprecationException; import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyCodeSource; import groovy.lang.GroovyResourceLoader; @@ -436,6 +437,18 @@ public class GroovyScriptEngine implemen } /** + * @param parentClassLoader ClassLoader to be used as the parent ClassLoader + * for scripts executed by the engine + * @deprecated + */ + public void setParentClassLoader(ClassLoader parentClassLoader) { + throw new DeprecationException( + "The method GroovyScriptEngine#setParentClassLoader(ClassLoader) " + + "is no longer supported. Specify a parentLoader in the constructor instead." + ); + } + + /** * Get the class of the scriptName in question, so that you can instantiate * Groovy objects with caching and reloading. * @@ -466,6 +479,25 @@ public class GroovyScriptEngine implemen } /** + * Get the class of the scriptName in question, so that you can instantiate + * Groovy objects with caching and reloading. + * + * @param scriptName resource name pointing to the script + * @param parentClassLoader the class loader to use when loading the script + * @return the loaded scriptName as a compiled class + * @throws ResourceException if there is a problem accessing the script + * @throws ScriptException if there is a problem parsing the script + * @deprecated + */ + public Class loadScriptByName(String scriptName, ClassLoader parentClassLoader) + throws ResourceException, ScriptException { + throw new DeprecationException( + "The method GroovyScriptEngine#loadScriptByName(String,ClassLoader) " + + "is no longer supported. Use GroovyScriptEngine#loadScriptByName(String) instead." + ); + } + + /** * Run a script identified by name with a single argument. * * @param scriptName name of the script to run
  70. Download patch src/main/groovy/transform/CompilationUnitAware.java

    --- 2.0.0~beta2-1/src/main/groovy/transform/CompilationUnitAware.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/transform/CompilationUnitAware.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -package groovy.transform; -/** - * Created by IntelliJ IDEA. - * User: cedric - * Date: 06/10/11 - * Time: 15:02 - */ - -import org.codehaus.groovy.control.CompilationUnit; - -/** - * This interface is for AST transformations which must be aware of the compilation unit where they are applied. - * - * @author Cedric Champeau - */ -public interface CompilationUnitAware { - void setCompilationUnit(CompilationUnit unit); -}
  71. Download patch src/main/groovy/lang/Immutable.java

    --- 2.0.0~beta2-1/src/main/groovy/lang/Immutable.java 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/lang/Immutable.java 2012-02-09 20:55:10.000000000 +0000 @@ -0,0 +1,126 @@ +/* + * Copyright 2008 the original author or authors. + * + * Licensed 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 groovy.lang; + +import org.codehaus.groovy.transform.GroovyASTTransformationClass; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Note: This class is Deprecated, please use groovy.transform.Immutable. + * <p/> + * Class annotation used to assist in the creation of immutable classes. + * <p/> + * It allows you to write classes in this shortened form: + * <pre> + * {@code @Immutable} class Customer { + * String first, last + * int age + * Date since + * Collection favItems + * } + * def d = new Date() + * def c1 = new Customer(first:'Tom', last:'Jones', age:21, since:d, favItems:['Books', 'Games']) + * def c2 = new Customer('Tom', 'Jones', 21, d, ['Books', 'Games']) + * assert c1 == c2 + * </pre> + * The {@code @Immutable} annotation instructs the compiler to execute an + * AST transformation which adds the necessary getters, constructors, + * equals, hashCode and other helper methods that are typically written + * when creating immutable classes with the defined properties. + * <p/> + * A class created in this way has the following characteristics: + * <ul> + * <li>The class is automatically made final. + * <li>Properties must be of an immutable type or a type with a strategy for handling non-immutable + * characteristics. Specifically, the type must be one of the primitive or wrapper types, Strings, enums, + * other {@code @Immutable} classes or known immutables (e.g. java.awt.Color, java.net.URI). Also handled are + * Cloneable classes, collections, maps and arrays, and other "effectively immutable" classes with + * special handling (e.g. java.util.Date). + * <li>Properties automatically have private, final backing fields with getters. + * Attempts to update the property will result in a {@code ReadOnlyPropertyException}. + * <li>A map-based constructor is provided which allows you to set properties by name. + * <li>A tuple-style constructor is provided which allows you to set properties in the same order as they are defined. + * <li>Default {@code equals}, {@code hashCode} and {@code toString} methods are provided based on the property values. + * Though not normally required, you may write your own implementations of these methods. For {@code equals} and {@code hashCode}, + * if you do write your own method, it is up to you to obey the general contract for {@code equals} methods and supply + * a corresponding matching {@code hashCode} method. + * If you do provide one of these methods explicitly, the default implementation will be made available in a private + * "underscore" variant which you can call. E.g., you could provide a (not very elegant) multi-line formatted + * {@code toString} method for {@code Customer} above as follows: + * <pre> + * String toString() { + * _toString().replaceAll(/\(/, '(\n\t').replaceAll(/\)/, '\n)').replaceAll(/, /, '\n\t') + * } + * </pre> + * If an "underscore" version of the respective method already exists, then no default implementation is provided. + * <li>{@code Date}s, {@code Cloneable}s and arrays are defensively copied on the way in (constructor) and out (getters). + * Arrays and {@code Cloneable} objects use the {@code clone} method. For your own classes, + * it is up to you to define this method and use deep cloning if appropriate. + * <li>{@code Collection}s and {@code Map}s are wrapped by immutable wrapper classes (but not deeply cloned!). + * Attempts to update them will result in an {@code UnsupportedOperationException}. + * <li>Fields that are enums or other {@code @Immutable} classes are allowed but for an + * otherwise possible mutable property type, an error is thrown. + * <li>You don't have to follow Groovy's normal property conventions, e.g. you can create an explicit private field and + * then you can write explicit get and set methods. Such an approach, isn't currently prohibited (to give you some + * wiggle room to get around these conventions) but any fields created in this way are deemed not to be part of the + * significant state of the object and aren't factored into the {@code equals} or {@code hashCode} methods. + * Similarly, you may use static properties (though usually this is discouraged) and these too will be ignored + * as far as significant state is concerned. If you do break standard conventions, you do so at your own risk and + * your objects may no longer be immutable. It is up to you to ensure that your objects remain immutable at least + * to the extent expected in other parts of your program! + * </ul> + * <p/> + * Immutable classes are particularly useful for functional and concurrent styles of programming + * and for use as key values within maps. + * <p/> + * Limitations: + * <ul> + * <li> + * As outlined above, Arrays and {@code Cloneable} objects use the {@code clone} method. For your own classes, + * it is up to you to define this method and use deep cloning if appropriate. + * </li> + * <li> + * As outlined above, {@code Collection}s and {@code Map}s are wrapped by immutable wrapper classes (but not deeply cloned!). + * </li> + * <li> + * Currently {@code BigInteger} and {@code BigDecimal} are deemed immutable but see: + * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6348370 + * </li> + * <li> + * {@code java.awt.Color} is treated as "effectively immutable" but is not final so while not normally used with child + * classes, it isn't strictly immutable. Use at your own risk. + * </li> + * <li> + * {@code java.util.Date} is treated as "effectively immutable" but is not final so it isn't strictly immutable. + * Use at your own risk. + * </li> + * </ul> + * + * @author Paul King + * @deprecated use groovy.transform.Immutable + */ +@java.lang.annotation.Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +@GroovyASTTransformationClass("org.codehaus.groovy.transform.ImmutableASTTransformation") +@Deprecated +public @interface Immutable { +}
  72. Download patch src/main/groovy/swing/factory/CellEditorFactory.groovy

    --- 2.0.0~beta2-1/src/main/groovy/swing/factory/CellEditorFactory.groovy 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/swing/factory/CellEditorFactory.groovy 2012-02-09 20:55:10.000000000 +0000 @@ -18,6 +18,7 @@ package groovy.swing.factory import groovy.swing.impl.ClosureCellEditor import java.awt.Component +import javax.swing.JTree /** * @author Alexander Klein
  73. Download patch src/main/groovy/ui/InteractiveShell.java
  74. Download patch src/main/groovy/lang/GroovyShell.java

    --- 2.0.0~beta2-1/src/main/groovy/lang/GroovyShell.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/lang/GroovyShell.java 2012-02-09 20:55:10.000000000 +0000 @@ -21,6 +21,7 @@ import groovy.security.GroovyCodeSourceP import org.codehaus.groovy.control.CompilationFailedException; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.runtime.InvokerHelper; +import org.codehaus.groovy.runtime.DefaultGroovyMethods; import org.codehaus.groovy.runtime.InvokerInvocationException; import java.io.*; @@ -31,6 +32,7 @@ import java.security.PrivilegedAction; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import java.util.List; +import java.util.Map; /** * Represents a groovy shell capable of running arbitrary groovy scripts @@ -44,6 +46,9 @@ public class GroovyShell extends GroovyO public static final String DEFAULT_CODE_BASE = "/groovy/shell"; + @Deprecated + public static final String[] EMPTY_ARGS = {}; + private Binding context; private int counter; private CompilerConfiguration config; @@ -93,6 +98,12 @@ public class GroovyShell extends GroovyO this.context = binding; this.config = config; } + + @Deprecated + public void initializeBinding() { + Map map = context.getVariables(); + if (map.get("shell")==null) map.put("shell",this); + } public void resetLoadedClasses() { loader.clearCache(); @@ -523,6 +534,32 @@ public class GroovyShell extends GroovyO return runScriptOrMainOrTestOrRunnable(scriptClass, args); } + /** + * Runs the given script with command line arguments + * + * @param in the stream reading the script + * @param fileName is the logical file name of the script (which is used to create the class name of the script) + * @param args the command line arguments to pass in + * + * @deprecated Prefer using methods taking a Reader rather than an InputStream to avoid wrong encoding issues. + */ + public Object run(final InputStream in, final String fileName, String[] args) throws CompilationFailedException { + GroovyCodeSource gcs = AccessController.doPrivileged(new PrivilegedAction<GroovyCodeSource>() { + public GroovyCodeSource run() { + try { + String scriptText = config.getSourceEncoding() != null ? + DefaultGroovyMethods.getText(in, config.getSourceEncoding()) : + DefaultGroovyMethods.getText(in); + return new GroovyCodeSource(scriptText, fileName, DEFAULT_CODE_BASE); + } catch (IOException e) { + throw new RuntimeException("Impossible to read the content of the input stream for file named: " + fileName, e); + } + } + }); + Class scriptClass = parseClass(gcs); + return runScriptOrMainOrTestOrRunnable(scriptClass, args); + } + public Object getVariable(String name) { return context.getVariables().get(name); } @@ -618,6 +655,37 @@ public class GroovyShell extends GroovyO } } + /** + * Evaluates some script against the current Binding and returns the result + * + * @param in the stream reading the script + * + * @deprecated Prefer using methods taking a Reader rather than an InputStream to avoid wrong encoding issues. + */ + public Object evaluate(InputStream in) throws CompilationFailedException { + return evaluate(in, generateScriptName()); + } + + /** + * Evaluates some script against the current Binding and returns the result + * + * @param in the stream reading the script + * @param fileName is the logical file name of the script (which is used to create the class name of the script) + * + * @deprecated Prefer using methods taking a Reader rather than an InputStream to avoid wrong encoding issues. + */ + public Object evaluate(InputStream in, String fileName) throws CompilationFailedException { + Script script = null; + try { + script = parse(in, fileName); + script.setBinding(context); + return script.run(); + } finally { + if (script != null) { + InvokerHelper.removeClass(script.getClass()); + } + } + } /** * Parses the given script and returns it ready to be run @@ -631,6 +699,31 @@ public class GroovyShell extends GroovyO } /** + * Parses the given script and returns it ready to be run + * + * @param in the stream reading the script + * @param fileName is the logical file name of the script (which is used to create the class name of the script) + * @return the parsed script which is ready to be run via @link Script.run() + * + * @deprecated Prefer using methods taking a Reader rather than an InputStream to avoid wrong encoding issues. + */ + public Script parse(final InputStream in, final String fileName) throws CompilationFailedException { + GroovyCodeSource gcs = AccessController.doPrivileged(new PrivilegedAction<GroovyCodeSource>() { + public GroovyCodeSource run() { + try { + String scriptText = config.getSourceEncoding() != null ? + DefaultGroovyMethods.getText(in, config.getSourceEncoding()) : + DefaultGroovyMethods.getText(in); + return new GroovyCodeSource(scriptText, fileName, DEFAULT_CODE_BASE); + } catch (IOException e) { + throw new RuntimeException("Impossible to read the content of the input stream for file named: " + fileName, e); + } + } + }); + return parse(gcs); + } + + /** * Parses the groovy code contained in codeSource and returns a java class. */ private Class parseClass(final GroovyCodeSource codeSource) throws CompilationFailedException { @@ -686,6 +779,17 @@ public class GroovyShell extends GroovyO return parse(in, generateScriptName()); } + /** + * Parses the given script and returns it ready to be run + * + * @param in the stream reading the script + * + * @deprecated Prefer using methods taking a Reader rather than an InputStream to avoid wrong encoding issues. + */ + public Script parse(InputStream in) throws CompilationFailedException { + return parse(in, generateScriptName()); + } + protected synchronized String generateScriptName() { return "Script" + (++counter) + ".groovy"; }
  75. Download patch src/main/groovy/grape/GrabAnnotationTransformation.java
  76. Download patch gradle.properties

    --- 2.0.0~beta2-1/gradle.properties 2011-12-23 19:01:22.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/gradle.properties 2012-02-09 22:26:44.000000000 +0000 @@ -1,6 +1,6 @@ -groovyVersion = 2.0.0-beta-2 +groovyVersion = 1.8.6 # bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3 only digits) -groovyBundleVersion = 2.0.0.beta-2 +groovyBundleVersion = 1.8.6 # Many people have reported problems testing UberTestCaseGroovySourceSubPackages, others have no difficulties with the default # values ant junit task uses. The decision has been taken to provide the values to try and cause the least
  77. Download patch .gradle/1.0-milestone-6/outputFileStates/cache.properties

    --- 2.0.0~beta2-1/.gradle/1.0-milestone-6/outputFileStates/cache.properties 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/.gradle/1.0-milestone-6/outputFileStates/cache.properties 2012-01-27 14:22:02.000000000 +0000 @@ -0,0 +1 @@ +#Fri Jan 27 09:52:01 CET 2012
  78. Download patch build.xml
  79. Download patch src/main/groovy/json/JsonLexer.java

    --- 2.0.0~beta2-1/src/main/groovy/json/JsonLexer.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/json/JsonLexer.java 2012-02-09 20:55:10.000000000 +0000 @@ -105,12 +105,17 @@ public class JsonLexer implements Iterat StringBuilder currentContent = new StringBuilder("\""); // consume the first double quote starting the string reader.read(); + boolean isEscaped = false; for (;;) { int read = reader.read(); if (read == -1) return null; - currentContent.append((char) read); - if (currentContent.charAt(currentContent.length() - 1) == '"' && currentContent.charAt(currentContent.length() - 2) != '\\' && + isEscaped = (!isEscaped && currentContent.charAt(currentContent.length() - 1) == '\\'); + + char charRead = (char) read; + currentContent.append(charRead); + + if (charRead == '"' && !isEscaped && possibleTokenType.matching(currentContent.toString())) { token.setEndLine(reader.getLine()); token.setEndColumn(reader.getColumn()); @@ -248,4 +253,4 @@ public class JsonLexer implements Iterat throw new UnsupportedOperationException("The method remove() is not supported on this lexer."); } -} \ No newline at end of file +}
  80. Download patch config/maven/groovy-tools.pom

    --- 2.0.0~beta2-1/config/maven/groovy-tools.pom 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/config/maven/groovy-tools.pom 2012-02-09 20:55:10.000000000 +0000 @@ -53,7 +53,7 @@ <dependency> <groupId>asm</groupId> <artifactId>asm</artifactId> - <version>3.3.1</version> + <version>3.2</version> </dependency> <!-- used for the JavaDoc generator script -->
  81. Download patch src/main/groovy/grape/GrapeEngine.java

    --- 2.0.0~beta2-1/src/main/groovy/grape/GrapeEngine.java 2011-08-30 16:20:16.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/grape/GrapeEngine.java 2012-02-06 15:05:22.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2008-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,7 @@ import java.util.Map; import java.net.URI; /** - * User: Danno.Ferrin - * Date: Sep 30, 2008 - * Time: 9:30:46 PM + * @author Danno Ferrin */ public interface GrapeEngine {
  82. Download patch src/main/org/codehaus/groovy/antlr/groovy.g

    --- 2.0.0~beta2-1/src/main/org/codehaus/groovy/antlr/groovy.g 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/org/codehaus/groovy/antlr/groovy.g 2012-02-09 20:55:10.000000000 +0000 @@ -226,7 +226,7 @@ tokens { STATIC_IMPORT; ENUM_DEF; ENUM_CONSTANT_DEF; FOR_EACH_CLAUSE; ANNOTATION_DEF; ANNOTATIONS; ANNOTATION; ANNOTATION_MEMBER_VALUE_PAIR; ANNOTATION_FIELD_DEF; ANNOTATION_ARRAY_INIT; TYPE_ARGUMENTS; TYPE_ARGUMENT; TYPE_PARAMETERS; TYPE_PARAMETER; WILDCARD_TYPE; - TYPE_UPPER_BOUNDS; TYPE_LOWER_BOUNDS; CLOSURE_LIST;MULTICATCH;MULTICATCH_TYPES; + TYPE_UPPER_BOUNDS; TYPE_LOWER_BOUNDS; CLOSURE_LIST; } { @@ -415,7 +415,7 @@ tokens { } private void dumpTree(AST ast, String offset) { - dump(ast, offset); + dump(ast, offset); for (AST node = ast.getFirstChild(); node != null; node = node.getNextSibling()) { dumpTree(node, offset+"\t"); } @@ -765,7 +765,6 @@ wildcardType typeArgumentsDiamond {Token first = LT(1);} : LT! GT! nls! - {#typeArgumentsDiamond = #(create(TYPE_ARGUMENTS, "TYPE_ARGUMENTS",first,LT(1)), #typeArgumentsDiamond);} ; // Type arguments to a class or interface type @@ -1664,26 +1663,6 @@ parameterDeclaration! } ; -multicatch_types -{Token first = LT(1);} - : - nls! - classOrInterfaceType[false] - ( - BOR! nls! classOrInterfaceType[false] - )* - - {#multicatch_types = #(create(MULTICATCH_TYPES, "MULTICATCH_TYPES",first,LT(1)), #multicatch_types);} - ; - -multicatch -{Token first = LT(1);} - : nls! (FINAL)? ("def")? (m:multicatch_types)? id:IDENT! - { - #multicatch = #(create(MULTICATCH,"MULTICATCH",first, LT(1)),m,id); - } - ; - /*OBS* variableLengthParameterDeclaration! {Token first = LT(1);} : pm:parameterModifier t:typeSpec[false] TRIPLE_DOT! id:IDENT @@ -2199,7 +2178,7 @@ finallyClause {Token first = LT(1);} // an exception handler handler {Token first = LT(1);} - : "catch"! LPAREN! pd:multicatch! RPAREN! nlsWarn! handlerCs:compoundStatement! + : "catch"! LPAREN! pd:parameterDeclaration! RPAREN! nlsWarn! handlerCs:compoundStatement! {#handler = #(create(LITERAL_catch,"catch",first,LT(1)),pd,handlerCs);} ; @@ -2210,7 +2189,7 @@ handler {Token first = LT(1);} */ commandArguments[AST head] { - Token first = LT(1); + Token first = LT(1); } : commandArgument ( options {greedy=true;}: COMMA! nls! commandArgument )* @@ -2231,7 +2210,7 @@ commandArguments[AST head] commandArgumentsGreedy[AST head] { - AST prev = #head; + AST prev = #head; } : @@ -4187,22 +4166,6 @@ options { // TODO: Recognize all the Java identifier parts here (except '$'). ; -protected -DIGITS_WITH_UNDERSCORE -options { - paraphrase="a sequence of digits and underscores, bordered by digits"; -} - : DIGIT (DIGITS_WITH_UNDERSCORE_OPT)? - ; - -protected -DIGITS_WITH_UNDERSCORE_OPT -options { - paraphrase="a sequence of digits and underscores with maybe underscore starting"; -} - : (DIGIT | '_')* DIGIT - ; - // a numeric literal NUM_INT options { @@ -4230,29 +4193,27 @@ options { *OBS*/ // TODO: This complex pattern seems wrong. Verify or fix. ( '0' {isDecimal = true;} // special case for just '0' - ( // hex digits - ('x'|'X') - {isDecimal = false;} - HEX_DIGIT - ( options { warnWhenFollowAmbig=false; } - : (options { warnWhenFollowAmbig=false; } : HEX_DIGIT | '_')* - HEX_DIGIT - )? - - | //binary literal - ('b'|'B') ('0'|'1') (('0'|'1'|'_')* ('0'|'1'))? + ( ('x'|'X') {isDecimal = false;} + ( // hex + // the 'e'|'E' and float suffix stuff look + // like hex digits, hence the (...)+ doesn't + // know when to stop: ambig. ANTLR resolves + // it correctly by matching immediately. It + // is therefor ok to hush warning. + options { + warnWhenFollowAmbig=false; + } + : HEX_DIGIT + )+ | //float or double with leading zero - ( DIGITS_WITH_UNDERSCORE - ( '.' DIGITS_WITH_UNDERSCORE | EXPONENT | FLOAT_SUFFIX) - ) => DIGITS_WITH_UNDERSCORE + (('0'..'9')+ ('.'('0'..'9')|EXPONENT|FLOAT_SUFFIX)) => ('0'..'9')+ - | // octal - ('0'..'7') (('0'..'7'|'_')* ('0'..'7'))? + | ('0'..'7')+ // octal {isDecimal = false;} )? - | ('1'..'9') (DIGITS_WITH_UNDERSCORE_OPT)? {isDecimal=true;} // non-zero decimal + | ('1'..'9') ('0'..'9')* {isDecimal=true;} // non-zero decimal ) ( ('l'|'L') { _ttype = NUM_LONG; } | ('i'|'I') { _ttype = NUM_INT; } @@ -4262,7 +4223,7 @@ options { | (~'.' | '.' ('0'..'9')) => {isDecimal}? - ( '.' DIGITS_WITH_UNDERSCORE (e:EXPONENT)? (f2:FLOAT_SUFFIX {t=f2;} | g2:BIG_SUFFIX {t=g2;})? + ( '.' ('0'..'9')+ (EXPONENT)? (f2:FLOAT_SUFFIX {t=f2;} | g2:BIG_SUFFIX {t=g2;})? | EXPONENT (f3:FLOAT_SUFFIX {t=f3;} | g3:BIG_SUFFIX {t=g3;})? | f4:FLOAT_SUFFIX {t=f4;} ) @@ -4294,7 +4255,7 @@ EXPONENT options { paraphrase="an exponent"; } - : ('e'|'E') ('+'|'-')? ('0'..'9'|'_')* ('0'..'9') + : ('e'|'E') ('+'|'-')? ('0'..'9')+ ;
  83. Download patch src/main/groovy/util/ConfigSlurper.groovy

    --- 2.0.0~beta2-1/src/main/groovy/util/ConfigSlurper.groovy 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/util/ConfigSlurper.groovy 2012-02-09 20:55:10.000000000 +0000 @@ -15,6 +15,7 @@ */ package groovy.util +import java.beans.Introspector import java.beans.BeanInfo import org.codehaus.groovy.runtime.InvokerHelper @@ -77,6 +78,7 @@ class ConfigSlurper { def tokens = key.split(/\./) def current = config + def currentToken def last def lastToken def foundBase = false
  84. Download patch src/main/groovy/swing/impl/Startable.java

    --- 2.0.0~beta2-1/src/main/groovy/swing/impl/Startable.java 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/swing/impl/Startable.java 2012-02-09 20:55:10.000000000 +0000 @@ -0,0 +1,29 @@ +/* + * Copyright 2003-2007 the original author or authors. + * + * Licensed 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 groovy.swing.impl; + +/** + * A simple lifecycle method called when an object is fully constructed. + * + * @author <a href="mailto:james@coredevelopers.net">James Strachan</a> + * @version $Revision$ + * @deprecated This interface is no longer used internally and there + * exists no equivalent functionality. + * Superceded by FactoryBuilderSupport handling. + */ +public interface Startable { + void start(); +}
  85. Download patch src/examples/transforms/global/CompiledAtExample.groovy

    --- 2.0.0~beta2-1/src/examples/transforms/global/CompiledAtExample.groovy 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/examples/transforms/global/CompiledAtExample.groovy 2012-02-09 20:55:10.000000000 +0000 @@ -6,10 +6,10 @@ package transforms.global * @author Hamlet D'Arcy */ -println 'Script compiled at: ' + compiledTime +println 'Script compiled at: ' + getCompiledTime() class MyClass { } -println 'Class compiled at: ' + MyClass.compiledTime +println 'Class compiled at: ' + MyClass.getCompiledTime()
  86. Download patch src/main/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy

    --- 2.0.0~beta2-1/src/main/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy 2011-12-16 05:24:20.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/inspect/swingui/AstNodeToScriptAdapter.groovy 2012-02-09 20:50:34.000000000 +0000 @@ -448,7 +448,7 @@ class AstNodeToScriptVisitor extends Pri Expression exp = node.initialValueExpression if (exp instanceof ConstantExpression) exp = Verifier.transformToPrimitiveConstantIfPossible(exp) ClassNode type = exp?.type - if (Modifier.isStatic(node.modifiers) + if (Modifier.isStatic(node.modifiers) && Modifier.isFinal(node.getModifiers()) && exp instanceof ConstantExpression && type == node.type && ClassHelper.isStaticConstantInitializerType(type)) {
  87. Download patch src/main/groovy/transform/TypeChecked.java

    --- 2.0.0~beta2-1/src/main/groovy/transform/TypeChecked.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/transform/TypeChecked.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -/* - * Copyright 2003-2011 the original author or authors. - * - * Licensed 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 groovy.transform; - -import java.lang.annotation.*; - -import org.codehaus.groovy.transform.GroovyASTTransformationClass; - -/** - * This will let the Groovy compiler use compile time checks in the style of Java. - * @author <a href="mailto:blackdrag@gmx.org">Jochen "blackdrag" Theodorou</a> - */ -@java.lang.annotation.Documented -@Retention(RetentionPolicy.SOURCE) -@Target({ ElementType.METHOD, ElementType.TYPE, - ElementType.CONSTRUCTOR -}) -@GroovyASTTransformationClass("org.codehaus.groovy.transform.StaticTypesTransformation") -public @interface TypeChecked { -} \ No newline at end of file
  88. Download patch src/main/groovy/swing/factory/ComponentFactory.groovy

    --- 2.0.0~beta2-1/src/main/groovy/swing/factory/ComponentFactory.groovy 2011-08-30 16:20:16.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/swing/factory/ComponentFactory.groovy 2012-02-07 18:53:16.000000000 +0000 @@ -18,6 +18,8 @@ package groovy.swing.factory import java.awt.Component import java.awt.Window +import javax.swing.JComponent +import static groovy.swing.factory.LayoutFactory.DEFAULT_DELEGATE_PROPERTY_CONSTRAINT class ComponentFactory extends BeanFactory { @@ -37,6 +39,9 @@ class ComponentFactory extends BeanFacto def constraints = builder.context.constraints if (constraints != null) { LayoutFactory.getLayoutTarget(parent).add(child, constraints) + if (child instanceof JComponent) { + child.putClientProperty(DEFAULT_DELEGATE_PROPERTY_CONSTRAINT, constraints) + } builder.context.remove('constraints') } else { LayoutFactory.getLayoutTarget(parent).add(child)
  89. Download patch src/main/groovy/sql/Sql.java

    --- 2.0.0~beta2-1/src/main/groovy/sql/Sql.java 2011-12-06 17:28:16.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/sql/Sql.java 2012-02-06 15:03:26.000000000 +0000 @@ -362,34 +362,42 @@ public class Sql { * @throws ClassNotFoundException if the class cannot be found or loaded */ public static Sql newInstance(Map<String, Object> args) throws SQLException, ClassNotFoundException { + if (!args.containsKey("url")) + throw new IllegalArgumentException("Argument 'url' is required"); + + if (args.get("url") == null) + throw new IllegalArgumentException("Argument 'url' must not be null"); + if (args.containsKey("driverClassName") && args.containsKey("driver")) throw new IllegalArgumentException("Only one of 'driverClassName' and 'driver' should be provided"); - Object driverClassName = args.remove("driverClassName"); - if (driverClassName == null) driverClassName = args.remove("driver"); - if (driverClassName != null) loadDriver(driverClassName.toString()); - Object url = args.remove("url"); - if (url == null) throw new IllegalArgumentException("Argument 'url' is required"); + // Make a copy so destructive operations will not affect the caller + Map<String, Object> sqlArgs = new HashMap<String, Object>(args); + + Object driverClassName = sqlArgs.remove("driverClassName"); + if (driverClassName == null) driverClassName = sqlArgs.remove("driver"); + if (driverClassName != null) loadDriver(driverClassName.toString()); - Properties props = (Properties) args.remove("properties"); - if (props != null && args.containsKey("user")) + Properties props = (Properties) sqlArgs.remove("properties"); + if (props != null && sqlArgs.containsKey("user")) throw new IllegalArgumentException("Only one of 'properties' and 'user' should be supplied"); - if (props != null && args.containsKey("password")) + if (props != null && sqlArgs.containsKey("password")) throw new IllegalArgumentException("Only one of 'properties' and 'password' should be supplied"); - if (args.containsKey("user") ^ args.containsKey("password")) + if (sqlArgs.containsKey("user") ^ sqlArgs.containsKey("password")) throw new IllegalArgumentException("Found one but not both of 'user' and 'password'"); + Object url = sqlArgs.remove("url"); Connection connection; - if (props != null) connection = DriverManager.getConnection(url.toString(), props); - else if (args.containsKey("user")) { - Object user = args.remove("user"); - Object password = args.remove("password"); + if (props != null) connection = DriverManager.getConnection(url.toString(), new Properties(props)); + else if (sqlArgs.containsKey("user")) { + Object user = sqlArgs.remove("user"); + Object password = sqlArgs.remove("password"); connection = DriverManager.getConnection(url.toString(), (user == null ? null : user.toString()), (password == null ? null : password.toString())); } else connection = DriverManager.getConnection(url.toString()); - Sql result = (Sql) InvokerHelper.invokeConstructorOf(Sql.class, args); + Sql result = (Sql) InvokerHelper.invokeConstructorOf(Sql.class, sqlArgs); result.setConnection(connection); return result; }
  90. Download patch src/main/groovy/util/slurpersupport/Node.java

    --- 2.0.0~beta2-1/src/main/groovy/util/slurpersupport/Node.java 2011-12-06 17:28:16.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/util/slurpersupport/Node.java 2012-02-06 15:03:26.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright 2003-2010 the original author or authors. + * Copyright 2003-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -88,7 +88,6 @@ public class Node implements Writable { }); } - protected void replaceBody(final Object newValue) { this.children.clear(); this.children.add(newValue); @@ -112,18 +111,15 @@ public class Node implements Writable { * @see org.codehaus.groovy.sandbox.util.slurpersupport.Node#text() */ public String text() { - final StringBuffer buff = new StringBuffer(); - final Iterator iter = this.children.iterator(); - while (iter.hasNext()) { - final Object child = iter.next(); - + final StringBuilder sb = new StringBuilder(); + for (Object child : this.children) { if (child instanceof Node) { - buff.append(((Node) child).text()); + sb.append(((Node) child).text()); } else { - buff.append(child); + sb.append(child); } } - return buff.toString(); + return sb.toString(); } /* (non-Javadoc) @@ -154,7 +150,6 @@ public class Node implements Writable { private Object getNextElementNodes() { while (iter.hasNext()) { final Object node = iter.next(); - if (node instanceof Node) { return node; } @@ -169,9 +164,7 @@ public class Node implements Writable { */ public Writer writeTo(final Writer out) throws IOException { if (this.replacementNodeStack.empty()) { - final Iterator iter = this.children.iterator(); - while (iter.hasNext()) { - final Object child = iter.next(); + for (Object child : this.children) { if (child instanceof Writable) { ((Writable) child).writeTo(out); } else { @@ -179,7 +172,6 @@ public class Node implements Writable { } } return out; - } else { return ((Writable) this.replacementNodeStack.peek()).writeTo(out); } @@ -190,7 +182,6 @@ public class Node implements Writable { final Closure rest = new Closure(null) { public Object doCall(final Object o) { buildChildren(builder, namespaceMap, namespaceTagHints); - return null; } }; @@ -210,18 +201,13 @@ public class Node implements Writable { builder.invokeMethod(this.name, new Object[]{this.attributes, rest}); } else { final Map attributesWithNamespaces = new HashMap(this.attributes); - final Iterator attrs = this.attributes.keySet().iterator(); - - while (attrs.hasNext()) { - final Object key = attrs.next(); + for (Object key : this.attributes.keySet()) { final Object attributeNamespaceURI = this.attributeNamespaces.get(key); - if (attributeNamespaceURI != null) { attributesWithNamespaces.put(getTagFor(attributeNamespaceURI, current, pending, namespaceMap, namespaceTagHints, newTags, builder) + "$" + key, attributesWithNamespaces.remove(key)); } } - builder.getProperty(getTagFor(this.namespaceURI, current, pending, namespaceMap, namespaceTagHints, newTags, builder)); builder.invokeMethod(this.name, new Object[]{attributesWithNamespaces, rest}); } @@ -229,7 +215,6 @@ public class Node implements Writable { // remove the new tags we had to define for this element if (!newTags.isEmpty()) { final Iterator iter = newTags.iterator(); - do { pending.remove(iter.next()); } while (iter.hasNext()); @@ -257,7 +242,6 @@ public class Node implements Writable { if (tag == null || tag.length() == 0) { // otherwise make up a new tag and check it has not been used before int suffix = 0; - do { final String possibleTag = "tag" + suffix++; @@ -279,9 +263,8 @@ public class Node implements Writable { private static String findNamespaceTag(final Map tagMap, final Object namespaceURI) { if (tagMap.containsValue(namespaceURI)) { - final Iterator entries = tagMap.entrySet().iterator(); - while (entries.hasNext()) { - final Map.Entry entry = (Map.Entry) entries.next(); + for (Object o : tagMap.entrySet()) { + final Map.Entry entry = (Map.Entry) o; if (namespaceURI.equals(entry.getValue())) { return (String) entry.getKey(); } @@ -291,9 +274,7 @@ public class Node implements Writable { } private void buildChildren(final GroovyObject builder, final Map namespaceMap, final Map<String, String> namespaceTagHints) { - final Iterator iter = this.children.iterator(); - while (iter.hasNext()) { - final Object child = iter.next(); + for (Object child : this.children) { if (child instanceof Node) { ((Node) child).build(builder, namespaceMap, namespaceTagHints); } else if (child instanceof Buildable) {
  91. Download patch .project

    --- 2.0.0~beta2-1/.project 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/.project 2012-02-09 20:55:10.000000000 +0000 @@ -1,29 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>groovy</name> - <comment>Groovy: A powerful, dynamic language for the JVM</comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>full,incremental,</triggers> - <arguments> - <dictionary> - <key>LaunchConfigHandle</key> - <value>&lt;project&gt;/.externalToolBuilders/Groovy ensureGrammars.launch</value> - </dictionary> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.groovy.core.groovyNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.codehaus.groovy.eclipse.groovyNature</nature> - </natures> + <name>groovy</name> + <comment>Groovy: A powerful, dynamic language for the JVM</comment> + <projects/> + <buildSpec> + <buildCommand> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>full,incremental,</triggers> + <arguments> + <dictionary> + <key>LaunchConfigHandle</key> + <value>&lt;project&gt;/.externalToolBuilders/Groovy ensureGrammars.launch</value> + </dictionary> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + <buildCommand> + <name>org.codehaus.groovy.eclipse.groovyBuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.codehaus.groovy.eclipse.groovyNature</nature> + </natures> </projectDescription>
  92. Download patch .gradle/1.0-milestone-6/taskArtifacts/cache.properties

    --- 2.0.0~beta2-1/.gradle/1.0-milestone-6/taskArtifacts/cache.properties 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/.gradle/1.0-milestone-6/taskArtifacts/cache.properties 2012-01-27 14:18:30.000000000 +0000 @@ -0,0 +1 @@ +#Fri Jan 27 09:48:29 CET 2012
  93. Download patch gradle/assemble.gradle

    --- 2.0.0~beta2-1/gradle/assemble.gradle 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/gradle/assemble.gradle 2012-02-09 20:55:10.000000000 +0000 @@ -110,8 +110,6 @@ task jarAll(type: Jar, dependsOn: jar) { }.each {jarjarFile -> zipfileset(src: jarjarFile) } - zipfileset(src: configurations.runtime.files.find { file -> file.name.startsWith('asm-util') }, - includes: 'org/objectweb/asm/util/AbstractVisitor.class,org/objectweb/asm/util/Trace*') rule pattern: "antlr.**", result: "groovyjarjarantlr.@1" rule pattern: "org.objectweb.**", result: "groovyjarjarasm.@1" rule pattern: "org.apache.commons.cli.**", result: "groovyjarjarcommonscli.@1"
  94. Download patch src/bin/groovysh.bat

    --- 2.0.0~beta2-1/src/bin/groovysh.bat 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/bin/groovysh.bat 2012-02-09 20:55:10.000000000 +0000 @@ -12,7 +12,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=.\ -set CLASSNAME=org.codehaus.groovy.tools.shell.Main +set CLASSNAME=groovy.ui.InteractiveShell +if "%OLDSHELL%" == "" set CLASSNAME=org.codehaus.groovy.tools.shell.Main "%DIRNAME%\startGroovy.bat" "%DIRNAME%" %CLASSNAME% %*
  95. Download patch config/codenarc/codenarc.groovy
  96. Download patch src/main/org/codehaus/groovy/antlr/parser/GroovyLexer.java
  97. Download patch src/main/groovy/util/FactoryBuilderSupport.java
  98. Download patch src/main/groovy/ui/GroovyMain.java

    --- 2.0.0~beta2-1/src/main/groovy/ui/GroovyMain.java 2011-12-21 14:42:00.000000000 +0000 +++ 2.0.0~beta2+isreally1.8.6-0ubuntu1/src/main/groovy/ui/GroovyMain.java 2012-02-09 20:55:10.000000000 +0000 @@ -23,6 +23,7 @@ import groovy.lang.Script; import java.io.*; import java.math.BigInteger; +import java.net.MalformedURLException; import java.net.URL; import java.util.Iterator; import java.util.List; @@ -233,10 +234,6 @@ public class GroovyMain { .withDescription("split lines using splitPattern (default '\\s') using implicit 'split' variable") .withLongOpt("autosplit") .create('a')); - options.addOption( - OptionBuilder.withLongOpt("indy") - .withDescription("enables compilation using invokedynamic") - .create()); return options; } @@ -321,10 +318,6 @@ public class GroovyMain { main.conf.getOptimizationOptions().put(deopt_i,false); } - if (line.hasOption("indy")) { - main.conf.getOptimizationOptions().put("indy", true); - } - main.args = args; return main.run();
  99. Download patch .settings/org.eclipse.jdt.core.prefs
  100. Download patch .pc/0002-ant-build.diff.patch/build.xml
  101. ...

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

jquery (1.7.2+dfsg-3ubuntu2) utopic; urgency=medium * Re-enable the no-min patch, avoiding build dependency on uglifyjs. -- Matthias Klose <doko@ubuntu.com> Wed, 30 Jul 2014 15:58:09 +0200 jquery (1.7.2+dfsg-3ubuntu1) utopic; urgency=medium * Merge from debian. Remaining change: - debian/control: Suggest rather than recommend javascript-common; it's in universe and we don't necessarily need to publish these scripts via http * debian/rules: Add fix from debian for make 4.0 -- Jackson Doak <noskcaj@ubuntu.com> Mon, 16 Jun 2014 07:27:09 +1000

Modifications :
  1. Download patch debian/rules

    --- 1.7.2+dfsg-3/debian/rules 2013-08-02 02:02:53.000000000 +0000 +++ 1.7.2+dfsg-3ubuntu2/debian/rules 2014-07-30 14:03:49.000000000 +0000 @@ -1,5 +1,5 @@ #!/usr/bin/make -f -build %: +%: dh $@ override_dh_auto_clean: @@ -8,7 +8,7 @@ override_dh_auto_clean: override_dh_clean: rm -rf dist/ - rm build/.sizecache.json + rm -f build/.sizecache.json dh_clean .PHONY: build
  2. Download patch debian/control

    --- 1.7.2+dfsg-3/debian/control 2013-08-02 02:02:53.000000000 +0000 +++ 1.7.2+dfsg-3ubuntu2/debian/control 2014-07-30 13:59:58.000000000 +0000 @@ -1,9 +1,10 @@ Source: jquery Section: web Priority: optional -Maintainer: Debian Javascript Maintainers <pkg-javascript-devel@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Javascript Maintainers <pkg-javascript-devel@lists.alioth.debian.org> Uploaders: Marcelo Jorge Vieira (metal) <metal@debian.org>, Steve Kemp <skx@debian.org> -Build-Depends: debhelper (>= 7.0.50~), node-uglify +Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.9.4 Homepage: http://jquery.com/ Vcs-Browser: http://git.debian.org/?p=pkg-javascript/jquery.git @@ -16,7 +17,7 @@ Conflicts: jquery Replaces: jquery Breaks: movabletype-opensource (<< 5.1.4+dfsg-3~) Depends: ${misc:Depends} -Recommends: javascript-common +Suggests: javascript-common Description: JavaScript library for dynamic web applications jQuery is a fast, concise, JavaScript Library that simplifies how you traverse HTML documents, handle events, perform animations, and add Ajax
  3. Download patch .pc/applied-patches

    --- 1.7.2+dfsg-3/.pc/applied-patches 2014-07-31 21:38:29.668708582 +0000 +++ 1.7.2+dfsg-3ubuntu2/.pc/applied-patches 2014-07-31 21:38:29.856713577 +0000 @@ -1 +1,2 @@ build.patch +no-min.diff
  4. Download patch debian/patches/no-min.diff

    --- 1.7.2+dfsg-3/debian/patches/no-min.diff 1970-01-01 00:00:00.000000000 +0000 +++ 1.7.2+dfsg-3ubuntu2/debian/patches/no-min.diff 2014-07-30 14:03:18.000000000 +0000 @@ -0,0 +1,13 @@ +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -46,7 +46,7 @@ DATE=$(shell date) + + all: update_submodules core + +-core: jquery min size ++core: jquery + @@echo "jQuery build complete." + + ${DIST_DIR}:
  5. Download patch debian/patches/series

    --- 1.7.2+dfsg-3/debian/patches/series 2013-08-02 02:02:53.000000000 +0000 +++ 1.7.2+dfsg-3ubuntu2/debian/patches/series 2014-07-30 14:01:20.000000000 +0000 @@ -1 +1,2 @@ build.patch +no-min.diff
  6. Download patch debian/links
  7. Download patch Makefile

    --- 1.7.2+dfsg-3/Makefile 2014-07-31 21:38:29.000000000 +0000 +++ 1.7.2+dfsg-3ubuntu2/Makefile 2014-07-31 21:38:29.000000000 +0000 @@ -46,7 +46,7 @@ DATE=$(shell date) all: update_submodules core -core: jquery min size +core: jquery @@echo "jQuery build complete." ${DIST_DIR}:
  8. Download patch .pc/no-min.diff/Makefile

    --- 1.7.2+dfsg-3/.pc/no-min.diff/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ 1.7.2+dfsg-3ubuntu2/.pc/no-min.diff/Makefile 2014-07-31 21:38:29.000000000 +0000 @@ -0,0 +1,137 @@ +SRC_DIR = src +TEST_DIR = test +BUILD_DIR = build + +PREFIX = . +DIST_DIR = ${PREFIX}/dist + +JS_ENGINE ?= `which node 2>/dev/null || which nodejs 2>/dev/null` +COMPILER = `which uglifyjs 2>/dev/null` --unsafe +POST_COMPILER = ${JS_ENGINE} ${BUILD_DIR}/post-compile.js + +BASE_FILES = ${SRC_DIR}/core.js\ + ${SRC_DIR}/callbacks.js\ + ${SRC_DIR}/deferred.js\ + ${SRC_DIR}/support.js\ + ${SRC_DIR}/data.js\ + ${SRC_DIR}/queue.js\ + ${SRC_DIR}/attributes.js\ + ${SRC_DIR}/event.js\ + ${SRC_DIR}/selector.js\ + ${SRC_DIR}/traversing.js\ + ${SRC_DIR}/manipulation.js\ + ${SRC_DIR}/css.js\ + ${SRC_DIR}/ajax.js\ + ${SRC_DIR}/ajax/jsonp.js\ + ${SRC_DIR}/ajax/script.js\ + ${SRC_DIR}/ajax/xhr.js\ + ${SRC_DIR}/effects.js\ + ${SRC_DIR}/offset.js\ + ${SRC_DIR}/dimensions.js\ + ${SRC_DIR}/exports.js + +MODULES = ${SRC_DIR}/intro.js\ + ${BASE_FILES}\ + ${SRC_DIR}/outro.js + +JQ = ${DIST_DIR}/jquery.js +JQ_MIN = ${DIST_DIR}/jquery.min.js + +SIZZLE_DIR = ${SRC_DIR}/sizzle + +JQ_VER = $(shell cat version.txt) +VER = sed "s/@VERSION/${JQ_VER}/" + +DATE=$(shell date) + +all: update_submodules core + +core: jquery min size + @@echo "jQuery build complete." + +${DIST_DIR}: + @@mkdir -p ${DIST_DIR} + +jquery: ${JQ} + +${JQ}: ${MODULES} | ${DIST_DIR} + @@echo "Building" ${JQ} + + @@cat ${MODULES} | \ + sed 's/.function..jQuery...{//' | \ + sed 's/}...jQuery..;//' | \ + sed 's/@DATE/'"${DATE}"'/' | \ + ${VER} > ${JQ}; + +${SRC_DIR}/selector.js: ${SIZZLE_DIR}/sizzle.js + @@echo "Building selector code from Sizzle" + @@sed '/EXPOSE/r src/sizzle-jquery.js' ${SIZZLE_DIR}/sizzle.js | grep -v window.Sizzle > ${SRC_DIR}/selector.js + +hint: jquery + @@if test ! -z ${JS_ENGINE}; then \ + echo "Checking jQuery against JSHint..."; \ + ${JS_ENGINE} build/jshint-check.js; \ + else \ + echo "You must have NodeJS installed in order to test jQuery against JSHint."; \ + fi + +size: jquery min + @@if test ! -z ${JS_ENGINE}; then \ + gzip -c ${JQ_MIN} > ${JQ_MIN}.gz; \ + wc -c ${JQ} ${JQ_MIN} ${JQ_MIN}.gz | ${JS_ENGINE} ${BUILD_DIR}/sizer.js; \ + rm ${JQ_MIN}.gz; \ + else \ + echo "You must have NodeJS installed in order to size jQuery."; \ + fi + +freq: jquery min + @@if test ! -z ${JS_ENGINE}; then \ + ${JS_ENGINE} ${BUILD_DIR}/freq.js; \ + else \ + echo "You must have NodeJS installed to report the character frequency of minified jQuery."; \ + fi + +min: jquery ${JQ_MIN} + +${JQ_MIN}: ${JQ} + @@if test ! -z ${JS_ENGINE}; then \ + echo "Minifying jQuery" ${JQ_MIN}; \ + ${COMPILER} ${JQ} > ${JQ_MIN}.tmp; \ + ${POST_COMPILER} ${JQ_MIN}.tmp; \ + rm -f ${JQ_MIN}.tmp; \ + else \ + echo "You must have NodeJS installed in order to minify jQuery."; \ + fi + +clean: + @@echo "Removing Distribution directory:" ${DIST_DIR} + @@rm -rf ${DIST_DIR} + + @@echo "Removing built copy of Sizzle" + @@rm -f src/selector.js + +distclean: clean + @@echo "Removing submodules" + @@rm -rf test/qunit src/sizzle + +# change pointers for submodules and update them to what is specified in jQuery +# --merge doesn't work when doing an initial clone, thus test if we have non-existing +# submodules, then do an real update +update_submodules: + @@if [ -d .git ]; then \ + if git submodule status | grep -q -E '^-'; then \ + git submodule update --init --recursive; \ + else \ + git submodule update --init --recursive --merge; \ + fi; \ + fi; + +# update the submodules to the latest at the most logical branch +pull_submodules: + @@git submodule foreach "git pull \$$(git config remote.origin.url)" + @@git submodule summary + +pull: pull_submodules + @@git pull ${REMOTE} ${BRANCH} + +.PHONY: all jquery hint min clean distclean update_submodules pull_submodules pull core

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

Source: jquery-goodies

jquery-goodies (10-1ubuntu1) utopic; urgency=medium * Use yui-compressor instead of uglifyjs (universe). -- Matthias Klose <doko@ubuntu.com> Wed, 30 Jul 2014 18:03:46 +0200

Modifications :
  1. Download patch debian/rules

    --- 10-1/debian/rules 2014-06-29 01:21:16.000000000 +0000 +++ 10-1ubuntu1/debian/rules 2014-07-30 16:07:02.000000000 +0000 @@ -3,31 +3,31 @@ dh $@ override_dh_auto_build: - uglifyjs -o event-drag/jquery.event.drag.min.js event-drag/jquery.event.drag.js - uglifyjs -o event-drop/jquery.event.drop.min.js event-drop/jquery.event.drop.js - uglifyjs -o easing/jquery.easing.min.js easing/jquery.easing.js - uglifyjs -o easing/jquery.easing.compatibility.min.js easing/jquery.easing.compatibility.js - uglifyjs -o galleriffic/js/jquery.galleriffic.min.js galleriffic/js/jquery.galleriffic.js - uglifyjs -o meiomask/jquery.meiomask.min.js meiomask/jquery.meiomask.js - uglifyjs -o mousewheel/jquery.mousewheel.min.js mousewheel/jquery.mousewheel.js - uglifyjs -o jquery-history/jquery.history.min.js jquery-history/jquery.history.js - uglifyjs -o opacityrollover/jquery.opacityrollover.min.js opacityrollover/jquery.opacityrollover.js - uglifyjs -o jush/jush.min.js jush/jush.js - uglifyjs -o jfeed/build/dist/jquery.jfeed.min.js jfeed/build/dist/jquery.jfeed.js - uglifyjs -o form/jquery.form.min.js form/jquery.form.js - uglifyjs -o tipsy/src/javascripts/jquery.tipsy.min.js tipsy/src/javascripts/jquery.tipsy.js - uglifyjs -o fancybox/jquery.fancybox.min.js fancybox/jquery.fancybox.js - uglifyjs -o cookie/jquery.cookie.min.js cookie/jquery.cookie.js - uglifyjs -o metadata/jquery.metadata.min.js metadata/jquery.metadata.js - uglifyjs -o tablesorter/jquery.tablesorter.min.js tablesorter/jquery.tablesorter.js - uglifyjs -o tablesorter/addons/pager/jquery.tablesorter.pager.min.js tablesorter/addons/pager/jquery.tablesorter.pager.js - uglifyjs -o treetable/src/jquery.treeTable.min.js treetable/src/jquery.treeTable.js - uglifyjs -o livequery/jquery.livequery.min.js livequery/jquery.livequery.js - uglifyjs -o countdown/jquery.countdown.min.js countdown/jquery.countdown.js - uglifyjs -o resize/jquery.ba-resize.min.js resize/jquery.ba-resize.js - uglifyjs -o uploadify/jquery.uploadify.min.js uploadify/jquery.uploadify.js - uglifyjs -o slides/source/slides.min.jquery.js slides/source/slides.jquery.js - uglifyjs -o fullscreen/fullscreen/jquery.fullscreen.min.js fullscreen/fullscreen/jquery.fullscreen.js + yui-compressor -o event-drag/jquery.event.drag.min.js event-drag/jquery.event.drag.js + yui-compressor -o event-drop/jquery.event.drop.min.js event-drop/jquery.event.drop.js + yui-compressor -o easing/jquery.easing.min.js easing/jquery.easing.js + yui-compressor -o easing/jquery.easing.compatibility.min.js easing/jquery.easing.compatibility.js + yui-compressor -o galleriffic/js/jquery.galleriffic.min.js galleriffic/js/jquery.galleriffic.js + yui-compressor -o meiomask/jquery.meiomask.min.js meiomask/jquery.meiomask.js + yui-compressor -o mousewheel/jquery.mousewheel.min.js mousewheel/jquery.mousewheel.js + yui-compressor -o jquery-history/jquery.history.min.js jquery-history/jquery.history.js + yui-compressor -o opacityrollover/jquery.opacityrollover.min.js opacityrollover/jquery.opacityrollover.js + yui-compressor -o jush/jush.min.js jush/jush.js + yui-compressor -o jfeed/build/dist/jquery.jfeed.min.js jfeed/build/dist/jquery.jfeed.js + yui-compressor -o form/jquery.form.min.js form/jquery.form.js + yui-compressor -o tipsy/src/javascripts/jquery.tipsy.min.js tipsy/src/javascripts/jquery.tipsy.js + yui-compressor -o fancybox/jquery.fancybox.min.js fancybox/jquery.fancybox.js + yui-compressor -o cookie/jquery.cookie.min.js cookie/jquery.cookie.js + yui-compressor -o metadata/jquery.metadata.min.js metadata/jquery.metadata.js + yui-compressor -o tablesorter/jquery.tablesorter.min.js tablesorter/jquery.tablesorter.js + yui-compressor -o tablesorter/addons/pager/jquery.tablesorter.pager.min.js tablesorter/addons/pager/jquery.tablesorter.pager.js + yui-compressor -o treetable/src/jquery.treeTable.min.js treetable/src/jquery.treeTable.js + yui-compressor -o livequery/jquery.livequery.min.js livequery/jquery.livequery.js + yui-compressor -o countdown/jquery.countdown.min.js countdown/jquery.countdown.js + yui-compressor -o resize/jquery.ba-resize.min.js resize/jquery.ba-resize.js + yui-compressor -o uploadify/jquery.uploadify.min.js uploadify/jquery.uploadify.js + yui-compressor -o slides/source/slides.min.jquery.js slides/source/slides.jquery.js + yui-compressor -o fullscreen/fullscreen/jquery.fullscreen.min.js fullscreen/fullscreen/jquery.fullscreen.js override_dh_installchangelogs: dh_installchangelogs --package libjs-jquery-cookie cookie/CHANGELOG.md
  2. Download patch debian/control

    --- 10-1/debian/control 2014-06-29 02:07:35.000000000 +0000 +++ 10-1ubuntu1/debian/control 2014-07-30 16:05:39.000000000 +0000 @@ -5,7 +5,7 @@ Maintainer: Debian Javascript Maintainer Uploaders: Marcelo Jorge Vieira (metal) <metal@debian.org>, Per Andersson <avtobiff@gmail.com>, Agustin Henze <tin@sluc.org.ar> -Build-Depends: debhelper (>= 7.0.50~), node-uglify +Build-Depends: debhelper (>= 7.0.50~), yui-compressor Standards-Version: 3.9.5 Vcs-Browser: http://git.debian.org/?p=pkg-javascript/jquery-goodies.git Vcs-Git: git://git.debian.org/git/pkg-javascript/jquery-goodies.git

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

jscommunicator (1.1.1-1ubuntu1) trusty; urgency=medium * make-release: Call closure-compiler as a jar instead of a binary. -- Adam Conrad <adconrad@ubuntu.com> Wed, 16 Apr 2014 18:47:19 +0100

Modifications :
  1. Download patch debian/patches/closure-compiler.patch

    --- 1.1.1-1/debian/patches/closure-compiler.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.1-1ubuntu1/debian/patches/closure-compiler.patch 2014-04-16 17:48:58.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Call closure-compiler as a jar instead of a binary. +Author: Adam Conrad <adconrad@ubuntu.com> + +--- jscommunicator-1.1.1.orig/make-release ++++ jscommunicator-1.1.1/make-release +@@ -5,10 +5,10 @@ set -e + RELEASE_FILES="JSCommManager.js JSCommUI.js jssip-helper.js parseuri.js webrtc-check.js" + RELEASE_JS="JSComm.js" + +-MINIFY_GCC=closure-compiler ++#MINIFY_GCC=closure-compiler + # using a manually constructed JVM command line for + # closure-compiler due to Debian bug 705565: +-#MINIFY_GCC="java -classpath /usr/share/java/closure-compiler.jar:/usr/share/java/args4j.jar:/usr/share/java/guava.jar:/usr/share/java/json.jar com.google.javascript.jscomp.CommandLineRunner" ++MINIFY_GCC="java -classpath /usr/share/java/closure-compiler.jar:/usr/share/java/args4j.jar:/usr/share/java/guava.jar:/usr/share/java/json.jar com.google.javascript.jscomp.CommandLineRunner" + + TMP_FILE=`mktemp --suffix=.js JSCommXXX` + cat ${RELEASE_FILES} > ${TMP_FILE}
  2. Download patch .pc/closure-compiler.patch/make-release

    --- 1.1.1-1/.pc/closure-compiler.patch/make-release 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.1-1ubuntu1/.pc/closure-compiler.patch/make-release 2014-02-06 21:48:30.000000000 +0000 @@ -0,0 +1,19 @@ +#!/bin/bash + +set -e + +RELEASE_FILES="JSCommManager.js JSCommUI.js jssip-helper.js parseuri.js webrtc-check.js" +RELEASE_JS="JSComm.js" + +MINIFY_GCC=closure-compiler +# using a manually constructed JVM command line for +# closure-compiler due to Debian bug 705565: +#MINIFY_GCC="java -classpath /usr/share/java/closure-compiler.jar:/usr/share/java/args4j.jar:/usr/share/java/guava.jar:/usr/share/java/json.jar com.google.javascript.jscomp.CommandLineRunner" + +TMP_FILE=`mktemp --suffix=.js JSCommXXX` +cat ${RELEASE_FILES} > ${TMP_FILE} +TMP_RELEASE=`mktemp --suffix=.js JSCommRelXXX` +${MINIFY_GCC} --js ${TMP_FILE} --js_output_file ${TMP_RELEASE} +head -20 JSCommManager.js | cat - ${TMP_RELEASE} > ${RELEASE_JS} +rm ${TMP_FILE} ${TMP_RELEASE} +
  3. Download patch debian/control

    --- 1.1.1-1/debian/control 2014-02-04 19:21:20.000000000 +0000 +++ 1.1.1-1ubuntu1/debian/control 2014-04-16 17:47:43.000000000 +0000 @@ -1,7 +1,8 @@ Source: jscommunicator Section: web Priority: optional -Maintainer: Debian Javascript Maintainers <pkg-javascript-devel@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Javascript Maintainers <pkg-javascript-devel@lists.alioth.debian.org> Uploaders: Daniel Pocock <daniel@pocock.com.au> Build-Depends: debhelper (>= 9), closure-compiler Standards-Version: 3.9.5
  4. Download patch .pc/applied-patches

    --- 1.1.1-1/.pc/applied-patches 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.1-1ubuntu1/.pc/applied-patches 2014-04-16 19:07:18.817631111 +0000 @@ -0,0 +1 @@ +closure-compiler.patch
  5. Download patch debian/patches/series

    --- 1.1.1-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.1-1ubuntu1/debian/patches/series 2014-04-16 17:48:39.000000000 +0000 @@ -0,0 +1 @@ +closure-compiler.patch
  6. Download patch make-release

    --- 1.1.1-1/make-release 2014-02-06 21:48:30.000000000 +0000 +++ 1.1.1-1ubuntu1/make-release 2014-04-16 19:07:18.000000000 +0000 @@ -5,10 +5,10 @@ set -e RELEASE_FILES="JSCommManager.js JSCommUI.js jssip-helper.js parseuri.js webrtc-check.js" RELEASE_JS="JSComm.js" -MINIFY_GCC=closure-compiler +#MINIFY_GCC=closure-compiler # using a manually constructed JVM command line for # closure-compiler due to Debian bug 705565: -#MINIFY_GCC="java -classpath /usr/share/java/closure-compiler.jar:/usr/share/java/args4j.jar:/usr/share/java/guava.jar:/usr/share/java/json.jar com.google.javascript.jscomp.CommandLineRunner" +MINIFY_GCC="java -classpath /usr/share/java/closure-compiler.jar:/usr/share/java/args4j.jar:/usr/share/java/guava.jar:/usr/share/java/json.jar com.google.javascript.jscomp.CommandLineRunner" TMP_FILE=`mktemp --suffix=.js JSCommXXX` cat ${RELEASE_FILES} > ${TMP_FILE}

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

Source: junitperf

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

Modifications :
  1. Download patch debian/rules

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

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

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

Source: libajaxtags-java

libajaxtags-java (1.5.1-1ubuntu1) precise; urgency=low * debian/control: Build-Depends on junit4, fix FTBFS -- Angel Abad <angelabad@ubuntu.com> Wed, 04 Apr 2012 15:35:42 +0200

Modifications :
  1. Download patch debian/control

    --- 1.5.1-1/debian/control 2010-05-12 21:38:00.000000000 +0000 +++ 1.5.1-1ubuntu1/debian/control 2012-04-04 13:36:02.000000000 +0000 @@ -1,10 +1,11 @@ Source: libajaxtags-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>, Michael Koch <konqueror@gmx.de> Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk, maven-debian-helper, - libservlet2.5-java + libservlet2.5-java, junit4 Standards-Version: 3.8.4 Homepage: http://ajaxtags.sourceforge.net/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libajaxtags-java/

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: libjs-jquery-hotkeys

libjs-jquery-hotkeys (0~20130707+git2d51e3a9+dfsg-2ubuntu1) trusty; urgency=medium * debian/patches/revert-to-0.8.patch: - Revert to jquery-hotkeys 0.8 rather than the current git snapshot because the snapshot breaks python-coverage HTML reports. LP: #1301574 -- Michael Terry <mterry@ubuntu.com> Mon, 07 Apr 2014 17:08:29 -0400

Modifications :
  1. Download patch .pc/revert-to-0.8.patch/jquery.hotkeys.js

    --- 0~20130707+git2d51e3a9+dfsg-2/.pc/revert-to-0.8.patch/jquery.hotkeys.js 1970-01-01 00:00:00.000000000 +0000 +++ 0~20130707+git2d51e3a9+dfsg-2ubuntu1/.pc/revert-to-0.8.patch/jquery.hotkeys.js 2013-07-07 06:07:42.000000000 +0000 @@ -0,0 +1,106 @@ +/* + * jQuery Hotkeys Plugin + * Copyright 2010, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * + * Based upon the plugin by Tzury Bar Yochay: + * http://github.com/tzuryby/hotkeys + * + * Original idea by: + * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/ +*/ + +(function(jQuery){ + + jQuery.hotkeys = { + version: "0.8+", + + specialKeys: { + 8: "backspace", 9: "tab", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause", + 20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home", + 37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del", + 96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7", + 104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/", + 112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8", + 120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 188: ",", 190: ".", + 191: "/", 224: "meta" + }, + + shiftNums: { + "`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&", + "8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<", + ".": ">", "/": "?", "\\": "|" + } + }; + + function keyHandler( handleObj ) { + + var origHandler = handleObj.handler, + //use namespace as keys so it works with event delegation as well + //will also allow removing listeners of a specific key combination + //and support data objects + keys = (handleObj.namespace || "").toLowerCase().split(" "); + keys = jQuery.map(keys, function(key) { return key.split("."); }); + + //no need to modify handler if no keys specified + if (keys.length === 1 && (keys[0] === "" || keys[0] === "autocomplete")) { + return; + } + + handleObj.handler = function( event ) { + // Don't fire in text-accepting inputs that we didn't directly bind to + // important to note that $.fn.prop is only available on jquery 1.6+ + if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) || + event.target.type === "text" || $(event.target).prop('contenteditable') == 'true' )) { + return; + } + + // Keypress represents characters, not special keys + var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[ event.which ], + character = String.fromCharCode( event.which ).toLowerCase(), + key, modif = "", possible = {}; + + // check combinations (alt|ctrl|shift+anything) + if ( event.altKey && special !== "alt" ) { + modif += "alt_"; + } + + if ( event.ctrlKey && special !== "ctrl" ) { + modif += "ctrl_"; + } + + // TODO: Need to make sure this works consistently across platforms + if ( event.metaKey && !event.ctrlKey && special !== "meta" ) { + modif += "meta_"; + } + + if ( event.shiftKey && special !== "shift" ) { + modif += "shift_"; + } + + if ( special ) { + possible[ modif + special ] = true; + + } else { + possible[ modif + character ] = true; + possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true; + + // "$" can be triggered as "Shift+4" or "Shift+$" or just "$" + if ( modif === "shift_" ) { + possible[ jQuery.hotkeys.shiftNums[ character ] ] = true; + } + } + + for ( var i = 0, l = keys.length; i < l; i++ ) { + if ( possible[ keys[i] ] ) { + return origHandler.apply( this, arguments ); + } + } + }; + } + + jQuery.each([ "keydown", "keyup", "keypress" ], function() { + jQuery.event.special[ this ] = { add: keyHandler }; + }); + +})( jQuery );
  2. Download patch debian/control

    --- 0~20130707+git2d51e3a9+dfsg-2/debian/control 2013-07-07 12:59:12.000000000 +0000 +++ 0~20130707+git2d51e3a9+dfsg-2ubuntu1/debian/control 2014-04-07 21:10:34.000000000 +0000 @@ -1,7 +1,8 @@ Source: libjs-jquery-hotkeys Section: web Priority: extra -Maintainer: Debian Javascript Maintainers <pkg-javascript-devel@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Javascript Maintainers <pkg-javascript-devel@lists.alioth.debian.org> Uploaders: Thomas Goirand <zigo@debian.org> Build-Depends: debhelper (>= 9) Standards-Version: 3.9.4
  3. Download patch .pc/applied-patches

    --- 0~20130707+git2d51e3a9+dfsg-2/.pc/applied-patches 1970-01-01 00:00:00.000000000 +0000 +++ 0~20130707+git2d51e3a9+dfsg-2ubuntu1/.pc/applied-patches 2014-04-08 03:42:46.039110547 +0000 @@ -0,0 +1 @@ +revert-to-0.8.patch
  4. Download patch jquery.hotkeys.js

    --- 0~20130707+git2d51e3a9+dfsg-2/jquery.hotkeys.js 2013-07-07 06:07:42.000000000 +0000 +++ 0~20130707+git2d51e3a9+dfsg-2ubuntu1/jquery.hotkeys.js 2014-04-08 03:42:46.000000000 +0000 @@ -11,50 +11,44 @@ */ (function(jQuery){ - + jQuery.hotkeys = { - version: "0.8+", + version: "0.8", specialKeys: { 8: "backspace", 9: "tab", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause", 20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home", - 37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del", + 37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del", 96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7", - 104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/", - 112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8", + 104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/", + 112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8", 120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 188: ",", 190: ".", 191: "/", 224: "meta" - }, - + }, + shiftNums: { - "`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&", - "8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<", + "`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&", + "8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<", ".": ">", "/": "?", "\\": "|" } }; function keyHandler( handleObj ) { - - var origHandler = handleObj.handler, - //use namespace as keys so it works with event delegation as well - //will also allow removing listeners of a specific key combination - //and support data objects - keys = (handleObj.namespace || "").toLowerCase().split(" "); - keys = jQuery.map(keys, function(key) { return key.split("."); }); - - //no need to modify handler if no keys specified - if (keys.length === 1 && (keys[0] === "" || keys[0] === "autocomplete")) { + // Only care when a possible input has been specified + if ( typeof handleObj.data !== "string" ) { return; } - + + var origHandler = handleObj.handler, + keys = handleObj.data.toLowerCase().split(" "); + handleObj.handler = function( event ) { // Don't fire in text-accepting inputs that we didn't directly bind to - // important to note that $.fn.prop is only available on jquery 1.6+ if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) || - event.target.type === "text" || $(event.target).prop('contenteditable') == 'true' )) { + event.target.type === "text" || $(event.target).prop('contenteditable') == 'true' )) { return; } - + // Keypress represents characters, not special keys var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[ event.which ], character = String.fromCharCode( event.which ).toLowerCase(), @@ -62,20 +56,20 @@ // check combinations (alt|ctrl|shift+anything) if ( event.altKey && special !== "alt" ) { - modif += "alt_"; + modif += "alt+"; } if ( event.ctrlKey && special !== "ctrl" ) { - modif += "ctrl_"; + modif += "ctrl+"; } - + // TODO: Need to make sure this works consistently across platforms if ( event.metaKey && !event.ctrlKey && special !== "meta" ) { - modif += "meta_"; + modif += "meta+"; } if ( event.shiftKey && special !== "shift" ) { - modif += "shift_"; + modif += "shift+"; } if ( special ) { @@ -86,7 +80,7 @@ possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true; // "$" can be triggered as "Shift+4" or "Shift+$" or just "$" - if ( modif === "shift_" ) { + if ( modif === "shift+" ) { possible[ jQuery.hotkeys.shiftNums[ character ] ] = true; } }
  5. Download patch debian/patches/series

    --- 0~20130707+git2d51e3a9+dfsg-2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 0~20130707+git2d51e3a9+dfsg-2ubuntu1/debian/patches/series 2014-04-07 21:07:15.000000000 +0000 @@ -0,0 +1 @@ +revert-to-0.8.patch
  6. Download patch debian/patches/revert-to-0.8.patch

    --- 0~20130707+git2d51e3a9+dfsg-2/debian/patches/revert-to-0.8.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0~20130707+git2d51e3a9+dfsg-2ubuntu1/debian/patches/revert-to-0.8.patch 2014-04-07 21:07:31.000000000 +0000 @@ -0,0 +1,107 @@ +Index: libjs-jquery-hotkeys-0~20130707+git2d51e3a9+dfsg/jquery.hotkeys.js +=================================================================== +--- libjs-jquery-hotkeys-0~20130707+git2d51e3a9+dfsg.orig/jquery.hotkeys.js 2013-07-07 02:07:42.000000000 -0400 ++++ libjs-jquery-hotkeys-0~20130707+git2d51e3a9+dfsg/jquery.hotkeys.js 2014-04-07 17:07:28.655678149 -0400 +@@ -11,50 +11,44 @@ + */ + + (function(jQuery){ +- ++ + jQuery.hotkeys = { +- version: "0.8+", ++ version: "0.8", + + specialKeys: { + 8: "backspace", 9: "tab", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause", + 20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home", +- 37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del", ++ 37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del", + 96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7", +- 104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/", +- 112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8", ++ 104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/", ++ 112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8", + 120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 188: ",", 190: ".", + 191: "/", 224: "meta" +- }, +- ++ }, ++ + shiftNums: { +- "`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&", +- "8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<", ++ "`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&", ++ "8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<", + ".": ">", "/": "?", "\\": "|" + } + }; + + function keyHandler( handleObj ) { +- +- var origHandler = handleObj.handler, +- //use namespace as keys so it works with event delegation as well +- //will also allow removing listeners of a specific key combination +- //and support data objects +- keys = (handleObj.namespace || "").toLowerCase().split(" "); +- keys = jQuery.map(keys, function(key) { return key.split("."); }); +- +- //no need to modify handler if no keys specified +- if (keys.length === 1 && (keys[0] === "" || keys[0] === "autocomplete")) { ++ // Only care when a possible input has been specified ++ if ( typeof handleObj.data !== "string" ) { + return; + } +- ++ ++ var origHandler = handleObj.handler, ++ keys = handleObj.data.toLowerCase().split(" "); ++ + handleObj.handler = function( event ) { + // Don't fire in text-accepting inputs that we didn't directly bind to +- // important to note that $.fn.prop is only available on jquery 1.6+ + if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) || +- event.target.type === "text" || $(event.target).prop('contenteditable') == 'true' )) { ++ event.target.type === "text" || $(event.target).prop('contenteditable') == 'true' )) { + return; + } +- ++ + // Keypress represents characters, not special keys + var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[ event.which ], + character = String.fromCharCode( event.which ).toLowerCase(), +@@ -62,20 +56,20 @@ + + // check combinations (alt|ctrl|shift+anything) + if ( event.altKey && special !== "alt" ) { +- modif += "alt_"; ++ modif += "alt+"; + } + + if ( event.ctrlKey && special !== "ctrl" ) { +- modif += "ctrl_"; ++ modif += "ctrl+"; + } +- ++ + // TODO: Need to make sure this works consistently across platforms + if ( event.metaKey && !event.ctrlKey && special !== "meta" ) { +- modif += "meta_"; ++ modif += "meta+"; + } + + if ( event.shiftKey && special !== "shift" ) { +- modif += "shift_"; ++ modif += "shift+"; + } + + if ( special ) { +@@ -86,7 +80,7 @@ + possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true; + + // "$" can be triggered as "Shift+4" or "Shift+$" or just "$" +- if ( modif === "shift_" ) { ++ if ( modif === "shift+" ) { + possible[ jQuery.hotkeys.shiftNums[ character ] ] = true; + } + }

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: libv8-3.14

libv8-3.14 (3.14.5.8-5ubuntu2) trusty; urgency=medium * 0099_powerpc_support.patch: Refresh to alow's current libv8-3.14. -- Adam Conrad <adconrad@ubuntu.com> Wed, 26 Mar 2014 23:44:56 -0600 libv8-3.14 (3.14.5.8-5ubuntu1) trusty; urgency=medium * 0099_powerpc_support.patch: Pull in Andrew Low's powerpc port. * debian/rules: Enable powerpc/ppc64/ppc64el for package builds. -- Adam Conrad <adconrad@ubuntu.com> Wed, 12 Feb 2014 10:26:54 -0700

Modifications :
  1. Download patch .pc/0099_powerpc_support.patch/test/mjsunit/d8-os.js

    --- 3.14.5.8-5/.pc/0099_powerpc_support.patch/test/mjsunit/d8-os.js 1970-01-01 00:00:00.000000000 +0000 +++ 3.14.5.8-5ubuntu2/.pc/0099_powerpc_support.patch/test/mjsunit/d8-os.js 2013-03-04 13:04:30.000000000 +0000 @@ -0,0 +1,188 @@ +// Copyright 2009 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Test the OS module of d8. This test only makes sense with d8. It +// only does non-trivial work on Unix since os.system() is not currently +// implemented on Windows, and even if it were then many of the things +// we are calling would not be available. + +var TEST_DIR = "/tmp/d8-os-test-directory-" + ((Math.random() * (1<<30)) | 0); + + +function arg_error(str) { + try { + eval(str); + } catch (e) { + assertTrue(/rgument/.test(e), str); + } +} + + +function str_error(str) { + var e = new Object(); + e.toString = function() { throw new Error("foo bar"); } + try { + eval(str); + } catch (exception) { + assertTrue(/tring conversion/.test(exception), str); + } +} + + +if (this.os && os.system) { + // Ensure that we have a valid working directory. + os.chdir("/tmp"); + try { + // Delete the dir if it is lying around from last time. + os.system("ls", [TEST_DIR]); + os.system("rm", ["-r", TEST_DIR]); + } catch (e) { + } + os.mkdirp(TEST_DIR); + try { + // Check the chdir worked. + os.system('ls', [TEST_DIR]); + // Simple create dir. + os.mkdirp(TEST_DIR + "/dir"); + // Create dir in dir. + os.mkdirp(TEST_DIR + "/dir/foo"); + // Check that they are there. + os.system('ls', [TEST_DIR + '/dir/foo']); + // Check that we can detect when something is not there. + assertThrows("os.system('ls', [TEST_DIR + '/dir/bar']);", "dir not there"); + // Check that mkdirp makes intermediate directories. + os.mkdirp(TEST_DIR + "/dir2/foo"); + os.system("ls", [TEST_DIR + "/dir2/foo"]); + // Check that mkdirp doesn't mind if the dir is already there. + os.mkdirp(TEST_DIR + "/dir2/foo"); + os.mkdirp(TEST_DIR + "/dir2/foo/"); + // Check that mkdirp can cope with trailing / + os.mkdirp(TEST_DIR + "/dir3/"); + os.system("ls", [TEST_DIR + "/dir3"]); + // Check that we get an error if the name is taken by a file. + os.system("sh", ["-c", "echo foo > " + TEST_DIR + "/file1"]); + os.system("ls", [TEST_DIR + "/file1"]); + assertThrows("os.mkdirp(TEST_DIR + '/file1');", "mkdir over file1"); + assertThrows("os.mkdirp(TEST_DIR + '/file1/foo');", "mkdir over file2"); + assertThrows("os.mkdirp(TEST_DIR + '/file1/');", "mkdir over file3"); + assertThrows("os.mkdirp(TEST_DIR + '/file1/foo/');", "mkdir over file4"); + // Create a dir we cannot read. + os.mkdirp(TEST_DIR + "/dir4", 0); + // This test fails if you are root since root can read any dir. + assertThrows("os.chdir(TEST_DIR + '/dir4');", "chdir dir4 I"); + os.rmdir(TEST_DIR + "/dir4"); + assertThrows("os.chdir(TEST_DIR + '/dir4');", "chdir dir4 II"); + + // Set umask. This changes the umask for the whole process and is + // the reason why the test cannot be run multi-threaded. + var old_umask = os.umask(0777); + // Create a dir we cannot read. + os.mkdirp(TEST_DIR + "/dir5"); + // This test fails if you are root since root can read any dir. + assertThrows("os.chdir(TEST_DIR + '/dir5');", "cd dir5 I"); + os.rmdir(TEST_DIR + "/dir5"); + assertThrows("os.chdir(TEST_DIR + '/dir5');", "chdir dir5 II"); + os.umask(old_umask); + + os.mkdirp(TEST_DIR + "/hest/fisk/../fisk/ged"); + os.system("ls", [TEST_DIR + "/hest/fisk/ged"]); + + os.setenv("FOO", "bar"); + var environment = os.system("printenv"); + assertTrue(/FOO=bar/.test(environment)); + + // Check we time out. + var have_sleep = true; + var have_echo = true; + try { + os.system("ls", ["/bin/sleep"]); + } catch (e) { + have_sleep = false; + } + try { + os.system("ls", ["/bin/echo"]); + } catch (e) { + have_echo = false; + } + if (have_sleep) { + assertThrows("os.system('sleep', ['2000'], 20);", "sleep 1"); + + // Check we time out with total time. + assertThrows("os.system('sleep', ['2000'], -1, 20);", "sleep 2"); + + // Check that -1 means no timeout. + os.system('sleep', ['0.1'], -1, -1); + + } + + // Check that we don't fill up the process table with zombies. + // Disabled because it's too slow. + if (have_echo) { + //for (var i = 0; i < 65536; i++) { + assertEquals("baz\n", os.system("echo", ["baz"])); + //} + } + + // Too few args. + arg_error("os.umask();"); + arg_error("os.system();"); + arg_error("os.mkdirp();"); + arg_error("os.chdir();"); + arg_error("os.setenv();"); + arg_error("os.rmdir();"); + + // Too many args. + arg_error("os.setenv('FOO=bar');"); + arg_error("os.umask(0, 0);"); + arg_error("os.system('ls', [], -1, -1, -1);"); + arg_error("os.mkdirp('foo', 0, 0)"); + arg_error("os.chdir('foo', 'bar')"); + arg_error("os.rmdir('foo', 'bar');"); + + // Wrong kind of args. + arg_error("os.umask([]);"); + arg_error("os.system('ls', 'foo');"); + arg_error("os.system('ls', 123);"); + arg_error("os.system('ls', [], 'foo');"); + arg_error("os.system('ls', [], -1, 'foo');"); + arg_error("os.mkdirp('foo', 'bar');"); + + // Test broken toString(). + str_error("os.system(e);"); + str_error("os.system('ls', [e]);"); + str_error("os.system('ls', ['.', e]);"); + str_error("os.system('ls', [e, '.']);"); + str_error("os.mkdirp(e);"); + str_error("os.setenv(e, 'goo');"); + str_error("os.setenv('goo', e);"); + str_error("os.chdir(e);"); + str_error("os.rmdir(e);"); + + } finally { + os.system("rm", ["-r", TEST_DIR]); + } +}
  2. Download patch .pc/0099_powerpc_support.patch/test/cctest/test-threads.cc
  3. Download patch src/codegen.cc

    --- 3.14.5.8-5/src/codegen.cc 2013-03-04 13:04:30.000000000 +0000 +++ 3.14.5.8-5ubuntu2/src/codegen.cc 2014-03-27 07:37:40.000000000 +0000 @@ -200,7 +200,7 @@ void ArgumentsAccessStub::Generate(Macro int CEntryStub::MinorKey() { int result = (save_doubles_ == kSaveFPRegs) ? 1 : 0; ASSERT(result_size_ == 1 || result_size_ == 2); -#ifdef _WIN64 +#if defined(_WIN64) || defined(V8_TARGET_ARCH_PPC64) return result | ((result_size_ == 1) ? 0 : 2); #else return result;
  4. Download patch .pc/0099_powerpc_support.patch/tools/utils.py

    --- 3.14.5.8-5/.pc/0099_powerpc_support.patch/tools/utils.py 1970-01-01 00:00:00.000000000 +0000 +++ 3.14.5.8-5ubuntu2/.pc/0099_powerpc_support.patch/tools/utils.py 2013-03-04 13:04:30.000000000 +0000 @@ -0,0 +1,98 @@ +# Copyright 2008 the V8 project authors. All rights reserved. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +import platform +import re + + +# Reads a .list file into an array of strings +def ReadLinesFrom(name): + list = [] + for line in open(name): + if '#' in line: + line = line[:line.find('#')] + line = line.strip() + if len(line) == 0: + continue + list.append(line) + return list + + +def GuessOS(): + id = platform.system() + if id == 'Linux': + return 'linux' + elif id == 'Darwin': + return 'macos' + elif id.find('CYGWIN') >= 0: + return 'cygwin' + elif id == 'Windows' or id == 'Microsoft': + # On Windows Vista platform.system() can return 'Microsoft' with some + # versions of Python, see http://bugs.python.org/issue1082 + return 'win32' + elif id == 'FreeBSD': + return 'freebsd' + elif id == 'OpenBSD': + return 'openbsd' + elif id == 'SunOS': + return 'solaris' + elif id == 'NetBSD': + return 'netbsd' + else: + return None + + +# This will default to building the 32 bit VM even on machines that are capable +# of running the 64 bit VM. Use the scons option --arch=x64 to force it to build +# the 64 bit VM. +def GuessArchitecture(): + id = platform.machine() + id = id.lower() # Windows 7 capitalizes 'AMD64'. + if id.startswith('arm'): + return 'arm' + elif (not id) or (not re.match('(x|i[3-6])86$', id) is None): + return 'ia32' + elif id == 'i86pc': + return 'ia32' + elif id == 'x86_64': + return 'ia32' + elif id == 'amd64': + return 'ia32' + else: + return None + + +def GuessWordsize(): + if '64' in platform.machine(): + return '64' + else: + return '32' + + +def IsWindows(): + return GuessOS() == 'win32'
  5. Download patch README.md

    --- 3.14.5.8-5/README.md 1970-01-01 00:00:00.000000000 +0000 +++ 3.14.5.8-5ubuntu2/README.md 2014-03-27 07:37:40.000000000 +0000 @@ -0,0 +1,10 @@ +v8ppc +===== + +Port of Google V8 javascript engine to PowerPC - PowerLinux and AIX. + +This branch of the code (libv8-3.14) is intended to match the 3.14.5.8 +level of V8 that is used by the libv8 library built as part of Ubuntu + +http://packages.ubuntu.com/source/trusty/libv8-3.14 +
  6. Download patch .pc/0099_powerpc_support.patch/src/version.cc

    --- 3.14.5.8-5/.pc/0099_powerpc_support.patch/src/version.cc 1970-01-01 00:00:00.000000000 +0000 +++ 3.14.5.8-5ubuntu2/.pc/0099_powerpc_support.patch/src/version.cc 2013-03-04 13:04:30.000000000 +0000 @@ -0,0 +1,116 @@ +// Copyright 2012 the V8 project authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "v8.h" + +#include "version.h" + +// These macros define the version number for the current version. +// NOTE these macros are used by the SCons build script so their names +// cannot be changed without changing the SCons build script. +#define MAJOR_VERSION 3 +#define MINOR_VERSION 14 +#define BUILD_NUMBER 5 +#define PATCH_LEVEL 8 +// Use 1 for candidates and 0 otherwise. +// (Boolean macro values are not supported by all preprocessors.) +#define IS_CANDIDATE_VERSION 0 + +// Define SONAME to have the SCons build the put a specific SONAME into the +// shared library instead the generic SONAME generated from the V8 version +// number. This define is mainly used by the SCons build script. +#define SONAME "" + +#if IS_CANDIDATE_VERSION +#define CANDIDATE_STRING " (candidate)" +#else +#define CANDIDATE_STRING "" +#endif + +#define SX(x) #x +#define S(x) SX(x) + +#if PATCH_LEVEL > 0 +#define VERSION_STRING \ + S(MAJOR_VERSION) "." S(MINOR_VERSION) "." S(BUILD_NUMBER) "." \ + S(PATCH_LEVEL) CANDIDATE_STRING +#else +#define VERSION_STRING \ + S(MAJOR_VERSION) "." S(MINOR_VERSION) "." S(BUILD_NUMBER) \ + CANDIDATE_STRING +#endif + +namespace v8 { +namespace internal { + +int Version::major_ = MAJOR_VERSION; +int Version::minor_ = MINOR_VERSION; +int Version::build_ = BUILD_NUMBER; +int Version::patch_ = PATCH_LEVEL; +bool Version::candidate_ = (IS_CANDIDATE_VERSION != 0); +const char* Version::soname_ = SONAME; +const char* Version::version_string_ = VERSION_STRING; + +// Calculate the V8 version string. +void Version::GetString(Vector<char> str) { + const char* candidate = IsCandidate() ? " (candidate)" : ""; +#ifdef USE_SIMULATOR + const char* is_simulator = " SIMULATOR"; +#else + const char* is_simulator = ""; +#endif // USE_SIMULATOR + if (GetPatch() > 0) { + OS::SNPrintF(str, "%d.%d.%d.%d%s%s", + GetMajor(), GetMinor(), GetBuild(), GetPatch(), candidate, + is_simulator); + } else { + OS::SNPrintF(str, "%d.%d.%d%s%s", + GetMajor(), GetMinor(), GetBuild(), candidate, + is_simulator); + } +} + + +// Calculate the SONAME for the V8 shared library. +void Version::GetSONAME(Vector<char> str) { + if (soname_ == NULL || *soname_ == '\0') { + // Generate generic SONAME if no specific SONAME is defined. + const char* candidate = IsCandidate() ? "-candidate" : ""; + if (GetPatch() > 0) { + OS::SNPrintF(str, "libv8-%d.%d.%d.%d%s.so", + GetMajor(), GetMinor(), GetBuild(), GetPatch(), candidate); + } else { + OS::SNPrintF(str, "libv8-%d.%d.%d%s.so", + GetMajor(), GetMinor(), GetBuild(), candidate); + } + } else { + // Use specific SONAME. + OS::SNPrintF(str, "%s", soname_); + } +} + +} } // namespace v8::internal
  7. Download patch .pc/0099_powerpc_support.patch/src/objects-inl.h
  8. Download patch src/disassembler.cc

    --- 3.14.5.8-5/src/disassembler.cc 2013-03-04 13:04:30.000000000 +0000 +++ 3.14.5.8-5ubuntu2/src/disassembler.cc 2014-03-27 07:37:40.000000000 +0000 @@ -158,7 +158,11 @@ static int DecodeIt(FILE* f, "%08" V8PRIxPTR " jump table entry %4" V8PRIdPTR, ptr, ptr - begin); +#if V8_TARGET_ARCH_PPC64 + pc += 8; +#else pc += 4; +#endif } else { decode_buffer[0] = '\0'; pc += d.InstructionDecode(decode_buffer, pc);
  9. Download patch .pc/0099_powerpc_support.patch/tools/run-tests.py
  10. Download patch .pc/0099_powerpc_support.patch/src/platform-linux.cc
  11. Download patch .pc/0099_powerpc_support.patch/src/builtins.cc
  12. Download patch src/checks.h

    --- 3.14.5.8-5/src/checks.h 2014-03-27 07:37:39.000000000 +0000 +++ 3.14.5.8-5ubuntu2/src/checks.h 2014-03-27 07:37:40.000000000 +0000 @@ -292,4 +292,18 @@ extern bool FLAG_enable_slow_asserts; #define EXTRA_CHECK(condition) ((void) 0) #endif +// PENGUIN: Extra checks for PPC PORT +// - PPCPORT_UNIMPLEMENTED: for unimplemented features +// - PPCPORT_CHECK: for development phase +// - PPCPORT_UNSAFE_IMPLEMENTATION: unsafe implementation +#ifdef ENABLE_EXTRA_PPCCHECKS +#define PPCPORT_CHECK(condition) CHECK(condition) +#define PPCPORT_UNIMPLEMENTED() UNIMPLEMENTED() +#define PPCPORT_UNSAFE_IMPLEMENTATION() ((void)0) +#else +#define PPCPORT_CHECK(condition) ((void) 0) +#define PPCPORT_UNIMPLEMENTED() ((void) 0) +#define PPCPORT_UNSAFE_IMPLEMENTATION() ((void)0) +#endif + #endif // V8_CHECKS_H_
  13. Download patch .pc/0099_powerpc_support.patch/src/disassembler.cc
  14. Download patch .pc/0099_powerpc_support.patch/Makefile
  15. Download patch .pc/0099_powerpc_support.patch/src/d8.gyp

    --- 3.14.5.8-5/.pc/0099_powerpc_support.patch/src/d8.gyp 1970-01-01 00:00:00.000000000 +0000 +++ 3.14.5.8-5ubuntu2/.pc/0099_powerpc_support.patch/src/d8.gyp 2013-03-04 13:04:30.000000000 +0000 @@ -0,0 +1,113 @@ +# Copyright 2012 the V8 project authors. All rights reserved. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +{ + 'includes': ['../build/common.gypi'], + 'variables': { + 'console%': '', + }, + 'targets': [ + { + 'target_name': 'd8', + 'type': 'executable', + 'dependencies': [ + '../tools/gyp/v8.gyp:v8', + ], + # Generated source files need this explicitly: + 'include_dirs+': [ + '../src', + ], + 'sources': [ + 'd8.cc', + ], + 'conditions': [ + [ 'component!="shared_library"', { + 'sources': [ 'd8-debug.cc', '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc', ], + 'conditions': [ + [ 'want_separate_host_toolset==1', { + 'dependencies': [ + 'd8_js2c#host', + ], + }, { + 'dependencies': [ + 'd8_js2c', + ], + }], + [ 'console=="readline"', { + 'libraries': [ '-lreadline', ], + 'sources': [ 'd8-readline.cc' ], + }], + ['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \ + or OS=="openbsd" or OS=="solaris" or OS=="android")', { + 'sources': [ 'd8-posix.cc', ] + }], + [ 'OS=="win"', { + 'sources': [ 'd8-windows.cc', ] + }], + ], + }], + ], + }, + { + 'target_name': 'd8_js2c', + 'type': 'none', + 'variables': { + 'js_files': [ + 'd8.js', + 'macros.py', + ], + }, + 'conditions': [ + [ 'want_separate_host_toolset==1', { + 'toolsets': ['host'], + }, { + 'toolsets': ['target'], + }] + ], + 'actions': [ + { + 'action_name': 'd8_js2c', + 'inputs': [ + '../tools/js2c.py', + '<@(js_files)', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc', + ], + 'action': [ + 'python', + '../tools/js2c.py', + '<@(_outputs)', + 'D8', + 'off', # compress startup data + '<@(js_files)' + ], + }, + ], + } + ], +}
  16. Download patch debian/rules

    --- 3.14.5.8-5/debian/rules 2013-07-06 14:15:31.000000000 +0000 +++ 3.14.5.8-5ubuntu2/debian/rules 2014-02-12 17:31:04.000000000 +0000 @@ -31,7 +31,7 @@ DEB_UPSTREAM_TARBALL_BASENAME = 6b10fef DEB_UPSTREAM_TARBALL_MD5 = be049128a44adf26f4dfb7d1ab55acfd # Supported archs -ARCHS = i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel +ARCHS = i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel powerpc ppc64 ppc64el # allow parallel builds DEB_BUILD_PARALLEL=1 @@ -50,6 +50,8 @@ v8arch := $(or $(v8arch),$(if $(filter k v8arch := $(or $(v8arch),$(if $(filter armel,$(DEB_HOST_ARCH)),arm)) v8arch := $(or $(v8arch),$(if $(filter armhf,$(DEB_HOST_ARCH)),arm)) v8arch := $(or $(v8arch),$(if $(filter mipsel,$(DEB_HOST_ARCH)),mipsel)) +v8arch := $(or $(v8arch),$(if $(filter powerpc,$(DEB_HOST_ARCH)),ppc)) +v8arch := $(or $(v8arch),$(if $(filter ppc64el,$(DEB_HOST_ARCH)),ppc64)) v8arch := $(or $(v8arch),$(DEB_HOST_ARCH)) v8os := $(or $(v8os),$(if $(filter linux,$(DEB_HOST_ARCH_OS)),linux)) v8os := $(or $(v8os),$(if $(filter kfreebsd,$(DEB_HOST_ARCH_OS)),freebsd))
  17. Download patch .pc/0099_powerpc_support.patch/src/isolate.cc
  18. Download patch src/frames-inl.h

    --- 3.14.5.8-5/src/frames-inl.h 2013-03-04 13:04:30.000000000 +0000 +++ 3.14.5.8-5ubuntu2/src/frames-inl.h 2014-03-27 07:37:40.000000000 +0000 @@ -38,6 +38,8 @@ #include "x64/frames-x64.h" #elif V8_TARGET_ARCH_ARM #include "arm/frames-arm.h" +#elif V8_TARGET_ARCH_PPC +#include "ppc/frames-ppc.h" #elif V8_TARGET_ARCH_MIPS #include "mips/frames-mips.h" #else
  19. Download patch src/flag-definitions.h

    --- 3.14.5.8-5/src/flag-definitions.h 2013-03-04 13:04:30.000000000 +0000 +++ 3.14.5.8-5ubuntu2/src/flag-definitions.h 2014-03-27 07:37:40.000000000 +0000 @@ -442,6 +442,7 @@ DEFINE_bool(trace_parse, false, "trace p // simulator-arm.cc and simulator-mips.cc DEFINE_bool(trace_sim, false, "Trace simulator execution") +DEFINE_bool(trace_sim_stubs, false, "Trace simulator execution w/ stub markers") DEFINE_bool(check_icache, false, "Check icache flushes in ARM and MIPS simulator") DEFINE_int(stop_sim_at, 0, "Simulator stop after x number of instructions") @@ -449,6 +450,8 @@ DEFINE_int(sim_stack_alignment, 8, "Stack alingment in bytes in simulator (4 or 8, 8 is default)") // isolate.cc +DEFINE_bool(abort_on_uncaught_exception, false, + "abort program (dump core) when an uncaught exception is thrown") DEFINE_bool(trace_exception, false, "print stack trace when throwing exceptions") DEFINE_bool(preallocate_message_memory, false,
  20. Download patch .pc/0099_powerpc_support.patch/src/profile-generator.cc
  21. Download patch .pc/0099_powerpc_support.patch/src/conversions-inl.h
  22. Download patch .pc/0099_powerpc_support.patch/src/objects.cc
  23. Download patch .pc/0099_powerpc_support.patch/src/assembler.h
  24. Download patch .pc/0099_powerpc_support.patch/src/codegen.cc
  25. Download patch .pc/0099_powerpc_support.patch/test/mjsunit/mjsunit.status

    --- 3.14.5.8-5/.pc/0099_powerpc_support.patch/test/mjsunit/mjsunit.status 1970-01-01 00:00:00.000000000 +0000 +++ 3.14.5.8-5ubuntu2/.pc/0099_powerpc_support.patch/test/mjsunit/mjsunit.status 2013-03-04 13:04:30.000000000 +0000 @@ -0,0 +1,181 @@ +# Copyright 2012 the V8 project authors. All rights reserved. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +prefix mjsunit + +# All tests in the bug directory are expected to fail. +bugs/*: FAIL + +############################################################################## +# Fails. +regress/regress-1119: FAIL + +# Issue 1719: Slow to collect arrays over several contexts. +regress/regress-524: SKIP +# When that bug is fixed, revert the expectation to: +# Skip long running test in debug and allow it to timeout in release mode. +# regress/regress-524: (PASS || TIMEOUT), SKIP if $mode == debug + +############################################################################## +# Too slow in debug mode with --stress-opt +compiler/regress-stacktrace-methods: PASS, SKIP if $mode == debug +compiler/regress-funcaller: PASS, SKIP if $mode == debug +regress/regress-create-exception: PASS, SKIP if $mode == debug + +############################################################################## +# These use a built-in that's only present in debug mode. They take +# too long to run in debug mode on ARM and MIPS. +fuzz-natives-part*: PASS, SKIP if ($mode == release || $arch == arm || $arch == android_arm || $arch == mipsel) + +big-object-literal: PASS, SKIP if ($arch == arm || $arch == android_arm) + +# Issue 488: this test sometimes times out. +array-constructor: PASS || TIMEOUT + +# Very slow on ARM and MIPS, contains no architecture dependent code. +unicode-case-overoptimization: PASS, TIMEOUT if ($arch == arm || $arch == android_arm || $arch == mipsel) + +############################################################################## +# This test sets the umask on a per-process basis and hence cannot be +# used in multi-threaded runs. +# On android there is no /tmp directory. +d8-os: PASS, SKIP if ($isolates || $arch == android_arm || $arch == android_ia32) +tools/tickprocessor: PASS, SKIP if ($arch == android_arm || $arch == android_ia32) + +############################################################################## +[ $arch == arm || $arch == android_arm ] + +# Slow tests which times out in debug mode. +try: PASS, SKIP if $mode == debug +debug-scripts-request: PASS, SKIP if $mode == debug +array-constructor: PASS, SKIP if $mode == debug +regress/regress-1122: PASS, SKIP if ($mode == debug && $arch == android_arm) + +# Flaky test that can hit compilation-time stack overflow in debug mode. +unicode-test: PASS, (PASS || FAIL) if $mode == debug + +# Times out often in release mode on ARM. +compiler/regress-stacktrace-methods: PASS, PASS || TIMEOUT if $mode == release +array-splice: PASS || TIMEOUT + +# Long running test. +string-indexof-2: PASS || TIMEOUT +mirror-object: PASS || TIMEOUT + +# BUG(3251035): Timeouts in long looping crankshaft optimization +# tests. Skipping because having them timeout takes too long on the +# buildbot. +compiler/alloc-number: SKIP +compiler/array-length: SKIP +compiler/assignment-deopt: SKIP +compiler/deopt-args: SKIP +compiler/inline-compare: SKIP +compiler/inline-global-access: SKIP +compiler/optimized-function-calls: SKIP +compiler/pic: SKIP +compiler/property-calls: SKIP +compiler/recursive-deopt: SKIP +compiler/regress-4: SKIP +compiler/regress-funcaller: SKIP +compiler/regress-rep-change: SKIP +compiler/regress-arguments: SKIP +compiler/regress-funarguments: SKIP +compiler/regress-3249650: SKIP +compiler/simple-deopt: SKIP +regress/regress-490: SKIP +regress/regress-634: SKIP +regress/regress-create-exception: SKIP +regress/regress-3218915: SKIP +regress/regress-3247124: SKIP + +# Requires bigger stack size in the Genesis and if stack size is increased, +# the test requires too much time to run. However, the problem test covers +# should be platform-independent. +regress/regress-1132: SKIP + +# Stack manipulations in LiveEdit is not implemented for this arch. +debug-liveedit-check-stack: SKIP +debug-liveedit-stack-padding: SKIP +debug-liveedit-restart-frame: SKIP +debug-liveedit-double-call: SKIP + +# Currently always deopt on minus zero +math-floor-of-div-minus-zero: SKIP + +############################################################################## +[ $arch == mipsel ] + +# Slow tests which times out in debug mode. +try: PASS, SKIP if $mode == debug +debug-scripts-request: PASS, SKIP if $mode == debug +array-constructor: PASS, SKIP if $mode == debug + +# Times out often in release mode on MIPS. +compiler/regress-stacktrace-methods: PASS, PASS || TIMEOUT if $mode == release +array-splice: PASS || TIMEOUT + +# Long running test. +mirror-object: PASS || TIMEOUT +string-indexof-2: PASS || TIMEOUT + +# BUG(3251035): Timeouts in long looping crankshaft optimization +# tests. Skipping because having them timeout takes too long on the +# buildbot. +compiler/alloc-number: SKIP +compiler/array-length: SKIP +compiler/assignment-deopt: SKIP +compiler/deopt-args: SKIP +compiler/inline-compare: SKIP +compiler/inline-global-access: SKIP +compiler/optimized-function-calls: SKIP +compiler/pic: SKIP +compiler/property-calls: SKIP +compiler/recursive-deopt: SKIP +compiler/regress-4: SKIP +compiler/regress-funcaller: SKIP +compiler/regress-rep-change: SKIP +compiler/regress-arguments: SKIP +compiler/regress-funarguments: SKIP +compiler/regress-3249650: SKIP +compiler/simple-deopt: SKIP +regress/regress-490: SKIP +regress/regress-634: SKIP +regress/regress-create-exception: SKIP +regress/regress-3218915: SKIP +regress/regress-3247124: SKIP + +# Requires bigger stack size in the Genesis and if stack size is increased, +# the test requires too much time to run. However, the problem test covers +# should be platform-independent. +regress/regress-1132: SKIP + +# Stack manipulations in LiveEdit is not implemented for this arch. +debug-liveedit-check-stack: SKIP +debug-liveedit-stack-padding: SKIP +debug-liveedit-restart-frame: SKIP +debug-liveedit-double-call: SKIP +
  26. Download patch debian/control

    --- 3.14.5.8-5/debian/control 2013-07-22 08:30:43.000000000 +0000 +++ 3.14.5.8-5ubuntu2/debian/control 2014-02-12 17:27:13.000000000 +0000 @@ -1,6 +1,7 @@ Source: libv8-3.14 Priority: optional -Maintainer: Debian Javascript Maintainers <pkg-javascript-devel@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Javascript Maintainers <pkg-javascript-devel@lists.alioth.debian.org> Uploaders: Jérémy Lal <kapouer@melix.org>, Jonas Smedegaard <dr@jones.dk> Build-Depends: cdbs, @@ -16,7 +17,7 @@ Vcs-Git: git://anonscm.debian.org/collab Package: libv8-dev Section: libdevel -Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel +Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel powerpc ppc64 ppc64el Depends: libv8-3.14.5 (= ${binary:Version}), ${misc:Depends} Conflicts: libv8-legacy-dev, libv8-3.14-dev Replaces: libv8-legacy-dev, libv8-3.14-dev @@ -28,7 +29,7 @@ Description: V8 JavaScript engine - deve Package: libv8-3.14-dev Section: libdevel -Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel +Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel powerpc ppc64 ppc64el Depends: libv8-3.14.5 (= ${binary:Version}), ${misc:Depends} Provides: libv8-legacy-dev, libv8-dev Conflicts: libv8-dev @@ -40,7 +41,7 @@ Description: V8 JavaScript engine - deve This package provide development headers for V8 3.14 branch. Package: libv8-3.14.5 -Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel +Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel powerpc ppc64 ppc64el Depends: ${shlibs:Depends}, ${misc:Depends} Description: V8 JavaScript engine - runtime library V8 is a high performance JavaScript engine written in C++. It is used @@ -51,7 +52,7 @@ Description: V8 JavaScript engine - runt Package: libv8-3.14-dbg Priority: extra Section: debug -Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel +Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel powerpc ppc64 ppc64el Depends: libv8-3.14.5 (= ${binary:Version}), ${misc:Depends} Description: V8 JavaScript engine - debugging symbols V8 is a high performance JavaScript engine written in C++. It is used
  27. Download patch .pc/0099_powerpc_support.patch/src/isolate.h
  28. Download patch src/codegen.h

    --- 3.14.5.8-5/src/codegen.h 2013-03-04 13:04:30.000000000 +0000 +++ 3.14.5.8-5ubuntu2/src/codegen.h 2014-03-27 07:37:40.000000000 +0000 @@ -75,6 +75,8 @@ enum TypeofState { INSIDE_TYPEOF, NOT_IN #include "x64/codegen-x64.h" #elif V8_TARGET_ARCH_ARM #include "arm/codegen-arm.h" +#elif V8_TARGET_ARCH_PPC +#include "ppc/codegen-ppc.h" #elif V8_TARGET_ARCH_MIPS #include "mips/codegen-mips.h" #else
  29. Download patch src/assembler.cc

    --- 3.14.5.8-5/src/assembler.cc 2013-03-04 13:04:30.000000000 +0000 +++ 3.14.5.8-5ubuntu2/src/assembler.cc 2014-03-27 07:37:40.000000000 +0000 @@ -61,6 +61,8 @@ #include "x64/assembler-x64-inl.h" #elif V8_TARGET_ARCH_ARM #include "arm/assembler-arm-inl.h" +#elif V8_TARGET_ARCH_PPC +#include "ppc/assembler-ppc-inl.h" #elif V8_TARGET_ARCH_MIPS #include "mips/assembler-mips-inl.h" #else @@ -75,6 +77,8 @@ #include "x64/regexp-macro-assembler-x64.h" #elif V8_TARGET_ARCH_ARM #include "arm/regexp-macro-assembler-arm.h" +#elif V8_TARGET_ARCH_PPC +#include "ppc/regexp-macro-assembler-ppc.h" #elif V8_TARGET_ARCH_MIPS #include "mips/regexp-macro-assembler-mips.h" #else // Unknown architecture. @@ -1064,6 +1068,8 @@ ExternalReference ExternalReference::re_ function = FUNCTION_ADDR(RegExpMacroAssemblerIA32::CheckStackGuardState); #elif V8_TARGET_ARCH_ARM function = FUNCTION_ADDR(RegExpMacroAssemblerARM::CheckStackGuardState); +#elif V8_TARGET_ARCH_PPC + function = FUNCTION_ADDR(RegExpMacroAssemblerPPC::CheckStackGuardState); #elif V8_TARGET_ARCH_MIPS function = FUNCTION_ADDR(RegExpMacroAssemblerMIPS::CheckStackGuardState); #else @@ -1221,6 +1227,21 @@ double power_double_double(double x, dou } if (x == 2.0) { + int y_int = static_cast<int>(y); + if (y == y_int) return ldexp(1.0, y_int); + } +#elif defined(_AIX) + // AIX has a custom implementation for pow. This handles certain + // special cases that are different. + if ((x == 0.0 || isinf(x)) && y != 0.0 && isfinite(y)) { + double f; + double result = ((x == 0.0) ^ (y > 0)) ? V8_INFINITY : 0; + /* retain sign if odd integer exponent */ + return ((modf(y, &f) == 0.0) && (static_cast<int64_t>(y) & 1)) ? + copysign(result, x) : result; + } + + if (x == 2.0) { int y_int = static_cast<int>(y); if (y == y_int) return ldexp(1.0, y_int); }
  30. Download patch src/heap.cc

    --- 3.14.5.8-5/src/heap.cc 2013-03-04 13:04:30.000000000 +0000 +++ 3.14.5.8-5ubuntu2/src/heap.cc 2014-03-27 07:37:40.000000000 +0000 @@ -50,6 +50,10 @@ #include "v8threads.h" #include "v8utils.h" #include "vm-state-inl.h" +#if V8_TARGET_ARCH_PPC && !V8_INTERPRETED_REGEXP +#include "regexp-macro-assembler.h" +#include "ppc/regexp-macro-assembler-ppc.h" +#endif #if V8_TARGET_ARCH_ARM && !V8_INTERPRETED_REGEXP #include "regexp-macro-assembler.h" #include "arm/regexp-macro-assembler-arm.h"
  31. Download patch .pc/0099_powerpc_support.patch/.gitignore

    --- 3.14.5.8-5/.pc/0099_powerpc_support.patch/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ 3.14.5.8-5ubuntu2/.pc/0099_powerpc_support.patch/.gitignore 2013-03-04 13:04:30.000000000 +0000 @@ -0,0 +1,52 @@ +*.a +*.exe +*.idb +*.lib +*.log +*.map +*.mk +*.ncb +*.pdb +*.pyc +*.scons* +*.sln +*.so +*.suo +*.user +*.vcproj +*.xcodeproj +#*# +*~ +.cpplint-cache +d8 +d8_g +shell +shell_g +/build/Debug +/build/gyp +/build/Release +/obj +/out +/test/cctest/cctest.status2 +/test/es5conform/data +/test/message/message.status2 +/test/mjsunit/mjsunit.status2 +/test/mozilla/CHECKED_OUT_VERSION +/test/mozilla/data +/test/mozilla/downloaded_* +/test/mozilla/mozilla.status2 +/test/preparser/preparser.status2 +/test/sputnik/sputniktests +/test/test262/data +/test/test262/test262-* +/test/test262/test262.status2 +/third_party +/tools/jsfunfuzz +/tools/jsfunfuzz.zip +/tools/oom_dump/oom_dump +/tools/oom_dump/oom_dump.o +/tools/visual_studio/Debug +/tools/visual_studio/Release +/xcodebuild +TAGS +*.Makefile
  32. Download patch src/isolate.h

    --- 3.14.5.8-5/src/isolate.h 2013-03-04 13:04:30.000000000 +0000 +++ 3.14.5.8-5ubuntu2/src/isolate.h 2014-03-27 07:37:40.000000000 +0000 @@ -94,7 +94,9 @@ class Debugger; class DebuggerAgent; #endif -#if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \ +#if defined(NATIVE_SIMULATION) || \ + !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \ + !defined(__PPC__) && defined(V8_TARGET_ARCH_PPC) || \ !defined(__mips__) && defined(V8_TARGET_ARCH_MIPS) class Redirection; class Simulator; @@ -256,7 +258,8 @@ class ThreadLocalTop BASE_EMBEDDED { Address handler_; // try-blocks are chained through the stack #ifdef USE_SIMULATOR -#if defined(V8_TARGET_ARCH_ARM) || defined(V8_TARGET_ARCH_MIPS) +#if defined(V8_TARGET_ARCH_ARM) || defined(V8_TARGET_ARCH_PPC) || \ + defined(V8_TARGET_ARCH_MIPS) Simulator* simulator_; #endif #endif // USE_SIMULATOR @@ -374,7 +377,9 @@ class Isolate { thread_id_(thread_id), stack_limit_(0), thread_state_(NULL), -#if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \ +#if defined(NATIVE_SIMULATION) || \ + !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \ + !defined(__PPC__) && defined(V8_TARGET_ARCH_PPC) || \ !defined(__mips__) && defined(V8_TARGET_ARCH_MIPS) simulator_(NULL), #endif @@ -387,7 +392,9 @@ class Isolate { ThreadState* thread_state() const { return thread_state_; } void set_thread_state(ThreadState* value) { thread_state_ = value; } -#if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \ +#if defined(NATIVE_SIMULATION) || \ + !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \ + !defined(__PPC__) && defined(V8_TARGET_ARCH_PPC) || \ !defined(__mips__) && defined(V8_TARGET_ARCH_MIPS) Simulator* simulator() const { return simulator_; } void set_simulator(Simulator* simulator) { @@ -405,7 +412,9 @@ class Isolate { uintptr_t stack_limit_; ThreadState* thread_state_; -#if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \ +#if defined(NATIVE_SIMULATION) || \ + !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \ + !defined(__PPC__) && defined(V8_TARGET_ARCH_PPC) || \ !defined(__mips__) && defined(V8_TARGET_ARCH_MIPS) Simulator* simulator_; #endif @@ -969,7 +978,9 @@ class Isolate { int* code_kind_statistics() { return code_kind_statistics_; } #endif -#if defined(V8_TARGET_ARCH_ARM) && !defined(__arm__) || \ +#if defined(NATIVE_SIMULATION) || \ + defined(V8_TARGET_ARCH_ARM) && !defined(__arm__) || \ + defined(V8_TARGET_ARCH_PPC) && !defined(__PPC__) || \ defined(V8_TARGET_ARCH_MIPS) && !defined(__mips__) bool simulator_initialized() { return simulator_initialized_; } void set_simulator_initialized(bool initialized) { @@ -1249,7 +1260,9 @@ class Isolate { // Time stamp at initialization. double time_millis_at_init_; -#if defined(V8_TARGET_ARCH_ARM) && !defined(__arm__) || \ +#if defined(NATIVE_SIMULATION) || \ + defined(V8_TARGET_ARCH_ARM) && !defined(__arm__) || \ + defined(V8_TARGET_ARCH_PPC) && !defined(__PPC__) || \ defined(V8_TARGET_ARCH_MIPS) && !defined(__mips__) bool simulator_initialized_; HashMap* simulator_i_cache_;
  33. Download patch src/atomicops.h

    --- 3.14.5.8-5/src/atomicops.h 2013-03-04 13:04:30.000000000 +0000 +++ 3.14.5.8-5ubuntu2/src/atomicops.h 2014-03-27 07:37:40.000000000 +0000 @@ -69,7 +69,8 @@ typedef intptr_t Atomic64; // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or // Atomic64 routines below, depending on your architecture. -#if defined(__OpenBSD__) && defined(__i386__) +#if !defined(V8_HOST_ARCH_64_BIT) && \ + ((defined(__OpenBSD__) && defined(__i386__)) || defined(_AIX)) typedef Atomic32 AtomicWord; #else typedef intptr_t AtomicWord; @@ -162,6 +163,8 @@ Atomic64 Release_Load(volatile const Ato #include "atomicops_internals_x86_gcc.h" #elif defined(__GNUC__) && defined(V8_HOST_ARCH_ARM) #include "atomicops_internals_arm_gcc.h" +#elif defined(__GNUC__) && defined(V8_HOST_ARCH_PPC) +#include "atomicops_internals_ppc_gcc.h" #elif defined(__GNUC__) && defined(V8_HOST_ARCH_MIPS) #include "atomicops_internals_mips_gcc.h" #else
  34. Download patch .pc/0099_powerpc_support.patch/tools/gyp/v8.gyp
  35. Download patch src/conversions-inl.h

    --- 3.14.5.8-5/src/conversions-inl.h 2013-03-04 13:04:30.000000000 +0000 +++ 3.14.5.8-5ubuntu2/src/conversions-inl.h 2014-03-27 07:37:40.000000000 +0000 @@ -75,7 +75,11 @@ inline unsigned int FastD2UI(double x) { if (x < k2Pow52) { x += k2Pow52; uint32_t result; +#if __FLOAT_WORD_ORDER == __LITTLE_ENDIAN Address mantissa_ptr = reinterpret_cast<Address>(&x); +#else + Address mantissa_ptr = reinterpret_cast<Address>(&x) + kIntSize; +#endif // Copy least significant 32 bits of mantissa. memcpy(&result, mantissa_ptr, sizeof(result)); return negative ? ~result + 1 : result;
  36. Download patch debian/control.in

    --- 3.14.5.8-5/debian/control.in 2013-12-19 23:27:20.000000000 +0000 +++ 3.14.5.8-5ubuntu2/debian/control.in 2014-02-13 00:40:44.000000000 +0000 @@ -13,7 +13,7 @@ Vcs-Git: git://anonscm.debian.org/collab Package: libv8-dev Section: libdevel -Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel +Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel powerpc ppc64 ppc64el Depends: libv8-3.14.5 (= ${binary:Version}), ${misc:Depends} Conflicts: libv8-legacy-dev, libv8-3.14-dev Replaces: libv8-legacy-dev, libv8-3.14-dev @@ -25,7 +25,7 @@ Description: V8 JavaScript engine - deve Package: libv8-3.14-dev Section: libdevel -Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel +Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel powerpc ppc64 ppc64el Depends: libv8-3.14.5 (= ${binary:Version}), ${misc:Depends} Provides: libv8-legacy-dev, libv8-dev Conflicts: libv8-dev @@ -37,7 +37,7 @@ Description: V8 JavaScript engine - deve This package provide development headers for V8 3.14 branch. Package: libv8-3.14.5 -Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel +Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel powerpc ppc64 ppc64el Depends: ${shlibs:Depends}, ${misc:Depends} Description: V8 JavaScript engine - runtime library V8 is a high performance JavaScript engine written in C++. It is used @@ -48,7 +48,7 @@ Description: V8 JavaScript engine - runt Package: libv8-3.14-dbg Priority: extra Section: debug -Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel +Architecture: i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf mipsel powerpc ppc64 ppc64el Depends: libv8-3.14.5 (= ${binary:Version}), ${misc:Depends} Description: V8 JavaScript engine - debugging symbols V8 is a high performance JavaScript engine written in C++. It is used
  37. Download patch .pc/applied-patches

    --- 3.14.5.8-5/.pc/applied-patches 2014-03-27 07:37:39.465640869 +0000 +++ 3.14.5.8-5ubuntu2/.pc/applied-patches 2014-03-27 07:37:40.757674695 +0000 @@ -4,3 +4,4 @@ 0012_loongson_force_cache_flush.patch 0013_gcc_48_compat.patch 0014_cve_2013_6639_6640.patch +0099_powerpc_support.patch
  38. Download patch build/common.gypi

    --- 3.14.5.8-5/build/common.gypi 2013-03-04 13:04:30.000000000 +0000 +++ 3.14.5.8-5ubuntu2/build/common.gypi 2014-03-27 07:37:40.000000000 +0000 @@ -70,9 +70,13 @@ 'v8_enable_disassembler%': 0, + 'v8_native_sim%': 'false', + # Enable extra checks in API functions and other strategic places. 'v8_enable_extra_checks%': 1, + 'v8_enable_extra_ppcchecks%': 0, + 'v8_enable_gdbjit%': 0, 'v8_object_print%': 0, @@ -117,6 +121,9 @@ ['v8_enable_extra_checks==1', { 'defines': ['ENABLE_EXTRA_CHECKS',], }], + ['v8_enable_extra_ppcchecks==1', { + 'defines': ['ENABLE_EXTRA_PPCCHECKS',], + }], ['v8_enable_gdbjit==1', { 'defines': ['ENABLE_GDB_JIT_INTERFACE',], }], @@ -129,6 +136,12 @@ ['v8_interpreted_regexp==1', { 'defines': ['V8_INTERPRETED_REGEXP',], }], + ['v8_native_sim=="true"', { + 'defines': [ + 'NATIVE_SIMULATION', + 'USE_SIMULATOR', + ], + }], ['v8_target_arch=="arm"', { 'defines': [ 'V8_TARGET_ARCH_ARM', @@ -171,6 +184,17 @@ }], ], }], # v8_target_arch=="arm" + ['v8_target_arch=="ppc"', { + 'defines': [ + 'V8_TARGET_ARCH_PPC', + ], + }], # v8_target_arch=="ppc" + ['v8_target_arch=="ppc64"', { + 'defines': [ + 'V8_TARGET_ARCH_PPC', + 'V8_TARGET_ARCH_PPC64', + ], + }], # v8_target_arch=="ppc64" ['v8_target_arch=="ia32"', { 'defines': [ 'V8_TARGET_ARCH_IA32', @@ -277,7 +301,7 @@ }, }], ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ - or OS=="netbsd"', { + or OS=="netbsd" or OS=="aix"', { 'conditions': [ [ 'v8_no_strict_aliasing==1', { 'cflags': [ '-fno-strict-aliasing' ], @@ -290,7 +314,7 @@ ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ or OS=="netbsd" or OS=="mac" or OS=="android") and \ (v8_target_arch=="arm" or v8_target_arch=="ia32" or \ - v8_target_arch=="mipsel")', { + v8_target_arch=="mipsel" or v8_target_arch=="ppc")', { # Check whether the host compiler and target compiler support the # '-m32' option and set it if so. 'target_conditions': [ @@ -327,6 +351,20 @@ ['OS=="netbsd"', { 'cflags': [ '-I/usr/pkg/include' ], }], + ['OS=="aix"', { + # AIX is missing /usr/include/endian.h + 'defines': [ + '__LITTLE_ENDIAN=1234', + '__BIG_ENDIAN=4321', + '__BYTE_ORDER=__BIG_ENDIAN', + '__FLOAT_WORD_ORDER=__BIG_ENDIAN'], + 'conditions': [ + [ 'v8_target_arch=="ppc64"', { + 'cflags': [ '-maix64' ], + 'ldflags': [ '-maix64' ], + }], + ], + }], ], # conditions 'configurations': { 'Debug': { @@ -354,10 +392,14 @@ }, }, 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \ + or OS=="aix"', { 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', '-Wnon-virtual-dtor', '-Woverloaded-virtual' ], }], + ['OS=="aix"', { + 'ldflags': [ '-Wl,-bbigtoc' ], + }], ['OS=="android"', { 'variables': { 'android_full_debug%': 1, @@ -377,7 +419,7 @@ 'Release': { 'conditions': [ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \ - or OS=="android"', { + or OS=="android" or OS=="aix"', { 'cflags!': [ '-O2', '-Os',
  39. Download patch .pc/0099_powerpc_support.patch/src/runtime.cc
  40. Download patch .pc/0099_powerpc_support.patch/src/full-codegen.h
  41. Download patch .pc/0099_powerpc_support.patch/src/frames-inl.h
  42. Download patch src/hydrogen.cc

    --- 3.14.5.8-5/src/hydrogen.cc 2014-03-27 07:37:39.000000000 +0000 +++ 3.14.5.8-5ubuntu2/src/hydrogen.cc 2014-03-27 07:37:40.000000000 +0000 @@ -43,6 +43,8 @@ #include "x64/lithium-codegen-x64.h" #elif V8_TARGET_ARCH_ARM #include "arm/lithium-codegen-arm.h" +#elif V8_TARGET_ARCH_PPC +#include "ppc/lithium-codegen-ppc.h" #elif V8_TARGET_ARCH_MIPS #include "mips/lithium-codegen-mips.h" #else
  43. Download patch .pc/0099_powerpc_support.patch/build/common.gypi
  44. Download patch .gitignore

    --- 3.14.5.8-5/.gitignore 2013-03-04 13:04:30.000000000 +0000 +++ 3.14.5.8-5ubuntu2/.gitignore 2014-03-27 07:37:40.000000000 +0000 @@ -12,6 +12,7 @@ *.sln *.so *.suo +*.swp *.user *.vcproj *.xcodeproj
  45. Download patch src/jsregexp.cc

    --- 3.14.5.8-5/src/jsregexp.cc 2013-03-04 13:04:30.000000000 +0000 +++ 3.14.5.8-5ubuntu2/src/jsregexp.cc 2014-03-27 07:37:40.000000000 +0000 @@ -50,6 +50,8 @@ #include "x64/regexp-macro-assembler-x64.h" #elif V8_TARGET_ARCH_ARM #include "arm/regexp-macro-assembler-arm.h" +#elif V8_TARGET_ARCH_PPC +#include "ppc/regexp-macro-assembler-ppc.h" #elif V8_TARGET_ARCH_MIPS #include "mips/regexp-macro-assembler-mips.h" #else @@ -6131,6 +6133,9 @@ RegExpEngine::CompilationResult RegExpEn #elif V8_TARGET_ARCH_ARM RegExpMacroAssemblerARM macro_assembler(mode, (data->capture_count + 1) * 2, zone); +#elif V8_TARGET_ARCH_PPC + RegExpMacroAssemblerPPC macro_assembler(mode, (data->capture_count + 1) * 2, + zone); #elif V8_TARGET_ARCH_MIPS RegExpMacroAssemblerMIPS macro_assembler(mode, (data->capture_count + 1) * 2, zone);
  46. Download patch src/hydrogen-instructions.cc

    --- 3.14.5.8-5/src/hydrogen-instructions.cc 2013-03-04 13:04:30.000000000 +0000 +++ 3.14.5.8-5ubuntu2/src/hydrogen-instructions.cc 2014-03-27 07:37:40.000000000 +0000 @@ -36,6 +36,8 @@ #include "x64/lithium-x64.h" #elif V8_TARGET_ARCH_ARM #include "arm/lithium-arm.h" +#elif V8_TARGET_ARCH_PPC +#include "ppc/lithium-ppc.h" #elif V8_TARGET_ARCH_MIPS #include "mips/lithium-mips.h" #else @@ -966,8 +968,8 @@ HValue* HUnaryMathOperation::Canonicaliz // introduced. if (value()->representation().IsInteger32()) return value();