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

ant (1.9.6-1ubuntu1) wily; urgency=low * Merge from Debian unstable. Remaining changes: - Revert back to using libgnumail-java to avoid inclusion of Maven in Ubuntu main. -- James Page <james.page@ubuntu.com> Wed, 08 Jul 2015 15:58:06 +0100

Modifications :
  1. Download patch debian/rules

    --- 1.9.6-1/debian/rules 2015-06-06 14:39:03.000000000 +0000 +++ 1.9.6-1ubuntu1/debian/rules 2015-07-08 14:50:53.000000000 +0000 @@ -29,7 +29,7 @@ export ANT_HOME := bootstrap PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) JAR_PATH := /usr/share/java -CLASSPATH := ${JAR_PATH}/activation.jar:${JAR_PATH}/antlr.jar:${JAR_PATH}/bcel.jar:${JAR_PATH}/bsf.jar:${JAR_PATH}/commons-logging.jar:${JAR_PATH}/javax.mail.jar:${JAR_PATH}/inetlib.jar:${JAR_PATH}/jdepend.jar:${JAR_PATH}/junit.jar:${JAR_PATH}/log4j-1.2.jar:${JAR_PATH}/oro.jar:${JAR_PATH}/regexp.jar:${JAR_PATH}/xalan2.jar:${JAR_PATH}/xml-resolver-1.2.jar:${JAR_PATH}/commons-net.jar:${JAR_PATH}/jsch.jar:${JAR_PATH}/junit4.jar +CLASSPATH := ${JAR_PATH}/activation.jar:${JAR_PATH}/antlr.jar:${JAR_PATH}/bcel.jar:${JAR_PATH}/bsf.jar:${JAR_PATH}/commons-logging.jar:${JAR_PATH}/gnumail.jar:${JAR_PATH}/inetlib.jar:${JAR_PATH}/jdepend.jar:${JAR_PATH}/junit.jar:${JAR_PATH}/log4j-1.2.jar:${JAR_PATH}/oro.jar:${JAR_PATH}/regexp.jar:${JAR_PATH}/xalan2.jar:${JAR_PATH}/xml-resolver-1.2.jar:${JAR_PATH}/commons-net.jar:${JAR_PATH}/jsch.jar:${JAR_PATH}/junit4.jar DATE := $(shell dpkg-parsechangelog --show-field Date) TODAY := $(shell date --date='$(DATE)' --utc +'%B %-d %Y')
  2. Download patch debian/control

    --- 1.9.6-1/debian/control 2015-06-06 13:28:46.000000000 +0000 +++ 1.9.6-1ubuntu1/debian/control 2015-07-06 16:09:28.000000000 +0000 @@ -1,7 +1,8 @@ Source: ant 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@debian.org>, Ludovic Claude <ludovic.claude@laposte.net>, Torsten Werner <twerner@debian.org>, @@ -18,7 +19,7 @@ Build-Depends: antlr, libbsf-java (>= 2.3.0rc1), libcommons-logging-java, libcommons-net-java, - libmail-java, + libgnumail-java, libjdepend-java, libjsch-java, liblog4j1.2-java, @@ -67,7 +68,7 @@ Suggests: ant-optional-gcj, libbsf-java, libcommons-logging-java, libcommons-net-java, - libmail-java, + libgnumail-java, libjaxp1.3-java, libjdepend-java, libjsch-java,
  3. Download patch debian/maven.rules

    --- 1.9.6-1/debian/maven.rules 2015-06-06 13:28:46.000000000 +0000 +++ 1.9.6-1ubuntu1/debian/maven.rules 2015-07-06 16:09:28.000000000 +0000 @@ -7,4 +7,3 @@ commons-net commons-net jar s/1\..+/1.x/ commons-net commons-net jar s/2\..+/2.x/ log4j log4j jar s/1\.2\..*/1.2.x/ s/regexp/jakarta-regexp/ s/regexp/jakarta-regexp/ * s/.*/debian/ -s/javax.mail/com.sun.mail/ s/mail/javax.mail/ * s/.*/debian/

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

Source: antlr

antlr (2.7.7+dfsg-6ubuntu1) xenial; urgency=high * Drop winforms build-dep. -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 04 Jan 2016 16:38:18 +0000 antlr (2.7.7+dfsg-6build1) wily; urgency=medium * No-change rebuild for G++ ABI transition. -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 09 Aug 2015 05:10:39 +0000

Modifications :
  1. Download patch debian/control

    --- 2.7.7+dfsg-6/debian/control 2014-10-10 10:58:12.000000000 +0000 +++ 2.7.7+dfsg-6ubuntu1/debian/control 2016-01-04 16:38:36.000000000 +0000 @@ -1,10 +1,11 @@ Source: antlr 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 (>= 9), default-jdk, python (>= 2.6.6-3~), autotools-dev, python-all-dev (>= 2.3.5-11), sharutils -Build-Depends-Indep: maven-repo-helper, nant, cli-common-dev (>= 0.7), mono-devel | c-sharp-compiler, libmono-winforms2.0-cil +Build-Depends-Indep: maven-repo-helper, nant, cli-common-dev (>= 0.7), mono-devel | c-sharp-compiler Standards-Version: 3.9.6 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/antlr Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/antlr

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

Source: apache-log4j1.2

apache-log4j1.2 (1.2.17-6ubuntu1) wily; urgency=low * Merge from Debian unstable. Remaining changes: - d/{rules,control}: Remove dependency on bnd and don't add OSGi headers to jar file. - d/liblog4j1.2.manifest,control,rules: Add OSGi manifest for log4j using javahelper. - d/control,rules: Switch libmail-java -> libgnumail-java to avoid Maven in Ubuntu main. -- James Page <james.page@ubuntu.com> Wed, 08 Jul 2015 15:48:09 +0100

Modifications :
  1. Download patch debian/rules

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

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

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

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

Source: batik

batik (1.8-3ubuntu1) xenial; urgency=medium * d/control: Demote runtime dependency on fop to Suggests to support demotion of fop to universe. -- James Page <james.page@ubuntu.com> Mon, 04 Jan 2016 13:58:24 +0000

Modifications :
  1. Download patch debian/control

    --- 1.8-3/debian/control 2015-09-12 20:18:43.000000000 +0000 +++ 1.8-3ubuntu1/debian/control 2016-01-04 12:47:45.000000000 +0000 @@ -1,7 +1,8 @@ Source: batik 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: Wolfgang Baer <WBaer@gmx.de>, Vincent Fourmond <fourmond@debian.org>, Onkar Shinde <onkarshinde@ubuntu.com> @@ -32,7 +33,8 @@ Depends: java-wrappers (>= 0.1.12), libxml-commons-external-java, libxmlgraphics-commons-java (>= 2.0.1), ${misc:Depends} -Recommends: default-jre, fop (>= 1:0.94), rhino +Recommends: default-jre, rhino +Suggests: fop (>= 1:0.94) Breaks: elki (<= 0.6.5), libfop-java (<< 2.0) Description: xml.apache.org SVG Library Batik is a toolkit for applications or applets that want to use images

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

Source: bcel

bcel (6.0~rc3-1ubuntu1) vivid; urgency=medium * Switch to using maven-ant-helper for build, avoiding inclusion of Maven in Ubuntu main. -- James Page <james.page@ubuntu.com> Tue, 27 Jan 2015 13:35:22 +0000

Modifications :
  1. Download patch debian/libbcel-java-doc.install

    --- 6.0~rc3-1/debian/libbcel-java-doc.install 2014-04-24 15:27:21.000000000 +0000 +++ 6.0~rc3-1ubuntu1/debian/libbcel-java-doc.install 2015-01-27 13:34:24.000000000 +0000 @@ -1 +1 @@ -target/apidocs/* usr/share/doc/libbcel-java/api +build/docs/api/* usr/share/doc/libbcel-java/api
  2. Download patch debian/rules

    --- 6.0~rc3-1/debian/rules 2014-10-24 13:01:49.000000000 +0000 +++ 6.0~rc3-1ubuntu1/debian/rules 2015-01-27 13:32:36.000000000 +0000 @@ -1,11 +1,22 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk +include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt +# Switch to maven-ant-helper +PACKAGE := libbcel-java +VERSION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+)~.*,\1,p') +DEB_JARS := ant-nodeps junit4 ant-junit +DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml +DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=bcel -Dbin.package=$(PACKAGE) -Dversion=$(VERSION) -Djavadoc.generate=true + +binary-post-install/$(PACKAGE):: + mh_installpoms -p$(PACKAGE) + mh_installjar -p$(PACKAGE) -l pom.xml build/bcel-$(VERSION).jar + get-orig-source: uscan --download-current-version --force-download --rename
  3. Download patch debian/control

    --- 6.0~rc3-1/debian/control 2014-10-24 14:11:51.000000000 +0000 +++ 6.0~rc3-1ubuntu1/debian/control 2015-01-27 13:11:37.000000000 +0000 @@ -1,10 +1,11 @@ Source: bcel 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>, Emmanuel Bourg <ebourg@apache.org> -Build-Depends-Indep: maven-debian-helper, default-jdk, default-jdk-doc -Build-Depends: cdbs (>= 0.4.5.3), debhelper (>= 9), libmaven-javadoc-plugin-java +Build-Depends-Indep: maven-ant-helper, default-jdk, default-jdk-doc, maven-repo-helper +Build-Depends: cdbs (>= 0.4.5.3), debhelper (>= 9), junit4 Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/bcel.git Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/bcel.git

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

Source: bouncycastle

bouncycastle (1.49+dfsg-3ubuntu1) vivid; urgency=medium * d/control,rules: Switch libmail-java -> libgnumail-java to support continued inclusion of bouncycastle in Ubuntu main. -- James Page <james.page@ubuntu.com> Thu, 27 Nov 2014 17:06:47 +0000

Modifications :
  1. Download patch debian/rules

    --- 1.49+dfsg-3/debian/rules 2014-10-22 11:34:15.000000000 +0000 +++ 1.49+dfsg-3ubuntu1/debian/rules 2014-11-27 17:03:00.000000000 +0000 @@ -9,7 +9,7 @@ ARTIFACTS = bcprov bcpg bcmail bcpkix BUILD_DIR = build/artifacts/jdk1.5 JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := junit javax.mail +DEB_JARS := junit gnumail DEB_ANT_BUILDFILE := jdk15+.xml DEB_ANT_BUILD_TARGET := build-provider build DEB_INSTALL_CHANGELOGS_ALL := releasenotes.html
  2. Download patch debian/control

    --- 1.49+dfsg-3/debian/control 2014-10-22 11:34:01.000000000 +0000 +++ 1.49+dfsg-3ubuntu1/debian/control 2014-11-27 16:42:15.000000000 +0000 @@ -1,7 +1,8 @@ Source: bouncycastle 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: Brian Thomason <brian.thomason@eucalyptus.com>, Emmanuel Bourg <ebourg@apache.org> Build-Depends: ant, @@ -11,7 +12,7 @@ Build-Depends: ant, default-jdk (>= 1:1.6), javahelper, junit, - libmail-java, + libgnumail-java, maven-repo-helper Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/bouncycastle.git @@ -48,7 +49,7 @@ Package: libbcmail-java Architecture: all Depends: libbcpkix-java (>= ${source:Version}), libbcprov-java (>= ${source:Version}), - libmail-java, + libgnumail-java, ${misc:Depends} Suggests: libbcmail-java-doc Description: Bouncy Castle generators/processors for S/MIME and CMS

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

Source: commons-configuration

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

Modifications :
  1. Download patch debian/control

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

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

Source: 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-3ubuntu1) wily; urgency=medium * debian/control: doxia-logging-api is now in libdoxia-core-java instead of in libdoxia-java, so update the appropriate Breaks/Replaces since we had a version 1.1.4-2ubuntu1. -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Mon, 31 Aug 2015 13:57:07 -0400

Modifications :
  1. Download patch debian/control

    --- 1.1.4-3/debian/control 2015-08-05 11:54:32.000000000 +0000 +++ 1.1.4-3ubuntu1/debian/control 2015-08-31 17:58:11.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: Torsten Werner <twerner@debian.org> Build-Depends: cdbs, debhelper (>= 9), @@ -56,8 +57,8 @@ Description: Doxia content generation fr Package: libdoxia-core-java Architecture: all Depends: ${misc:Depends}, libcommons-lang-java, libhttpclient-java, libplexus-utils-java -Breaks: libdoxia-java (<= 1.1.4-2) -Replaces: libdoxia-java (<= 1.1.4-2) +Breaks: libdoxia-java (<= 1.1.4-2ubuntu1) +Replaces: libdoxia-java (<= 1.1.4-2ubuntu1) Description: Doxia content generation framework (core) Doxia is a content generation framework which aims to provide its users with powerful techniques for generating static and dynamic content.

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: excalibur-logkit

excalibur-logkit (2.0-11ubuntu1) vivid; urgency=medium * Update for continued main inclusion in Ubuntu: - d/control: Switch libmail-java -> libgnumail-java. - d/control,rules: Switch Servlet API 3.1 -> 3.0; this should be revisited when work begins on Tomcat 7->8 transition in Ubuntu main. -- James Page <james.page@ubuntu.com> Tue, 25 Nov 2014 16:39:11 +0000

Modifications :
  1. Download patch debian/rules

    --- 2.0-11/debian/rules 2014-10-22 08:57:39.000000000 +0000 +++ 2.0-11ubuntu1/debian/rules 2014-11-25 16:36:47.000000000 +0000 @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelpe include /usr/share/cdbs/1/class/ant.mk JAVA_HOME_DIRS := /usr/lib/jvm/default-java -DEB_JARS := ant-junit geronimo-jms-1.1-spec javax.mail junit log4j-1.2 servlet-api-3.1 +DEB_JARS := ant-junit geronimo-jms-1.1-spec javax.mail junit log4j-1.2 servlet-api-3.0. DEB_ANT_BUILD_TARGET := dist DEB_ANT_ARGS := -Dnoget=true -Dfinal.name=excalibur-logkit -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -Dlibdir=/usr/share/java
  2. Download patch debian/control

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

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

Source: fop

fop (1:1.1.dfsg2-1ubuntu1) vivid; urgency=low * Merge from Debian unstable. Remaining changes: - Transition libservlet2.5-java -> libservlet3.0-java. -- James Page <james.page@ubuntu.com> Mon, 08 Dec 2014 14:54:56 +0000

Modifications :
  1. Download patch debian/rules

    --- 1:1.1.dfsg2-1/debian/rules 2012-01-10 17:38:17.000000000 +0000 +++ 1:1.1.dfsg2-1ubuntu1/debian/rules 2014-11-02 22:10:51.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.dfsg2-1/debian/control 2014-11-02 15:29:09.000000000 +0000 +++ 1:1.1.dfsg2-1ubuntu1/debian/control 2014-11-02 22:10:51.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: 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: jakarta-taglibs-standard

jakarta-taglibs-standard (1.1.2-3ubuntu1) vivid; urgency=low * Merge from Debian unstable. (LP: #1433365) Remaining changes: - debian/ant.properties, debian/control, debian/rules: + Transition from servlet 2.5 -> 3.0. (Closes: #780701) -- Artur Rona <ari-tczew@ubuntu.com> Wed, 18 Mar 2015 01:11:43 +0100

Modifications :
  1. Download patch debian/rules

    --- 1.1.2-3/debian/rules 2015-03-14 22:20:00.000000000 +0000 +++ 1.1.2-3ubuntu1/debian/rules 2015-03-20 15:37:58.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-3/debian/control 2015-03-14 22:20:00.000000000 +0000 +++ 1.1.2-3ubuntu1/debian/control 2015-03-20 15:37:58.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-3/debian/ant.properties 2015-03-15 01:48:03.000000000 +0000 +++ 1.1.2-3ubuntu1/debian/ant.properties 2015-03-20 15:37:58.000000000 +0000 @@ -2,6 +2,6 @@ build.dir=build dist.dir=dist ant.build.javac.source=1.5 ant.build.javac.target=1.5 -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-11ubuntu1) vivid; urgency=medium * Resynchronise with Debian. Remaining changes: - 02_fix_generic_ftbfs.patch: Link with gcc -shared, not ld; don't explicitly link with libc. -- Colin Watson <cjwatson@ubuntu.com> Mon, 24 Nov 2014 13:02:59 +0000

Modifications :
  1. Download patch debian/control

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

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

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

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

Source: javatools

javatools (0.54ubuntu1) xenial; urgency=medium * Merge with Debian; remaining changes: - Pre-generate tutorial.html; remove the build dependency on markdown. -- Matthias Klose <doko@ubuntu.com> Thu, 07 Jan 2016 14:52:09 +0100

Modifications :
  1. Download patch debian/rules

    --- 0.54/debian/rules 2015-10-17 22:53:11.000000000 +0000 +++ 0.54ubuntu1/debian/rules 2015-08-30 18:30:44.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.54/debian/control 2015-10-17 22:53:11.000000000 +0000 +++ 0.54ubuntu1/debian/control 2015-08-30 18:30:27.000000000 +0000 @@ -1,10 +1,11 @@ Source: javatools Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Emmanuel Bourg <ebourg@apache.org> Build-Depends: debhelper (>= 9) -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

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

Source: jmagick

jmagick (6.6.9~20130201-svn99-2ubuntu2) vivid; urgency=medium * Rebuild against libmagickcore-6.q16-2. -- Colin Watson <cjwatson@ubuntu.com> Thu, 30 Oct 2014 11:24:17 +0000 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-2ubuntu2/src/magick/jmagick.h 2014-11-12 09:46:14.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-2ubuntu2/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-11-12 09:46:14.288246309 +0000 +++ 6.6.9~20130201-svn99-2ubuntu2/.pc/applied-patches 2014-11-12 09:46:14.512252342 +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-2ubuntu2/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-2ubuntu2/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-2ubuntu1) xenial; urgency=medium * Merge with Debian; remaining changes: -- Matthias Klose <doko@ubuntu.com> Sat, 09 Jan 2016 14:15:25 +0100

Modifications :
  1. Download patch debian/rules

    --- 10-2/debian/rules 2015-04-12 10:28:49.000000000 +0000 +++ 10-2ubuntu1/debian/rules 2016-01-09 13:16:37.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-2/debian/control 2015-04-12 10:28:49.000000000 +0000 +++ 10-2ubuntu1/debian/control 2016-01-09 13:16:37.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: jruby

jruby (1.7.22-1ubuntu1) wily; urgency=medium * Merge with Debian; remaining changes: - Add libjzlib-java dependency. - Build-depend on locales-all | language-pack-en. -- Matthias Klose <doko@ubuntu.com> Mon, 12 Oct 2015 18:50:41 +0200

Modifications :
  1. Download patch debian/control

    --- 1.7.22-1/debian/control 2015-09-17 00:17:15.000000000 +0000 +++ 1.7.22-1ubuntu1/debian/control 2015-10-12 17:00:42.000000000 +0000 @@ -1,7 +1,8 @@ Source: jruby Section: ruby 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 <nomadium@debian.org>, Tim Potter <tpot@hp.com> Build-Depends: ant-optional, @@ -44,7 +45,8 @@ Build-Depends: ant-optional, libunsafe-mock-java, libyaml-snake-java, libyecht-java (>= 1.0~), - locales-all, + libjzlib-java, + locales-all | language-pack-en, maven (>= 3.3~), maven-debian-helper, maven-repo-helper,

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

Source: jsch

jsch (0.1.53-1ubuntu1) wily; urgency=low * Merge from Debian unstable. Remaining changes: - Drop dependency on libjzlib-java for continued main inclusion. -- James Page <james.page@ubuntu.com> Wed, 08 Jul 2015 15:43:26 +0100

Modifications :
  1. Download patch debian/control

    --- 0.1.53-1/debian/control 2015-06-15 09:41:53.000000000 +0000 +++ 0.1.53-1ubuntu1/debian/control 2015-07-08 14:43:43.000000000 +0000 @@ -1,10 +1,11 @@ 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>, 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.6 Vcs-Git: git://anonscm.debian.org/pkg-java/jsch.git Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/jsch.git @@ -12,7 +13,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: junit4

junit4 (4.12-2ubuntu1) wily; urgency=medium * Update for Ubuntu to avoid Maven in main: - d/*: Re-use 4.11-3 packaging to avoid the switch. - d/build.xml,d/junit-pom-template.xml: Pick ant build components from 4.11 and adapt for new location and version. - d/tweak-resulttest.patch: Strip out failing part of ResultTest test case due to differences in the way classes are loaded using ant for the package build. -- James Page <james.page@ubuntu.com> Mon, 22 Jun 2015 08:52:01 +0100

Modifications :
  1. Download patch debian/rules

    --- 4.12-2/debian/rules 2015-04-28 14:36:19.000000000 +0000 +++ 4.12-2ubuntu1/debian/rules 2015-06-19 15:10:02.000000000 +0000 @@ -1,20 +1,33 @@ #!/usr/bin/make -f +include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) JAVA_HOME := /usr/lib/jvm/default-java +DEB_ANT_BUILD_TARGET := dist +DEB_ANT_BUILDFILE := debian/build.xml +DEB_JARS := ant-nodeps hamcrest-core binary-post-install/junit4:: - jh_manifest -pjunit4 + sed "s/@artifactId@/junit/;s/@version@/$(VERSION)/" debian/junit-pom-template.xml > debian/pom.xml + mh_installpoms -pjunit4 + mh_installjar -pjunit4 -njunit4 -l debian/pom.xml junit$(VERSION)/junit-dep-$(VERSION).jar binary-post-install/junit4-doc:: - dh_install -pjunit4-doc javadoc/latest/* /usr/share/doc/junit4/api/ + dh_install -pjunit4-doc junit$(VERSION)/javadoc/* /usr/share/doc/junit4/api/ clean:: - -rm -Rf javadoc + -rm debian/pom.xml -rm src/main/java/junit/runner/Version.java mh_clean +upstream-from-git: + git-archive --format=tar --prefix=junit4-$(DEB_UPSTREAM_VERSION)/ \ + v$(DEB_UPSTREAM_VERSION) | gzip -9 \ + > ../junit4_$(DEB_UPSTREAM_VERSION).orig.tar.gz + get-orig-source: -uscan --upstream-version 0 --rename +
  2. Download patch debian/control

    --- 4.12-2/debian/control 2015-04-28 15:57:58.000000000 +0000 +++ 4.12-2ubuntu1/debian/control 2015-06-19 14:36:25.000000000 +0000 @@ -1,6 +1,7 @@ Source: junit4 Section: java -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Florian Weimer <fw@deneb.enyo.de>, Varun Hiremath <varun@debian.org>, Damien Raude-Morvan <drazzib@debian.org>, @@ -8,17 +9,14 @@ Uploaders: Florian Weimer <fw@deneb.enyo Jakub Adam <jakub.adam@ktknet.cz>, Emmanuel Bourg <ebourg@apache.org> Priority: optional -Build-Depends: cdbs, debhelper (>= 9), default-jdk, javahelper +Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk Build-Depends-Indep: default-jdk-doc, libhamcrest-java (>= 1.3), libhamcrest-java-doc, - libmaven-enforcer-plugin-java, - libmaven-javadoc-plugin-java, - libreplacer-java, - maven-debian-helper -Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/pkg-java/junit4.git -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/junit4.git + maven-repo-helper +Standards-Version: 3.9.5 +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/junit4/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/junit4/ Homepage: http://www.junit.org Package: junit4
  3. Download patch .pc/exclude-dependency-sources.patch/pom.xml
  4. Download patch debian/patches/exclude-dependency-sources.patch

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

    --- 4.12-2/debian/junit4.poms 2015-04-28 14:31:53.000000000 +0000 +++ 4.12-2ubuntu1/debian/junit4.poms 2015-06-19 14:36:25.000000000 +0000 @@ -1 +1 @@ -pom.xml --no-parent --java-lib --has-package-version --usj-name=junit4 +debian/pom.xml --no-parent
  6. Download patch .pc/applied-patches

    --- 4.12-2/.pc/applied-patches 2015-06-23 20:06:07.796490031 +0000 +++ 4.12-2ubuntu1/.pc/applied-patches 2015-06-23 20:06:08.024496265 +0000 @@ -1,2 +1 @@ -maven2-compatibility.patch -exclude-dependency-sources.patch +tweak-resulttest.patch
  7. Download patch debian/orig-tar.sh

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

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

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

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

    --- 4.12-2/debian/patches/series 2015-04-28 14:31:53.000000000 +0000 +++ 4.12-2ubuntu1/debian/patches/series 2015-06-19 15:15:23.000000000 +0000 @@ -1,2 +1 @@ -maven2-compatibility.patch -exclude-dependency-sources.patch +tweak-resulttest.patch
  12. Download patch pom.xml

    --- 4.12-2/pom.xml 2015-06-23 20:06:07.000000000 +0000 +++ 4.12-2ubuntu1/pom.xml 2014-12-04 16:13:56.000000000 +0000 @@ -65,7 +65,7 @@ </mailingLists> <prerequisites> - <maven>2.2.1</maven> + <maven>3.0.4</maven> </prerequisites> <scm> @@ -303,7 +303,7 @@ <minmemory>32m</minmemory> <maxmemory>128m</maxmemory> <failOnError>true</failOnError> - <includeDependencySources>false</includeDependencySources> + <includeDependencySources>true</includeDependencySources> <dependencySourceIncludes> <dependencySourceInclude>org.hamcrest:hamcrest-core:*</dependencySourceInclude> </dependencySourceIncludes> @@ -407,7 +407,7 @@ <minmemory>32m</minmemory> <maxmemory>128m</maxmemory> <failOnError>true</failOnError> - <includeDependencySources>false</includeDependencySources> + <includeDependencySources>true</includeDependencySources> <dependencySourceIncludes> <dependencySourceInclude>org.hamcrest:hamcrest-core:*</dependencySourceInclude> </dependencySourceIncludes>
  13. Download patch debian/MANIFEST.MF

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

    --- 4.12-2/src/test/java/junit/tests/runner/ResultTest.java 2014-12-04 16:13:56.000000000 +0000 +++ 4.12-2ubuntu1/src/test/java/junit/tests/runner/ResultTest.java 2015-06-23 20:06:08.000000000 +0000 @@ -36,13 +36,6 @@ public class ResultTest extends TestCase ObjectInputStream objectInputStream = new ObjectInputStream(new ByteArrayInputStream(bytes)); Result fromStream = (Result) objectInputStream.readObject(); assertSerializedCorrectly(result, fromStream); - - InputStream resource = getClass().getResourceAsStream(getName()); - assertNotNull("Could not read resource " + getName(), resource); - objectInputStream = new ObjectInputStream(resource); - fromStream = (Result) objectInputStream.readObject(); - - assertSerializedCorrectly(new ResultWithFixedRunTime(result), fromStream); } /**
  15. Download patch debian/maven.ignoreRules

    --- 4.12-2/debian/maven.ignoreRules 2015-04-28 14:31:53.000000000 +0000 +++ 4.12-2ubuntu1/debian/maven.ignoreRules 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -org.apache.maven.plugins maven-release-plugin * * * * -org.apache.maven.plugins maven-source-plugin * * * * -org.codehaus.mojo animal-sniffer-maven-plugin * * * *
  16. Download patch .pc/maven2-compatibility.patch/pom.xml
  17. Download patch debian/patches/tweak-resulttest.patch

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

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

    --- 4.12-2/debian/orig-tar.exclude 2015-04-28 14:31:53.000000000 +0000 +++ 4.12-2ubuntu1/debian/orig-tar.exclude 2015-06-19 14:36:25.000000000 +0000 @@ -1,8 +1,5 @@ *.jar *.zip apache-maven -hopscotch-*.min.js -.classpath -.project -.settings -.travis.yml + +
  21. Download patch debian/junit-pom-template.xml

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

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

Source: junitperf

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

Modifications :
  1. Download patch debian/rules

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

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

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

Source: libcommons-cli-java

libcommons-cli-java (1.3.1-2ubuntu1) wily; urgency=low * Merge from Debian unstable. Remaining changes: - d/p/*: Dropped, no longer required. - d/*: Switch to using maven-ant-helper for package build. -- James Page <james.page@ubuntu.com> Fri, 04 Sep 2015 12:57:15 +0100

Modifications :
  1. Download patch debian/build.properties

    --- 1.3.1-2/debian/build.properties 2015-07-10 04:27:45.000000000 +0000 +++ 1.3.1-2ubuntu1/debian/build.properties 2015-09-04 11:54:22.000000000 +0000 @@ -1,7 +1,5 @@ javadoc.dir=target/api -build.sourceDirectory=src/java -build.testDirectory=src/test build.directory=target -maven.test.skip=true +#maven.test.skip=true ant.build.javac.target=1.4 ant.build.javac.source=1.4
  2. Download patch debian/rules

    --- 1.3.1-2/debian/rules 2015-07-10 04:27:45.000000000 +0000 +++ 1.3.1-2ubuntu1/debian/rules 2015-09-04 11:46:07.000000000 +0000 @@ -3,11 +3,15 @@ export DH_VERBOSE=1 include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk +include /usr/share/cdbs/1/class/ant.mk PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := ant-nodeps junit4 commons-lang ant-junit +DEB_ANT_BUILD_TARGET := package #javadoc +DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml +DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE) -Dversion=$(VERSION) binary-post-install/$(PACKAGE):: mh_installpoms -p$(PACKAGE)
  3. Download patch debian/control

    --- 1.3.1-2/debian/control 2015-07-10 04:27:45.000000000 +0000 +++ 1.3.1-2ubuntu1/debian/control 2015-09-04 11:39:52.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: Ludovic Claude <ludovic.claude@laposte.net>, tony mancill <tmancill@debian.org> Build-Depends: debhelper (>= 9), @@ -9,10 +10,7 @@ Build-Depends: debhelper (>= 9), default-jdk, ant, ant-optional, - libmaven-antrun-plugin-java, - maven-debian-helper, - maven-repo-helper, - libmaven-assembly-plugin-java, + maven-ant-helper, maven-repo-helper, libcommons-lang-java (>= 2.0), junit4 Standards-Version: 3.9.6

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

Source: libcommons-dbcp-java

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

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

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

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

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

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

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

    --- 1.4-5/.pc/applied-patches 2014-12-09 10:32:31.590795374 +0000 +++ 1.4-5ubuntu1/.pc/applied-patches 2014-12-09 10:32:31.846802202 +0000 @@ -1,3 +1,3 @@ -0001-configure-source-and-target-version-1.5.patch +01_build.patch 02_java7_compat.patch 03_exclude-transactions-tests.patch
  9. Download patch debian/maven.rules

    --- 1.4-5/debian/maven.rules 2014-10-25 20:52:44.000000000 +0000 +++ 1.4-5ubuntu1/debian/maven.rules 2014-12-08 15:10:17.000000000 +0000 @@ -18,4 +18,6 @@ commons-dbcp commons-dbcp jar s/.*/debian/ * * junit junit jar s/.*/3.x/ * * -s/tomcat/org.apache.tomcat/ s/naming-common/tomcat-catalina/ * s/.*/8.x/ * * +s/tomcat/org.apache.tomcat/ s/naming-common/tomcat-catalina/ * s/.*/7.x/ * * +commons-collections commons-collections jar s/3\..*/3.x/ +s/org.apache.geronimo.specs/glassfish/ s/geronimo-jta_1.1_spec/javaee/ jar s/.*/debian/
  10. Download patch build.properties

    --- 1.4-5/build.properties 1970-01-01 00:00:00.000000000 +0000 +++ 1.4-5ubuntu1/build.properties 2014-12-09 10:32:31.000000000 +0000 @@ -0,0 +1 @@ +test.failonerror=false
  11. Download patch debian/patches/0001-configure-source-and-target-version-1.5.patch

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

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

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

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

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

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

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

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

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

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

    --- 1.4-5/debian/ant.properties 1970-01-01 00:00:00.000000000 +0000 +++ 1.4-5ubuntu1/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-5ubuntu1) wily; urgency=low * Merge from Debian unstable. Remaining changes: - Revert to using Ant instead of Maven for package build for continued inclusion in Ubuntu main. -- James Page <james.page@ubuntu.com> Wed, 08 Jul 2015 16:00:47 +0100

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

    --- 2.6-5/debian/libcommons-lang-java-doc.doc-base 1970-01-01 00:00:00.000000000 +0000 +++ 2.6-5ubuntu1/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-5/debian/commons-lang.bnd 2015-05-11 22:32:06.000000000 +0000 +++ 2.6-5ubuntu1/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-5/debian/rules 2015-05-11 22:32:06.000000000 +0000 +++ 2.6-5ubuntu1/debian/rules 2015-05-12 04:10: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/control

    --- 2.6-5/debian/control 2015-05-11 22:58:30.000000000 +0000 +++ 2.6-5ubuntu1/debian/control 2015-07-08 15:01:39.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> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Emmanuel Bourg <ebourg@apache.org> -Build-Depends: debhelper (>= 9), default-jdk, maven-repo-helper (>= 1.7), ant -Build-Depends-Indep: libcommons-parent-java (>= 12), junit (>= 3.8.1), bnd, default-jdk-doc +Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-repo-helper (>= 1.7), ant +Build-Depends-Indep: junit (>= 3.8.1), default-jdk-doc Standards-Version: 3.9.6 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libcommons-lang-java Vcs-Browser: http://anonscm.debian.org/viewvc/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:
  5. Download patch debian/libcommons-lang-java-doc.install

    --- 2.6-5/debian/libcommons-lang-java-doc.install 2015-05-11 22:32:06.000000000 +0000 +++ 2.6-5ubuntu1/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
  6. Download patch .pc/applied-patches

    --- 2.6-5/.pc/applied-patches 1970-01-01 00:00:00.000000000 +0000 +++ 2.6-5ubuntu1/.pc/applied-patches 2015-07-08 17:06:07.291692535 +0000 @@ -0,0 +1 @@ +OSGi_Manifest.patch
  7. Download patch debian/libcommons-lang-java-doc.doc-base.api

    --- 2.6-5/debian/libcommons-lang-java-doc.doc-base.api 2015-05-11 22:32:06.000000000 +0000 +++ 2.6-5ubuntu1/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/*
  8. Download patch debian/maven.rules

    --- 2.6-5/debian/maven.rules 2015-05-11 22:32:06.000000000 +0000 +++ 2.6-5ubuntu1/debian/maven.rules 2015-05-12 04:10:38.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/ * *
  9. Download patch debian/patches/OSGi_Manifest.patch

    --- 2.6-5/debian/patches/OSGi_Manifest.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.6-5ubuntu1/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
  10. Download patch src/conf/MANIFEST.MF

    --- 2.6-5/src/conf/MANIFEST.MF 1970-01-01 00:00:00.000000000 +0000 +++ 2.6-5ubuntu1/src/conf/MANIFEST.MF 2015-07-08 17:06:07.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
  11. Download patch debian/libcommons-lang-java-doc.poms

    --- 2.6-5/debian/libcommons-lang-java-doc.poms 2015-05-11 22:32:06.000000000 +0000 +++ 2.6-5ubuntu1/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
  12. Download patch debian/libcommons-lang-java-doc.docs

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

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

    --- 2.6-5/build.xml 2011-01-13 23:05:11.000000000 +0000 +++ 2.6-5ubuntu1/build.xml 2015-07-08 17:06:07.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"/>
  16. Download patch debian/maven.ignoreRules

    --- 2.6-5/debian/maven.ignoreRules 2015-05-11 22:32:06.000000000 +0000 +++ 2.6-5ubuntu1/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 * * * *
  17. Download patch debian/ant.properties

    --- 2.6-5/debian/ant.properties 1970-01-01 00:00:00.000000000 +0000 +++ 2.6-5ubuntu1/debian/ant.properties 2015-07-08 15:02:22.000000000 +0000 @@ -0,0 +1,2 @@ +build.home=build +dist.home=dist
  18. Download patch debian/libcommons-lang-java.poms

    --- 2.6-5/debian/libcommons-lang-java.poms 2015-05-11 22:32:06.000000000 +0000 +++ 2.6-5ubuntu1/debian/libcommons-lang-java.poms 2015-05-12 04:10:38.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-5/debian/build-classpath 2015-05-11 22:32:06.000000000 +0000 +++ 2.6-5ubuntu1/debian/build-classpath 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/usr/share/java/junit.jar

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

libphonenumber (7.0.8-0ubuntu3) xenial; urgency=medium * debian/patches/hash_as_diallable_char.patch -Add hash as diallable number -- Tiago Salem Herrmann <tiago.herrmann@canonical.com> Thu, 05 Nov 2015 18:48:12 -0200 libphonenumber (7.0.8-0ubuntu2) wily; urgency=medium * No-change rebuild against new libicu -- Iain Lane <iain@orangesquash.org.uk> Wed, 05 Aug 2015 17:40:24 +0100 libphonenumber (7.0.8-0ubuntu1) wily; urgency=medium * New upstream version. * Rename library packages (soname bump). * Build with optimization again. * Build Multi-Arch: same packages. -- Matthias Klose <doko@ubuntu.com> Tue, 21 Jul 2015 13:56:09 +0200 libphonenumber (6.0+r655-0ubuntu7) wily; urgency=medium * Make the dev package depend on libprotobuf-dev. -- Gustavo Pichorim Boiko <gustavo.boiko@canonical.com> Fri, 17 Jul 2015 20:11:54 -0300 libphonenumber (6.0+r655-0ubuntu6) vivid; urgency=medium * Rebuild against libprotobuf9. -- Colin Watson <cjwatson@ubuntu.com> Thu, 04 Dec 2014 10:41:21 +0000 libphonenumber (6.0+r655-0ubuntu5) utopic; urgency=medium * Build without -O3 on ppc64el. -- Matthias Klose <doko@ubuntu.com> Thu, 04 Sep 2014 19:30:17 +0200 libphonenumber (6.0+r655-0ubuntu4) utopic; urgency=medium * debian/rules: - never set INSTALL_PROGRAM+=-s; rely on dh_strip to strip the files only after install. - build with VERBOSE=1. - use dh build system args instead of overriding all of dh_auto_*. * Bump to compat level 9, which enables dpkg-buildflags usage. * Build without -O2 (which is consistent with previous builds), since enabling it causes ABI changes in the library. -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 27 Jul 2014 08:22:16 +0000 libphonenumber (6.0+r655-0ubuntu3) utopic; urgency=medium * debian/*.symbols*: - Provide arch-specific symbol files for both architectures, enabling proper builds for both 64 and 32 bit systems -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com> Fri, 09 May 2014 14:22:53 +0200 libphonenumber (6.0+r655-0ubuntu2) utopic; urgency=medium * debian/patches/fix_ftbfs.patch - Fix for FTBFS on i386 and armhf, patch from Renato Araujo Oliveira Filho -- Ken VanDine <ken.vandine@canonical.com> Thu, 08 May 2014 15:10:36 -0400 libphonenumber (6.0+r655-0ubuntu1) utopic; urgency=medium [ Ken VanDine ] * debian/control - build depend on ant-optional - Bump soname - split libgeocoding6 out into a separate package - bump standards version to 3.9.5 * debian/patches/boost_build_fix.patch - Fixed cpp library installation, patch from Renato Araujo Oliveira Filho * debian/source/format - Specify quilt * debian/copyright - Updated all copyrights and licenses [ Łukasz 'sil2100' Zemczak ] * debian/patches/cpp_symbols_map.patch: - Add a symbols map file not to leak unnecessary C++ symbols * debian/libphonenumber6.symbols, debian/libgeocoding6.symbols: - Add C++ symbols for libphonenumber.so.6 and libgeocoding.so.6 -- Ken VanDine <ken.vandine@canonical.com> Wed, 30 Apr 2014 14:51:09 -0400 libphonenumber (6.0) precise; urgency=low * Code changes: - Better support for detecting phone numbers in text that are beside each other - Change to how Japanese numbers beginning with "00" are modelled, with the side-effect that the maximum possible number length has been extended by 1. - Handle StringIndexOutOfBoundsException in the AsYouTypeFormatter when the national prefix that was extracted was not found in the prefix. This affected countries with very long carrier codes, such as Korea. - Removal of some of the author attributions - contributions to be tracked in CONTRIBUTORS file. * Metadata changes: - Updated phone metadata for region code(s): AS, BR, KW, LU - New carrier data for country calling code(s): 1684 (en) - Updated carrier data for country calling code(s): 352 (en) -- Lara Scheidegger <lararennie@google.com> Tue, 25 Feb 2014 13:57:19 +0100 libphonenumber (5.9.4) precise; urgency=low * Metadata changes: - Updated phone metadata for region code(s): 883, BF, BJ, BW, CL, CR, DZ, FR, GD, IN, JP, MD, NG, NZ, PK, PL, SY, UY, VU - Updated short number metadata for region code(s): LV, MD - New carrier data for country calling code(s): 373 (en), 1473 (en) - Updated carrier data for country calling code(s): 48 (en), 49 (en), 91 (en), 92 (en), 213 (en), 226 (en), 229 (en), 234 (en), 267 (en), 389 (en), 506 (en), 598 (en) -- Shaopeng Jia <shaopengjia@google.com> Fri, 07 Feb 2014 11:46:35 +0100 libphonenumber (5.9.3) precise; urgency=low * Metadata changes: - Updated phone metadata for region code(s): BF, BH, BR, CN, GR, IN, MY, PA, TN, US - Updated short number metadata for region code(s): CN - New geocoding data for country calling code(s): 1364 (en), 1725 (en) - Updated geocoding data for country calling code(s): 86 (en) - Updated carrier data for country calling code(s): 55 (en), 226 (en), 973 (en) -- Lara Scheidegger <lararennie@google.com> Tue, 21 Jan 2014 11:10:21 +0100 libphonenumber (5.9.2) precise; urgency=low * Metadata changes: - New alternate formatting data for country calling code(s): 255, 27, 381, 506 - Updated alternate formatting data for country calling code(s): 43 - Updated phone metadata for region code(s): AG, AI, AS, BB, BF, BM, BS, CA, CR, DM, DO, EC, GD, GU, JM, KN, KY, LC, MP, MS, PR, SO, SX, TC, TT, US, VC, VG, VI - Updated carrier data for country calling code(s): 226 (en) -- Lara Scheidegger <lararennie@google.com> Fri, 20 Dec 2013 10:47:07 +0100 libphonenumber (5.9.1) precise; urgency=low * Metadata changes: - New alternate formatting data for country calling code(s): 505, 679 - Updated phone metadata for region code(s): BF, CI, EG, EH, FJ, IN, KI, MA, MT, NG, NI, SI, SN, SR, TT - Updated short number metadata for region code(s): KI - Updated geocoding data for country calling code(s): 27 (en), 226 (en), 1 (en) - New carrier data for country calling code(s): 356 (en), 677 (en) - Updated carrier data for country calling code(s): 212 (en), 221 (en), 225 (en), 226 (en), 234 (en), 597 (en), 1 (en) -- Lara Scheidegger <lararennie@google.com> Fri, 13 Dec 2013 10:53:59 +0100 libphonenumber (5.9) precise; urgency=low * Code changes: - Adding support for numbers with multiple Italian leading zeros, by adding a field to the phone number proto to allow an arbitrary number of leading zeros, and supporting this when parsing, validating and formatting. - Adding more functionality to ShortNumberInfo -> such as GetExpectedCostForRegion. - Fix for parsing short numbers that start with the national prefix. - Updating FormatNumberForMobileDialing to work with short numbers. - Stop finding Israeli 4-digit "star" numbers in text when no star is in fact present. - Bug fix for finding phone numbers where the area code was also part of the country calling code. * Metadata changes: - Updated phone metadata for region code(s): AU, BQ, BY, CI, CO, CW, GN, HN, IN, JO, KI, KW, MG, MK, MM, NA, PK, TC, TM, UG - New short number metadata for region code(s): CD, GN - Updated short number metadata for region code(s): AF, AG, AI, AM, AR, AS, AW, AZ, BD, BH, BI, BM, BO, BQ, BT, BW, BY, CA, CH, CI, CM, CO, CW, DZ, FJ, GD, GE, GH, GT, GY, HN, HT, ID, IE, IM, IN, IQ, JM, JO, KE, KG, KH, KI, KW, KZ, LR, SV - New geocoding data for country calling code(s): 257 (en), 389 (en), 599 (en), 686 (en), 962 (en) - Updated geocoding data for country calling code(s): 264 (en), 375 (be, en, ru) - New carrier data for country calling code(s): 375 (be, ru), 389 (en), 599 (en), 965 (ar) - Updated carrier data for country calling code(s): 57 (en), 61 (en), 92 (en), 225 (en), 256 (en), 257 (en), 261 (en), 375 (en), 686 (en), 962 (en), 965 (en) -- Lara Scheidegger <lararennie@google.com> Tue, 12 Nov 2013 12:09:15 +0100 libphonenumber (5.8.8) precise; urgency=low * Metadata changes: - New alternate formatting data for country calling code(s): 350, 358, 36, 66, 84, 94, 995 - Updated alternate formatting data for country calling code(s): 31, 359, 372, 49, 62, 7 - Updated phone metadata for region code(s): AR, BD, BE, BF, BR, CO, CR, FI, GI, GM, IS, MU - Updated short number metadata for region code(s): AR, BE, ES, GI, PG, US - Updated geocoding data for country calling code(s): 220 (en) - Updated carrier data for country calling code(s): 20 (en), 220 (en), 224 (en), 230 (en), 852 (en) -- Lara Scheidegger <lararennie@google.com> Thu, 10 Oct 2013 14:27:03 +0200 libphonenumber (5.8.4) precise; urgency=low * Metadata changes: - Adding a token to indicate which countries have mobile portability. -- Lara Scheidegger <lararennie@google.com> Fri, 20 Sep 2013 17:22:29 +0200 libphonenumber (5.8.1) precise; urgency=low * Metadata changes: - New alternate formatting data for country calling code(s): 675 - Updated phone metadata for region code(s): AO, AU, BF, BW, CA, CH, CI, CN, DE, FR, MA, MR, MU, NI, PG, SA, SE, US, VI - New short number metadata for region code(s): IQ - Updated short number metadata for region code(s): AU, BR, DO, EG, FR, GH, ID, IL, JM, KE, KZ, LR, MW, NG, NI, SA, SE, SL, TZ, US, UZ - New geocoding data for country calling code(s): 966 (ar, en), 1 (en) -- Lara Scheidegger <lararennie@google.com> Thurs, 19 Sep 2013 13:55:28 +0200 libphonenumber (5.8) precise; urgency=low * Code changes: - Renamed ShortNumberUtil to ShortNumberInfo -> the former class is now deprecated and will be deleted in a later release. At the moment it just delegates to ShortNumberInfo. - New methods in the ShortNumberInfo API - isCarrierSpecific, singleton interface, isPossibleShortNumber, isValidShortNumber, getShortNumberCost. Note this is an experimental API at the moment and subject to change. - Bug fixes: -- AsYouTypeFormatting: 3-digit numbers can be formatted as a group where appropriate -- AsYouTypeFormatting: Countries with an optional national prefix were considered before to have always entered it, resulting in bugs where numbers without the national prefix were not properly formatted. -- Numbers in Chile that overlap with emergency numbers are no longer marked as connecting to them -- Not requiring the NDC to be alone for countries where there is no national prefix in strict grouping when extracting phone numbers * Metadata changes: - New alternate formatting data for country calling code(s): 30, 31, 385, 58, 62, 63, 971, 972 - Updated alternate formatting data for country calling code(s): 43, 44, 49 - Moved emergency phone number data to the ShortNumberMetadata.xml file - Updated phone metadata for region code(s): AT, EG, ML, NC, NL, SA - New short number metadata for region code(s): AR, CL, CO, ES, MX, NC - Emergency metadata fixes for region code(s): GA, JM, MH, VE -- Lara Scheidegger <lararennie@google.com> Mon, 2 Sep 2013 14:56:20 +0200 libphonenumber (5.7.2) precise; urgency=low * Metadata changes: - New alternate formatting data for country calling code(s): 352, 359, 372, 373, 375, 595, 7, 855 - Updated phone metadata for region code(s): AR, BF, BH, BR, BY, CH, CM, CN, GE, GW, HN, JM, KH, LT, LU, MU, NP, RO, SO - New short number metadata for region code(s): BR - Updated short number metadata for region code(s): CH, FJ, GB, GG, IM, IT, JE, SH -- Lara Scheidegger <lararennie@google.com> Fri, 09 Aug 2013 14:05:22 +0200 libphonenumber (5.7.1) precise; urgency=low * Metadata changes: - Change to the way the metadata is built; now only parts of the proto that are relevant will be generated. This means short-code data won't be generated for the normal protos, and fixed-line data won't be generated for short-number protos. This cuts the metadata binary size approximately in half. -- Lara Scheidegger <lararennie@google.com> Thu, 8 Aug 2013 13:12:00 +0200 libphonenumber (5.7) precise; urgency=low * Code changes: - Improve phone number extraction recall. - Add support for loading short number metadata. -- David Yonge-Mallo <davinci@google.com> Wed, 17 Jul 2013 11:25:45 +0200 libphonenumber (5.6.2) precise; urgency=low * Metadata changes: - Updated alternate formatting data for country calling code(s): 49, 61 - New metadata for region code(s): TA - Updated metadata for region code(s): BF, BH, BI, BJ, BR, CR, EH, GA, GE, GN, GU, IL, IN, IR, KH, KW, KZ, MA, MT, NA, NE, NL, PH, RO, SH, SO, TK - New geocoding data for country calling code(s): 47 (en), 82 (ar) - Updated geocoding data for country calling code(s): 49 (en), 98 (en, fa), 241 (en) -- Lara Scheidegger <lararennie@google.com> Tue, 16 Jul 2013 10:01:53 +0200 libphonenumber (5.6.1) precise; urgency=low * Code changes: - Rename all instances of PhoneNumberMetadata to PhoneNumberMetadata for consistency. -- David Yonge-Mallo <davinci@google.com> Fri, 12 Jul 2013 10:26:53 +0200 libphonenumber (5.6) precise; urgency=low * Code changes: - Fix for as-you-type-formatting bug affecting countries with no national prefix formatting rule, such as China. * Metadata changes: - New alternate formatting data for country calling code(s): 351 - Updated alternate formatting data for country calling code(s): 49 - Updated metadata for region code(s): AS, BG, BH, BJ, BL, CD, CI, DE, DZ, EH, FJ, GF, GP, IN, KH, KZ, MA, MD, MF, ML, MY, NG, PT, PY, TC, TJ, TT -- Lara Scheidegger <lararennie@google.com> Wed, 05 Jun 2013 14:39:28 +0200 libphonenumber (5.5) precise; urgency=low * Code changes: - Changed internal initialization code and made more fields final. Note that we now throw an exception if an attempt is made to set the metadata more than once (which should only happen during testing). - Fix problem with formatNumberForMobileDialing for HU and CL. * Metadata changes: - Updated alternate formatting data for country calling code(s): 49 - Updated metadata for region code(s): AM, BF, BR, CR, DE, MA, MG, MM, SA, TL, UA - Updated geocoding data for country calling code(s): 374 (am, en, ru) -- David Beaumont <dbeaumont@google.com> Wed, 08 May 2013 15:52:22 +0200 libphonenumber (5.4.2) precise; urgency=low * Metadata changes: - Updated metadata for region code(s): BF, GA, IN, KR, MV, PH, SO, UA, US -- Shaopeng Jia <shaopengjia@google.com> Fri, 19 Apr 2013 15:55:35 +0200 libphonenumber (5.4.1) precise; urgency=low * Metadata changes: - Updated metadata for region code(s): BF, BH, CR, EC, IR, MG, PF, TD, TN - New geocoding data for country calling code(s): 374 (am, ru) - Updated geocoding data for country calling code(s): 98 (en, fa), 358 (en, se), 374 (en) -- Shaopeng Jia <shaopengjia@google.com> Mon, 25 Mar 2013 13:42:45 +0100 libphonenumber (5.4) precise; urgency=low * Code changes: - Switch formatNumberForMobileDialing to prefer national format to international format when the number is dialed from the same region the phone number is from. * Metadata changes: - Updated metadata for region code(s): BF, CD, CN, CZ, GN, IR, JP, KR, KW, LR, NZ, TT, UG, ZW - New geocoding data for country calling code(s): 82 (cs) - Updated geocoding data for country calling code(s): 82 (en, fr, ko, zh, zh_Hant), 98 (en, fa), 263 (en) -- Shaopeng Jia <shaopengjia@google.com> Thu, 07 Mar 2013 14:54:10 +0100 libphonenumber (5.3.2) precise; urgency=low * Metadata changes: - Updated metadata for region code(s): BD, BE, BY, CA, EH, GR, IE, IN, IS, LI, MA, MU, PT, SE, SG, TL - New geocoding data for country calling code(s): 375 (be, en, ru), 1 (en) -- Lara Rennie <lararennie@google.com> Mon, 11 Feb 2013 15:21:35 +0100 libphonenumber (5.3.1) precise; urgency=low * Metadata changes: - Updated metadata for region code(s): CN, DK, EH, GN, KH, KW, MA, MY, PA -- David Yonge-Mallo <davinci@google.com> Fri, 25 Jan 2013 14:58:55 +0100 libphonenumber (5.3) lucid; urgency=low * Code changes: - Handling UAN numbers in Argentina better when dialling them locally from a mobile * Metadata changes: - Updated metadata for region code(s): BE, BW, CL, CN, CO, EH, KW, MA, ML, NG, PL, SY, ZA, ZM - New geocoding data for country calling code(s): 32 (en, fr, nl) - Updated geocoding data for country calling code(s): 27 (en), 86 (en, zh) -- Lara Rennie <lararennie@google.com> Tue, 08 Jan 2013 16:49:27 +0100 libphonenumber (5.2.2) lucid; urgency=low * Metadata changes: - New metadata for region code(s): EH - Updated metadata for region code(s): BR, CL, CR, IN, MA, PG, PK, RO - New geocoding data for country calling code(s): 241 (en) -- Lara Rennie <lararennie@google.com> Thu, 06 Dec 2012 13:27:48 +0100 libphonenumber (5.2.1) lucid; urgency=low * Metadata changes: - Updated metadata for region code(s): AE, AW, BF, CN, DE, JO, KE, KH, LT, MM, MU, NG, RW, SR, TR, VU - New geocoding data for country calling code(s): 359 (bg, en) -- Lara Rennie <lararennie@google.com> Mon, 26 Nov 2012 18:31:02 +0100 libphonenumber (5.2) lucid; urgency=low * Metadata changes: - Updated metadata for region code(s): DE, GR, HR, OM, SB, ZA - Updated geocoding data for country calling code(s): 30 (el, en) -- David Beaumont <dbeaumont@google.com> Wed, 10 Oct 2012 17:42:28 +0200

Modifications :
  1. Download patch java/geocoder/pom.xml

    --- 6.3~svn698-4/java/geocoder/pom.xml 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/geocoder/pom.xml 2015-07-14 15:21:09.000000000 +0000 @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>geocoder</artifactId> - <version>2.15-SNAPSHOT</version> + <version>2.24</version> <packaging>jar</packaging> - <url>http://code.google.com/p/libphonenumber/</url> + <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>6.2.3-SNAPSHOT</version> + <version>7.0.8</version> </parent> <build> @@ -42,12 +42,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>6.2.3-SNAPSHOT</version> + <version>7.0.8</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.15-SNAPSHOT</version> + <version>2.24</version> </dependency> </dependencies> Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1220_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1220_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1418_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1418_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1438_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1438_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1450_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1450_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1514_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1514_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1628_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1628_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1629_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1629_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1782_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1782_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1819_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1819_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1929_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1929_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1930_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1930_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1938_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1938_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/226_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/226_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/237_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/237_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_fr and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_fr differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_fr and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_fr differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_fi and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_fi differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_se and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_se differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/592_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/592_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/62_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/62_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/64_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/64_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_en and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_en differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_fa and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_fa differ Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config differ
  2. Download patch java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java

    --- 6.3~svn698-4/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java 2015-11-11 22:37:12.000000000 +0000 +++ 7.0.8-0ubuntu3/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java 2015-07-14 15:21:09.000000000 +0000 @@ -25,6 +25,7 @@ import com.google.i18n.phonenumbers.Phon import java.util.ArrayList; import java.util.List; +import java.util.Set; /** * Unit tests for PhoneNumberUtil.java @@ -116,6 +117,16 @@ public class PhoneNumberUtilTest extends assertTrue(phoneUtil.getSupportedRegions().size() > 0); } + public void testGetSupportedGlobalNetworkCallingCodes() { + Set<Integer> globalNetworkCallingCodes = + phoneUtil.getSupportedGlobalNetworkCallingCodes(); + assertTrue(globalNetworkCallingCodes.size() > 0); + for (int callingCode : globalNetworkCallingCodes) { + assertTrue(callingCode > 0); + assertEquals(RegionCode.UN001, phoneUtil.getRegionCodeForCountryCode(callingCode)); + } + } + public void testGetInstanceLoadBadMetadata() { assertNull(phoneUtil.getMetadataForRegion("No Such Region")); assertNull(phoneUtil.getMetadataForNonGeographicalRegion(-1)); @@ -1229,7 +1240,7 @@ public class PhoneNumberUtilTest extends assertTrue(phoneUtil.getRegionCodesForCountryCode(49).contains(RegionCode.DE)); assertTrue(phoneUtil.getRegionCodesForCountryCode(800).contains(RegionCode.UN001)); // Test with invalid country calling code. - assertTrue(phoneUtil.getRegionCodesForCountryCode(-1).size() == 0); + assertTrue(phoneUtil.getRegionCodesForCountryCode(-1).isEmpty()); } public void testGetCountryCodeForRegion() { @@ -1314,18 +1325,6 @@ public class PhoneNumberUtilTest extends assertEquals(PhoneNumberUtil.ValidationResult.TOO_LONG, phoneUtil.isPossibleNumberWithReason(INTERNATIONAL_TOLL_FREE_TOO_LONG)); - - // Try with number that we don't have metadata for. - PhoneNumber adNumber = new PhoneNumber(); - adNumber.setCountryCode(376).setNationalNumber(12345L); - assertEquals(PhoneNumberUtil.ValidationResult.IS_POSSIBLE, - phoneUtil.isPossibleNumberWithReason(adNumber)); - adNumber.setCountryCode(376).setNationalNumber(1L); - assertEquals(PhoneNumberUtil.ValidationResult.TOO_SHORT, - phoneUtil.isPossibleNumberWithReason(adNumber)); - adNumber.setCountryCode(376).setNationalNumber(123456789012345678L); - assertEquals(PhoneNumberUtil.ValidationResult.TOO_LONG, - phoneUtil.isPossibleNumberWithReason(adNumber)); } public void testIsNotPossibleNumber() { @@ -2350,7 +2349,7 @@ public class PhoneNumberUtilTest extends assertEquals("+37612345", phoneUtil.format(adNumber, PhoneNumberFormat.E164)); assertEquals("12345", phoneUtil.format(adNumber, PhoneNumberFormat.NATIONAL)); assertEquals(PhoneNumberUtil.PhoneNumberType.UNKNOWN, phoneUtil.getNumberType(adNumber)); - assertTrue(phoneUtil.isValidNumber(adNumber)); + assertFalse(phoneUtil.isValidNumber(adNumber)); // Test dialing a US number from within Andorra. assertEquals("00 1 650 253 0000",
  3. Download patch debian/patches/0006-main-lib-jdk5.patch

    --- 6.3~svn698-4/debian/patches/0006-main-lib-jdk5.patch 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/patches/0006-main-lib-jdk5.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java b/java/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java -index afbc0b2..1d01a4c 100644 ---- a/java/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java -+++ b/java/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java -@@ -173,7 +173,7 @@ public class PhoneNumberToTimeZonesMapper { - */ - private List<String> getTimeZonesForGeocodableNumber(PhoneNumber number) { - List<String> timezones = prefixTimeZonesMap.lookupTimeZonesForNumber(number); -- return Collections.unmodifiableList(timezones.isEmpty() ? UNKNOWN_TIME_ZONE_LIST -+ return Collections.unmodifiableList(timezones.size() == 0 ? UNKNOWN_TIME_ZONE_LIST - : timezones); - } - -@@ -186,7 +186,7 @@ public class PhoneNumberToTimeZonesMapper { - */ - private List<String> getCountryLevelTimeZonesforNumber(PhoneNumber number) { - List<String> timezones = prefixTimeZonesMap.lookupCountryLevelTimeZonesForNumber(number); -- return Collections.unmodifiableList(timezones.isEmpty() ? UNKNOWN_TIME_ZONE_LIST -+ return Collections.unmodifiableList(timezones.size() == 0 ? UNKNOWN_TIME_ZONE_LIST - : timezones); - } - } -diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java -index 30d26cd..1466440 100644 ---- a/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java -+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java -@@ -1229,7 +1229,7 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { - assertTrue(phoneUtil.getRegionCodesForCountryCode(49).contains(RegionCode.DE)); - assertTrue(phoneUtil.getRegionCodesForCountryCode(800).contains(RegionCode.UN001)); - // Test with invalid country calling code. -- assertTrue(phoneUtil.getRegionCodesForCountryCode(-1).isEmpty()); -+ assertTrue(phoneUtil.getRegionCodesForCountryCode(-1).size() == 0); - } - - public void testGetCountryCodeForRegion() {
  4. Download patch cpp/test/phonenumbers/geocoding/geocoding_test_program.cc

    --- 6.3~svn698-4/cpp/test/phonenumbers/geocoding/geocoding_test_program.cc 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/test/phonenumbers/geocoding/geocoding_test_program.cc 2015-07-14 15:21:09.000000000 +0000 @@ -15,10 +15,10 @@ // Sample program using the geocoding functionality. This is used to test that // the geocoding library is compiled correctly. -#include <cassert> #include <iostream> #include <string> +#include "phonenumbers/base/logging.h" #include "phonenumbers/geocoding/phonenumber_offline_geocoder.h" #include "phonenumbers/phonenumber.pb.h" #include "phonenumbers/phonenumberutil.h" @@ -32,12 +32,13 @@ int main() { const PhoneNumberUtil& phone_util = *PhoneNumberUtil::GetInstance(); const PhoneNumberUtil::ErrorType status = phone_util.Parse( "16502530000", "US", &number); - assert(status == PhoneNumberUtil::NO_PARSING_ERROR); + CHECK_EQ(status, PhoneNumberUtil::NO_PARSING_ERROR); + IGNORE_UNUSED(status); const std::string description = PhoneNumberOfflineGeocoder().GetDescriptionForNumber( number, icu::Locale("en", "GB")); std::cout << description << std::endl; - assert(description == "Mountain View, CA"); + CHECK_EQ(description, "Mountain View, CA"); return 0; }
  5. Download patch cpp/src/phonenumbers/asyoutypeformatter.cc

    --- 6.3~svn698-4/cpp/src/phonenumbers/asyoutypeformatter.cc 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/asyoutypeformatter.cc 2015-07-14 15:21:09.000000000 +0000 @@ -114,6 +114,7 @@ void MatchAllGroups(const string& patter bool status = cache->GetRegExp(new_pattern).Consume(consume_input.get(), group); DCHECK(status); + IGNORE_UNUSED(status); } PhoneMetadata CreateEmptyMetadata() { @@ -466,6 +467,9 @@ void AsYouTypeFormatter::AttemptToChoose able_to_format_ = true; is_expecting_country_code_ = false; possible_formats_.clear(); + last_match_position_ = 0; + formatting_template_.remove(); + current_formatting_pattern_.clear(); AttemptToChooseFormattingPattern(formatted_number); } @@ -507,6 +511,7 @@ void AsYouTypeFormatter::AttemptToFormat bool status = regexp_cache_.GetRegExp(pattern).GlobalReplace( &formatted_number, number_format.format()); DCHECK(status); + IGNORE_UNUSED(status); AppendNationalNumber(formatted_number, formatted_result); return; @@ -735,6 +740,8 @@ char AsYouTypeFormatter::NormalizeAndAcc void AsYouTypeFormatter::InputDigitHelper(char next_char, string* number) { DCHECK(number); number->clear(); + // Note that formattingTemplate is not guaranteed to have a value, it could be + // empty, e.g. when the next digit is entered after extracting an IDD or NDD. const char32 placeholder_codepoint = UnicodeString(kDigitPlaceholder)[0]; int placeholder_pos = formatting_template_ .tempSubString(last_match_position_).indexOf(placeholder_codepoint);
  6. Download patch cpp/src/phonenumbers/geocoding/phonenumber_offline_geocoder.h

    --- 6.3~svn698-4/cpp/src/phonenumbers/geocoding/phonenumber_offline_geocoder.h 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/geocoding/phonenumber_offline_geocoder.h 2015-07-14 15:21:09.000000000 +0000 @@ -99,6 +99,7 @@ class PhoneNumberOfflineGeocoder { const Locale& locale) const; // As per GetDescriptionForValidNumber(PhoneNumber, Locale, String) but + // explicitly checks the validity of the number passed in. string GetDescriptionForNumber(const PhoneNumber& number, const Locale& language, const string& user_region) const;
  7. Download patch cpp/README

    --- 6.3~svn698-4/cpp/README 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/README 2015-07-14 15:21:09.000000000 +0000 @@ -1,18 +1,50 @@ -C++ version of the libphonenumber project. + C++ version of the libphonenumber project + ========================================= -This is a port of the Java version. +This library is a port of the Java version. This project uses some third-party code: - src/phonenumbers/utf/ sources come from lib9 which is also used in Go. -Building the library on GNU/Linux ---------------------------------- +Installing the library on GNU/Linux +----------------------------------- +In recent Debian-based distributions you may be able to simply install the +libphonenumber library directly. + +Installing the binary packages: + - Use this if you just need to use or link against the library: + $ sudo apt-get install libphonenumber6 libphonenumber6-dev + +Installing the source package: + - Use this if you wish to develop or debug the library: + $ sudo apt-get source libphonenumber + +The latest packages can be found on the Debian packages site: + https://packages.debian.org/search?searchon=names&keywords=libphonenumber + + +Manually installing the library on GNU/Linux +-------------------------------------------- +You should only need these instructions if the above instructions do not work. + +The example command lines below assume that you have a Debian-based GNU/Linux +distribution. Other distributions and packaging systems will differ. + +Quickstart: + - In recent Debian-based distributions, it should be sufficent to run: + $ sudo apt-get install \ + cmake cmake-curses-gui libprotobuf-dev libgtest-dev libre2-dev \ + libicu-dev libboost-dev libboost-thread-dev libboost-system-dev + +If any of these packages fails to install correctly, follow the instructions +in the appropriate section below. + Requirements: - CMake build system http://www.cmake.org - You can install it very easily on a Debian-based GNU/Linux distribution: + Installation: $ sudo apt-get install cmake Additionally it is recommended you install the ccmake configuration tool: @@ -20,9 +52,17 @@ Requirements: - Protocol Buffers http://code.google.com/p/protobuf/ - Version 2.4 or more recent is required. + Version 2.4 or more recent is required (this is available by default for + recent Debian-based GNU/Linux distributions). - You can install it very easily on a Debian-based GNU/Linux distribution: + You can check which version is available: + $ apt-cache show libprotobuf-dev + Package: libprotobuf-dev + Source: protobuf + Version: 2.5.0-9ubuntu1 <-- This must be >= 2.4.0 + ... + + Installation: $ sudo apt-get install libprotobuf-dev Note: if your GNU/Linux distribution doesn't provide the needed package, @@ -34,51 +74,44 @@ Requirements: - Google Test http://code.google.com/p/googletest/ - You can install it very easily on a Debian-based GNU/Linux distribution: + Installation: $ sudo apt-get install libgtest-dev - RE2 http://code.google.com/p/re2/ - You can install it very easily on Ubuntu Natty: + Installation: $ sudo apt-get install libre2-dev - Otherwise if you use a Debian-based distribution you can fetch the Ubuntu - package which should work: - http://packages.ubuntu.com/natty/libre2-dev - - If you want to install it manually: - You need Mercurial to checkout its source code: - $ sudo apt-get install mercurial - - Then checkout, build and install it: - $ hg clone https://re2.googlecode.com/hg re2 - $ cd re2 - $ make test - $ make install - $ make testinstall - - - ICU - Version 4.4 or more recent is required. It can be installed easily on Debian - systems or be built from the most recent sources (currently 49.1.2). + Note that some distributions (notably Ubuntu 10.4) may not include this, + so you might need to download and install it manually. - If you have a Debian-based distribution you can check which version of the - ICU libraries is available by doing: - $ apt-cache show libicu-dev - And looking for the "Version:" string. + Find and download the Debian packages for your system. For example: + http://packages.ubuntu.com/utopic/libre2-1 + http://packages.ubuntu.com/utopic/libre2-dev + + You need to download both the libre2-dev and libre2-1 packages. + Once downloaded, install them with: + $ sudo dpkg -i libre2*.deb + + If you want to install it from source, it's available via Mercurial at: + https://re2.googlecode.com/hg + however precise instructions on building and installing are outside the + scope of this document. - If this is above 4.4 then you can just do: + - ICU + Installation: $ sudo apt-get install libicu-dev Otherwise you need to download the source tarball for the latest version from: http://site.icu-project.org/download And then extract it via: - $ tar xzf icu4c-49_1_2-src.tgz + $ tar xzf icu4c-*-src.tgz Alternatively you can export the SVN repository to the current directory via: - $ svn export http://source.icu-project.org/repos/icu/icu/tags/release-49-1-2/ + $ svn export http://source.icu-project.org/repos/icu/icu/tags/release-XX-y-z/ Having acquired the latest sources, make and install it via: $ cd icu/source @@ -91,19 +124,22 @@ Requirements: Troubleshooting section below for information about ccmake). You can install it very easily on a Debian-based GNU/Linux distribution: - $ sudo apt-get install libboost1.40-dev libboost-thread1.40-dev \ - libboost-system1.40-dev + $ sudo apt-get install libboost-dev libboost-thread-dev libboost-system-dev Note: Boost Thread is the only library needed at link time. -How to build libphonenumber C++: + +Building and testing the library +-------------------------------- $ cd libphonenumber/cpp $ mkdir build $ cd build $ cmake .. $ make + $ ./libphonenumber_test -Troubleshooting CMake via ccmake: +Troubleshooting CMake via ccmake +-------------------------------- Follow these instructions if the build steps above don't work for you. - Incorrect protocol buffer library issues
  8. Download patch debian/libphonenumber6-java.poms

    --- 6.3~svn698-4/debian/libphonenumber6-java.poms 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/libphonenumber6-java.poms 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +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 and its artifact if any -# --ignore-pom: don't install the POM. To use on POM files that are created -# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] -# --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. [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. [mh_install] -# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. -# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. -# Empty by default. [mh_install] -# -pom.xml -tools/java/pom.xml -tools/java/common/pom.xml -tools/java/cpp-build/pom.xml -tools/java/data/pom.xml -tools/java/java-build/pom.xml -java/pom.xml --no-parent -java/libphonenumber/pom.xml --java-lib -java/internal/prefixmapper/pom.xml --java-lib -java/carrier/pom.xml --java-lib -java/geocoder/pom.xml --java-lib -java/demo/pom.xml --ignore
  9. Download patch cpp/test/phonenumbers/test_util.cc

    --- 6.3~svn698-4/cpp/test/phonenumbers/test_util.cc 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/test/phonenumbers/test_util.cc 2015-07-14 15:21:09.000000000 +0000 @@ -20,42 +20,39 @@ #include "phonenumbers/phonenumber.pb.h" #include "phonenumbers/test_util.h" -using std::cout; -using std::endl; - namespace i18n { namespace phonenumbers { ostream& operator<<(ostream& os, const PhoneNumber& number) { - os << endl - << "country_code: " << number.country_code() << endl - << "national_number: " << number.national_number() << endl; + os << std::endl + << "country_code: " << number.country_code() << std::endl + << "national_number: " << number.national_number() << std::endl; if (number.has_extension()) { - os << "extension: " << number.extension() << endl; + os << "extension: " << number.extension() << std::endl; } if (number.has_italian_leading_zero()) { - os << "italian_leading_zero: " << number.italian_leading_zero() << endl; + os << "italian_leading_zero: " << number.italian_leading_zero() << std::endl; } if (number.has_raw_input()) { - os << "raw_input: " << number.raw_input() << endl; + os << "raw_input: " << number.raw_input() << std::endl; } if (number.has_country_code_source()) { - os << "country_code_source: " << number.country_code_source() << endl; + os << "country_code_source: " << number.country_code_source() << std::endl; } if (number.has_preferred_domestic_carrier_code()) { os << "preferred_domestic_carrier_code: " - << number.preferred_domestic_carrier_code() << endl; + << number.preferred_domestic_carrier_code() << std::endl; } return os; } ostream& operator<<(ostream& os, const vector<PhoneNumber>& numbers) { - os << "[" << endl; + os << "[" << std::endl; for (vector<PhoneNumber>::const_iterator it = numbers.begin(); it != numbers.end(); ++it) { os << *it; } - os << endl << "]" << endl; + os << std::endl << "]" << std::endl; return os; }
  10. Download patch cpp/test/phonenumbers/geocoding/area_code_map_test.cc

    --- 6.3~svn698-4/cpp/test/phonenumbers/geocoding/area_code_map_test.cc 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/test/phonenumbers/geocoding/area_code_map_test.cc 2015-07-14 15:21:09.000000000 +0000 @@ -155,20 +155,20 @@ TEST_F(AreaCodeMapTest, TestLookupNumber TEST_F(AreaCodeMapTest, TestLookupNumberCA1) { EXPECT_STREQ("San Mateo, CA", - map_US_->Lookup(MakePhoneNumber(1, 6503451234L))); + map_US_->Lookup(MakePhoneNumber(1, 6503451234LL))); } TEST_F(AreaCodeMapTest, TestLookupNumberCA2) { - EXPECT_STREQ("California", map_US_->Lookup(MakePhoneNumber(1, 6502531234L))); + EXPECT_STREQ("California", map_US_->Lookup(MakePhoneNumber(1, 6502531234LL))); } TEST_F(AreaCodeMapTest, TestLookupNumberTX) { EXPECT_STREQ("Richardson, TX", - map_US_->Lookup(MakePhoneNumber(1, 9724801234L))); + map_US_->Lookup(MakePhoneNumber(1, 9724801234LL))); } TEST_F(AreaCodeMapTest, TestLookupNumberNotFoundTX) { - EXPECT_STREQ(NULL, map_US_->Lookup(MakePhoneNumber(1, 9724811234L))); + EXPECT_STREQ(NULL, map_US_->Lookup(MakePhoneNumber(1, 9724811234LL))); } TEST_F(AreaCodeMapTest, TestLookupNumberCH) {
  11. Download patch cpp/test/phonenumbers/shortnumberinfo_test.cc
  12. Download patch cpp/src/phonenumbers/shortnumberinfo.h

    --- 6.3~svn698-4/cpp/src/phonenumbers/shortnumberinfo.h 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/shortnumberinfo.h 2015-07-14 15:21:09.000000000 +0000 @@ -26,7 +26,6 @@ #include "phonenumbers/base/basictypes.h" #include "phonenumbers/base/memory/scoped_ptr.h" -#include "phonenumbers/phonemetadata.pb.h" namespace i18n { namespace phonenumbers { @@ -36,12 +35,15 @@ using std::map; using std::set; using std::string; +class MatcherApi; +class PhoneMetadata; class PhoneNumber; class PhoneNumberUtil; class ShortNumberInfo { public: ShortNumberInfo(); + ~ShortNumberInfo(); // Cost categories of short numbers. enum ShortNumberCost { @@ -51,6 +53,12 @@ class ShortNumberInfo { UNKNOWN_COST }; + // DEPRECATED: Anyone who was using it and passing in a string with whitespace + // (or other formatting characters) would have been getting the wrong result. + // You should parse the string to PhoneNumber and use the method + // IsPossibleShortNumberForRegion(PhoneNumber, String). This method will be + // removed in the next release. + // // Check whether a short number is a possible number when dialled from a // region, given the number in the form of a string, and the region where the // number is dialed from. This provides a more lenient check than @@ -59,12 +67,26 @@ class ShortNumberInfo { const string& short_number, const string& region_dialing_from) const; + // Check whether a short number is a possible number when dialled from a + // region, given the number in the form of a string, and the region where the + // number is dialed from. This provides a more lenient check than + // IsValidShortNumberForRegion. + bool IsPossibleShortNumberForRegion( + const PhoneNumber& short_number, + const string& region_dialing_from) const; + // Check whether a short number is a possible number. If a country calling // code is shared by multiple regions, this returns true if it's possible in // any of them. This provides a more lenient check than IsValidShortNumber. // See IsPossibleShortNumberForRegion for details. bool IsPossibleShortNumber(const PhoneNumber& number) const; + // DEPRECATED: Anyone who was using it and passing in a string with whitespace + // (or other formatting characters) would have been getting the wrong result. + // You should parse the string to PhoneNumber and use the method + // IsValidShortNumberForRegion(PhoneNumber, String). This method will be + // removed in the next release. + // // Tests whether a short number matches a valid pattern in a region. Note // that this doesn't verify the number is actually in use, which is // impossible to tell by just looking at the number itself. @@ -72,6 +94,13 @@ class ShortNumberInfo { const string& short_number, const string& region_dialing_from) const; + // Tests whether a short number matches a valid pattern in a region. Note + // that this doesn't verify the number is actually in use, which is + // impossible to tell by just looking at the number itself. + bool IsValidShortNumberForRegion( + const PhoneNumber& short_number, + const string& region_dialing_from) const; + // Tests whether a short number matches a valid pattern. If a country calling // code is shared by multiple regions, this returns true if it's valid in any // of them. Note that this doesn't verify the number is actually in use, @@ -79,6 +108,12 @@ class ShortNumberInfo { // IsValidShortNumberForRegion for details. bool IsValidShortNumber(const PhoneNumber& number) const; + // DEPRECATED: Anyone who was using it and passing in a string with whitespace + // (or other formatting characters) would have been getting the wrong result. + // You should parse the string to PhoneNumber and use the method + // GetExpectedCostForRegion(PhoneNumber, String). This method will be + // removed in the next release. + // // Gets the expected cost category of a short number when dialled from a // region (however, nothing is implied about its validity). If it is // important that the number is valid, then its validity must first be @@ -97,6 +132,26 @@ class ShortNumberInfo { const string& short_number, const string& region_dialing_from) const; + // Gets the expected cost category of a short number when dialled from a + // region (however, nothing is implied about its validity). If it is + // important that the number is valid, then its validity must first be + // checked using IsValidShortNumberForRegion. Note that emergency numbers are + // always considered toll-free. Example usage: + // + // PhoneNumber number; + // phone_util.Parse("110", "US", &number); + // ... + // string region_code("CA"); + // ShortNumberInfo short_info; + // if (short_info.IsValidShortNumberForRegion(number, region_code)) { + // ShortNumberInfo::ShortNumberCost cost = + // short_info.GetExpectedCostForRegion(number, region_code); + // // Do something with the cost information here. + // } + ShortNumberCost GetExpectedCostForRegion( + const PhoneNumber& short_number, + const string& region_dialing_from) const; + // Gets the expected cost category of a short number (however, nothing is // implied about its validity). If the country calling code is unique to a // region, this method behaves exactly the same as GetExpectedCostForRegion. @@ -147,6 +202,7 @@ class ShortNumberInfo { private: const PhoneNumberUtil& phone_util_; + const scoped_ptr<const MatcherApi> matcher_api_; // A mapping from a RegionCode to the PhoneMetadata for that region. scoped_ptr<map<string, PhoneMetadata> >
  13. Download patch cpp/src/phonenumbers/lite_metadata.cc
  14. Download patch cpp/src/phonenumbers/regex_based_matcher.h

    --- 6.3~svn698-4/cpp/src/phonenumbers/regex_based_matcher.h 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/regex_based_matcher.h 2015-07-14 15:21:09.000000000 +0000 @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2014 The Libphonenumber 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. + */ + +#ifndef I18N_PHONENUMBERS_REGEX_BASED_MATCHER_H_ +#define I18N_PHONENUMBERS_REGEX_BASED_MATCHER_H_ + +#include <memory> +#include <string> + +#include "phonenumbers/base/basictypes.h" +#include "phonenumbers/base/memory/scoped_ptr.h" +#include "phonenumbers/matcher_api.h" + +namespace i18n { +namespace phonenumbers { + +class AbstractRegExpFactory; +class PhoneNumberDesc; +class RegExpCache; + +// Implementation of the matcher API using the regular expressions in the +// PhoneNumberDesc proto message to match numbers. +class RegexBasedMatcher : public MatcherApi { + public: + RegexBasedMatcher(); + ~RegexBasedMatcher(); + + bool MatchesNationalNumber(const string& national_number, + const PhoneNumberDesc& number_desc, + bool allow_prefix_match) const; + + bool MatchesPossibleNumber(const string& national_number, + const PhoneNumberDesc& number_desc) const; + + private: + bool Match(const string& national_number, const string& number_pattern, + bool allow_prefix_match) const; + + const scoped_ptr<const AbstractRegExpFactory> regexp_factory_; + const scoped_ptr<RegExpCache> regexp_cache_; + + DISALLOW_COPY_AND_ASSIGN(RegexBasedMatcher); +}; + +} // namespace phonenumbers +} // namespace i18n + +#endif // I18N_PHONENUMBERS_REGEX_BASED_MATCHER_H_
  15. Download patch cpp/CMakeLists.txt

    --- 6.3~svn698-4/cpp/CMakeLists.txt 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/CMakeLists.txt 2015-11-11 22:37:10.000000000 +0000 @@ -17,8 +17,8 @@ cmake_minimum_required (VERSION 2.8) project (libphonenumber) -set (libphonenumber_VERSION_MAJOR 6) -set (libphonenumber_VERSION_MINOR 2) +set (libphonenumber_VERSION_MAJOR 7) +set (libphonenumber_VERSION_MINOR 0) # Helper functions dealing with finding libraries and programs this library # depends on. @@ -192,9 +192,9 @@ set ( "src/phonenumbers/phonenumber.cc" "src/phonenumbers/phonenumber.pb.cc" # Generated by Protocol Buffers. "src/phonenumbers/phonenumberutil.cc" + "src/phonenumbers/regex_based_matcher.cc" "src/phonenumbers/regexp_cache.cc" "src/phonenumbers/shortnumberinfo.cc" - "src/phonenumbers/shortnumberutil.cc" "src/phonenumbers/string_byte_sink.cc" "src/phonenumbers/stringutil.cc" "src/phonenumbers/unicodestring.cc" @@ -344,6 +344,8 @@ if (${USE_ICU_REGEXP} STREQUAL "ON") endif () endif () +set(symbol_map "${CMAKE_SOURCE_DIR}/symbols.map") + if (${BUILD_GEOCODER} STREQUAL "ON") add_library (geocoding STATIC ${GEOCODING_SOURCES}) # The geocoder doesn't use RE2 so there is no reason not to build a shared @@ -355,6 +357,8 @@ if (${BUILD_GEOCODER} STREQUAL "ON") PREFIX "lib" SOVERSION ${libphonenumber_VERSION_MAJOR} VERSION ${libphonenumber_VERSION_MAJOR}.${libphonenumber_VERSION_MINOR}) + set_target_properties(geocoding-shared PROPERTIES LINK_FLAGS "${ldflags} -Wl,--version-script,${symbol_map}") + set_target_properties(geocoding-shared PROPERTIES LINK_DEPENDS ${symbol_map}) endif () # Build a shared library (with -fPIC). @@ -383,6 +387,8 @@ if (BUILD_SHARED_LIB) PREFIX "lib" SOVERSION ${libphonenumber_VERSION_MAJOR} VERSION ${libphonenumber_VERSION_MAJOR}.${libphonenumber_VERSION_MINOR}) + set_target_properties(phonenumber-shared PROPERTIES LINK_FLAGS "${ldflags} -Wl,--version-script,${symbol_map}") + set_target_properties(phonenumber-shared PROPERTIES LINK_DEPENDS ${symbol_map}) endif () # Libraries used by both libphonenumber and libgeocoding. @@ -449,7 +455,7 @@ set (TEST_SOURCES "test/phonenumbers/regexp_adapter_test.cc" "test/phonenumbers/regexp_cache_test.cc" "test/phonenumbers/run_tests.cc" - "test/phonenumbers/shortnumberutil_test.cc" + "test/phonenumbers/shortnumberinfo_test.cc" "test/phonenumbers/stringutil_test.cc" "test/phonenumbers/test_util.cc" "test/phonenumbers/unicodestring_test.cc" @@ -504,13 +510,14 @@ install (FILES "src/phonenumbers/asyoutypeformatter.h" "src/phonenumbers/callback.h" "src/phonenumbers/logger.h" + "src/phonenumbers/matcher_api.h" "src/phonenumbers/phonenumber.pb.h" "src/phonenumbers/phonemetadata.pb.h" "src/phonenumbers/phonenumberutil.h" "src/phonenumbers/regexp_adapter.h" "src/phonenumbers/regexp_cache.h" + "src/phonenumbers/region_code.h" "src/phonenumbers/shortnumberinfo.h" - "src/phonenumbers/shortnumberutil.h" "src/phonenumbers/unicodestring.h" DESTINATION include/phonenumbers/ ) @@ -536,17 +543,23 @@ if (${BUILD_GEOCODER} STREQUAL "ON") endif () install ( - FILES "src/phonenumbers/base/basictypes.h" + FILES + "src/phonenumbers/base/basictypes.h" + "src/phonenumbers/base/template_util.h" + "src/phonenumbers/base/logging.h" + "src/phonenumbers/base/thread_checker.h" DESTINATION include/phonenumbers/base/ ) install (FILES "src/phonenumbers/base/memory/scoped_ptr.h" "src/phonenumbers/base/memory/singleton.h" + "src/phonenumbers/base/memory/singleton_posix.h" DESTINATION include/phonenumbers/base/memory/ ) install (FILES "src/phonenumbers/base/synchronization/lock.h" + "src/phonenumbers/base/synchronization/lock_posix.h" DESTINATION include/phonenumbers/base/synchronization/) install (TARGETS phonenumber LIBRARY DESTINATION lib/ ARCHIVE DESTINATION lib/)
  16. Download patch cpp/src/phonenumbers/regex_based_matcher.cc

    --- 6.3~svn698-4/cpp/src/phonenumbers/regex_based_matcher.cc 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/regex_based_matcher.cc 2015-07-14 15:21:09.000000000 +0000 @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2014 The Libphonenumber 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. + */ + +#include "phonenumbers/regex_based_matcher.h" + +#include <memory> +#include <string> + +#include "phonenumbers/base/memory/scoped_ptr.h" +#include "phonenumbers/phonemetadata.pb.h" +#include "phonenumbers/regexp_adapter.h" +#include "phonenumbers/regexp_cache.h" +#include "phonenumbers/regexp_factory.h" + +namespace i18n { +namespace phonenumbers { + +using std::string; + +// Same implementations of AbstractRegExpFactory and RegExpCache in +// PhoneNumberUtil (copy from phonenumberutil.cc). +RegexBasedMatcher::RegexBasedMatcher() + : regexp_factory_(new RegExpFactory()), + regexp_cache_(new RegExpCache(*regexp_factory_, 128)) {} + +RegexBasedMatcher::~RegexBasedMatcher() {} + +bool RegexBasedMatcher::MatchesNationalNumber( + const string& national_number, const PhoneNumberDesc& number_desc, + bool allow_prefix_match) const { + return Match(national_number, number_desc.national_number_pattern(), + allow_prefix_match); +} + +bool RegexBasedMatcher::MatchesPossibleNumber( + const string& national_number, const PhoneNumberDesc& number_desc) const { + return Match(national_number, number_desc.possible_number_pattern(), false); +} + +bool RegexBasedMatcher::Match(const string& national_number, + const string& number_pattern, + bool allow_prefix_match) const { + const RegExp& regexp(regexp_cache_->GetRegExp(number_pattern)); + + if (allow_prefix_match) { + const scoped_ptr<RegExpInput> normalized_number_input( + regexp_factory_->CreateInput(national_number)); + return regexp.Consume(normalized_number_input.get()); + } else { + return regexp.FullMatch(national_number); + } +} + +} // namespace phonenumbers +} // namespace i18n
  17. Download patch debian/libphonenumber7.install

    --- 6.3~svn698-4/debian/libphonenumber7.install 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/libphonenumber7.install 2015-07-21 13:07:45.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/libp*.so.*
  18. Download patch cpp/test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc

    --- 6.3~svn698-4/cpp/test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc 2015-07-14 15:21:09.000000000 +0000 @@ -51,12 +51,12 @@ class PhoneNumberOfflineGeocoderTest : p PhoneNumberOfflineGeocoderTest() : KO_NUMBER1(MakeNumber(82, 22123456UL)), KO_NUMBER2(MakeNumber(82, 322123456UL)), - KO_NUMBER3(MakeNumber(82, 6421234567UL)), + KO_NUMBER3(MakeNumber(82, 6421234567ULL)), KO_INVALID_NUMBER(MakeNumber(82, 1234UL)), - US_NUMBER1(MakeNumber(1, 6502530000UL)), - US_NUMBER2(MakeNumber(1, 6509600000UL)), + US_NUMBER1(MakeNumber(1, 6502530000ULL)), + US_NUMBER2(MakeNumber(1, 6509600000ULL)), US_NUMBER3(MakeNumber(1, 2128120000UL)), - US_NUMBER4(MakeNumber(1, 6174240000UL)), + US_NUMBER4(MakeNumber(1, 6174240000ULL)), US_INVALID_NUMBER(MakeNumber(1, 123456789UL)), BS_NUMBER1(MakeNumber(1, 2423651234UL)), AU_NUMBER(MakeNumber(61, 236618300UL)), @@ -190,7 +190,8 @@ TEST_F(PhoneNumberOfflineGeocoderTest, // Invalid number - return an empty string. EXPECT_EQ("", geocoder_->GetDescriptionForNumber(US_INVALID_NUMBER, - kEnglishLocale, "US")); + kEnglishLocale, + "US")); } TEST_F(PhoneNumberOfflineGeocoderTest, TestGetDescriptionForInvalidNumber) {
  19. Download patch debian/README.source

    --- 6.3~svn698-4/debian/README.source 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -NMUs are welcome - -Use something like the script below to update from Git - -Note: there is no "Build-Depends-Indep" in debian/control because -some of the Java tools need to be built for use during the C++ build. -#!/bin/bash - -VERSION=6.3~svn680 - -echo "*.jar export-ignore" > .gitattributes - -git archive --worktree-attributes \ - --format tar \ - --prefix libphonenumber/ \ - -o ../libphonenumber_${VERSION}.orig.tar \ - master - -cd .. - -bzip2 libphonenumber_${VERSION}.orig.tar
  20. Download patch debian/rules

    --- 6.3~svn698-4/debian/rules 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/rules 2015-07-21 13:07:05.000000000 +0000 @@ -18,72 +18,41 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk - -JAVA_HOME := /usr/lib/jvm/default-java -DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate - +ANT ?= ant CMAKE ?= cmake +JAVA_HOME ?= /usr/lib/jvm/default-java CMAKE_FLAGS := -DCMAKE_INSTALL_PREFIX=/usr CPP_BUILD := cpp/build JAVA_BUILD := java/build -# CMake doesn't read CPPFLAGS and dh_auto commands are not used in this rules -# file so we have to manually set the flags here to ensure that hardening flags -# are used: -CFLAGS += $(CPPFLAGS) -CXXFLAGS += $(CPPFLAGS) - -ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) endif -#%: -# dh $@ --with javahelper +%: + dh $@ -B$(CPP_BUILD) -Dcpp -Scmake --with javahelper + +override_dh_auto_build: + dh_auto_build -- VERBOSE=1 phonenumber phonenumber-shared + $(ANT) -f $(JAVA_BUILD).xml jar + +override_dh_auto_test: + dh_auto_test +ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) + $(ANT) -f $(JAVA_BUILD).xml junit +endif -#override_dh_auto_configure: -configure/libphonenumber6:: - mkdir -p $(CPP_BUILD) && cd $(CPP_BUILD) && $(CMAKE) $(CMAKE_FLAGS) .. - -#override_dh_auto_build: -# ( cd tools/java && $(MVN) package ) -# mkdir java/lib -# ln -s /usr/share/java/junit4.jar java/lib/junit-4.8.1.jar -# $(ANT) -f $(JAVA_BUILD).xml jar -build/libphonenumber6:: - ln -sf cpp-build-1.0-SNAPSHOT.jar tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar - ln -sf /usr/share/java/protobuf.jar tools/java/cpp-build/target/protobuf-java-debian.jar - $(MAKE) -C $(CPP_BUILD) phonenumber phonenumber-shared - -#override_dh_auto_test: -#ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) -# $(MAKE) -C $(CPP_BUILD) test -# $(ANT) -f $(JAVA_BUILD).xml junit -#endif - -# Hack for multiarch: CMake doesn't really support libdir so we just manually -# move /usr/lib/* to a proper multiarch location. -#override_dh_auto_install: -common-install-arch:: - dh_auto_install --builddirectory=$(CPP_BUILD) - mkdir -p debian/tmp/usr/lib-$(DEB_HOST_MULTIARCH) - mv debian/tmp/usr/lib/* debian/tmp/usr/lib-$(DEB_HOST_MULTIARCH) - mv debian/tmp/usr/lib-$(DEB_HOST_MULTIARCH) \ - debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) - -#override_dh_auto_clean: -clean:: - -test -d $(CPP_BUILD) && $(MAKE) -C $(CPP_BUILD) clean - #-$(ANT) -f $(JAVA_BUILD).xml clean - #-( cd tools/java && $(MVN) clean ) +override_dh_auto_install: + dh_auto_install + cp cpp/src/phonenumbers/region_code.h \ + debian/tmp/./usr/include/phonenumbers/. + cp cpp/src/phonenumbers/base/synchronization/lock_posix.h \ + debian/tmp/./usr/include/phonenumbers/base/synchronization/. + mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) + mv debian/tmp/usr/lib/lib* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/. + +override_dh_auto_clean: + dh_auto_clean + -$(ANT) -f $(JAVA_BUILD).xml clean
  21. Download patch cpp/src/phonenumbers/utf/unicodetext.cc

    --- 6.3~svn698-4/cpp/src/phonenumbers/utf/unicodetext.cc 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/utf/unicodetext.cc 2015-07-14 15:21:09.000000000 +0000 @@ -85,7 +85,7 @@ static int ConvertToInterchangeValid(cha } } // Is the current string invalid UTF8 or just non-interchange UTF8? - char32 rune; + Rune rune; int n; if (isvalidcharntorune(start, end - start, &rune, &n)) { // structurally valid UTF8, but not interchange valid @@ -362,7 +362,8 @@ UnicodeText::~UnicodeText() {} void UnicodeText::push_back(char32 c) { if (UniLib::IsValidCodepoint(c)) { char buf[UTFmax]; - int len = runetochar(buf, &c); + Rune rune = c; + int len = runetochar(buf, &rune); if (UniLib::IsInterchangeValid(buf, len)) { repr_.append(buf, len); } else { @@ -493,6 +494,7 @@ int UnicodeText::const_iterator::get_utf UnicodeText::const_iterator UnicodeText::MakeIterator(const char* p) const { +#ifndef NDEBUG assert(p != NULL); const char* start = utf8_data(); int len = utf8_length(); @@ -500,6 +502,7 @@ UnicodeText::const_iterator UnicodeText: assert(p >= start); assert(p <= end); assert(p == end || !UniLib::IsTrailByte(*p)); +#endif return const_iterator(p); }
  22. Download patch cpp/src/phonenumbers/base/synchronization/lock.h

    --- 6.3~svn698-4/cpp/src/phonenumbers/base/synchronization/lock.h 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/base/synchronization/lock.h 2015-07-14 15:21:09.000000000 +0000 @@ -44,14 +44,16 @@ namespace phonenumbers { class Lock { public: - Lock() : thread_checker_() {} + Lock() {} void Acquire() const { DCHECK(thread_checker_.CalledOnValidThread()); + IGNORE_UNUSED(thread_checker_); } void Release() const { DCHECK(thread_checker_.CalledOnValidThread()); + IGNORE_UNUSED(thread_checker_); } private:
  23. Download patch java/libphonenumber/src/com/google/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java

    --- 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/AlternateFormatsCountryCodeSet.java 2015-07-14 15:21:09.000000000 +0000 @@ -26,9 +26,9 @@ import java.util.Set; public class AlternateFormatsCountryCodeSet { // A set of all country codes for which data is available. static Set<Integer> getCountryCodeSet() { - // The capacity is set to 53 as there are 40 different entries, + // The capacity is set to 57 as there are 43 different entries, // and this offers a load factor of roughly 0.75. - Set<Integer> countryCodeSet = new HashSet<Integer>(53); + Set<Integer> countryCodeSet = new HashSet<Integer>(57); countryCodeSet.add(7); countryCodeSet.add(27); @@ -39,6 +39,7 @@ public class AlternateFormatsCountryCode countryCodeSet.add(43); countryCodeSet.add(44); countryCodeSet.add(49); + countryCodeSet.add(54); countryCodeSet.add(55); countryCodeSet.add(58); countryCodeSet.add(61); @@ -48,6 +49,7 @@ public class AlternateFormatsCountryCode countryCodeSet.add(81); countryCodeSet.add(84); countryCodeSet.add(90); + countryCodeSet.add(91); countryCodeSet.add(94); countryCodeSet.add(95); countryCodeSet.add(255); @@ -65,6 +67,7 @@ public class AlternateFormatsCountryCode countryCodeSet.add(506); countryCodeSet.add(595); countryCodeSet.add(675); + countryCodeSet.add(676); countryCodeSet.add(679); countryCodeSet.add(855); countryCodeSet.add(971);
  24. Download patch java/carrier/pom.xml

    --- 6.3~svn698-4/java/carrier/pom.xml 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/carrier/pom.xml 2015-07-14 15:21:09.000000000 +0000 @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>carrier</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.14</version> <packaging>jar</packaging> - <url>http://code.google.com/p/libphonenumber/</url> + <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>6.2.3-SNAPSHOT</version> + <version>7.0.8</version> </parent> <build> @@ -34,12 +34,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>6.2.3-SNAPSHOT</version> + <version>7.0.8</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.15-SNAPSHOT</version> + <version>2.24</version> </dependency> </dependencies> Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1684_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1684_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1876_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/1876_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/216_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/216_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/221_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/221_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/227_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/227_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/242_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/242_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/248_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/248_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/249_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/249_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/256_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/256_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/257_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/257_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/267_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/267_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/352_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/352_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/505_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/505_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/506_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/506_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/597_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/597_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/63_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/63_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/66_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/66_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/677_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/677_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/689_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/689_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/856_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/856_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/92_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/92_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/93_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/93_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/94_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/94_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/95_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/95_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/961_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/961_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/962_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/962_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/966_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/966_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/967_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/967_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/977_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/977_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en differ Binary files 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/config and 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/config differ
  25. Download patch cpp/test/phonenumbers/test_util.h

    --- 6.3~svn698-4/cpp/test/phonenumbers/test_util.h 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/test/phonenumbers/test_util.h 2015-07-14 15:21:09.000000000 +0000 @@ -57,6 +57,10 @@ class RegionCode { return "AE"; } + static const char* AM() { + return "AM"; + } + static const char* AO() { return "AO"; } @@ -73,6 +77,10 @@ class RegionCode { return "AU"; } + static const char* BB() { + return "BB"; + } + static const char* BR() { return "BR"; } @@ -105,6 +113,10 @@ class RegionCode { return "CS"; } + static const char* CX() { + return "CX"; + } + static const char* DE() { return "DE"; }
  26. Download patch cpp/src/phonenumbers/utf/rune.c

    --- 6.3~svn698-4/cpp/src/phonenumbers/utf/rune.c 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/utf/rune.c 2015-07-14 15:21:09.000000000 +0000 @@ -1,6 +1,7 @@ /* * The authors of this software are Rob Pike and Ken Thompson. * Copyright (c) 2002 by Lucent Technologies. + * Portions Copyright (c) 2009 The Go Authors. All rights reserved. * Permission to use, copy, modify, and distribute this software for any * purpose without fee is hereby granted, provided that this entire notice * is included in all copies of any software which is or includes a copy @@ -11,8 +12,6 @@ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. */ -#include <stdarg.h> -#include <string.h> #include "phonenumbers/utf/utf.h" #include "phonenumbers/utf/utfdef.h" @@ -35,12 +34,14 @@ enum Rune1 = (1<<(Bit1+0*Bitx))-1, /* 0000 0000 0111 1111 */ Rune2 = (1<<(Bit2+1*Bitx))-1, /* 0000 0111 1111 1111 */ Rune3 = (1<<(Bit3+2*Bitx))-1, /* 1111 1111 1111 1111 */ - Rune4 = (1<<(Bit4+3*Bitx))-1, - /* 0001 1111 1111 1111 1111 1111 */ + Rune4 = (1<<(Bit4+3*Bitx))-1, /* 0001 1111 1111 1111 1111 1111 */ Maskx = (1<<Bitx)-1, /* 0011 1111 */ Testx = Maskx ^ 0xFF, /* 1100 0000 */ + SurrogateMin = 0xD800, + SurrogateMax = 0xDFFF, + Bad = Runeerror, }; @@ -79,7 +80,7 @@ charntorune(Rune *rune, const char *str, */ c = *(uchar*)str; if(c < Tx) { - *rune = c; + *rune = (Rune)c; return 1; } @@ -101,7 +102,7 @@ charntorune(Rune *rune, const char *str, l = ((c << Bitx) | c1) & Rune2; if(l <= Rune1) goto bad; - *rune = l; + *rune = (Rune)l; return 2; } @@ -121,7 +122,9 @@ charntorune(Rune *rune, const char *str, l = ((((c << Bitx) | c1) << Bitx) | c2) & Rune3; if(l <= Rune2) goto bad; - *rune = l; + if (SurrogateMin <= l && l <= SurrogateMax) + goto bad; + *rune = (Rune)l; return 3; } @@ -137,9 +140,9 @@ charntorune(Rune *rune, const char *str, goto bad; if (c < T5) { l = ((((((c << Bitx) | c1) << Bitx) | c2) << Bitx) | c3) & Rune4; - if (l <= Rune3) + if (l <= Rune3 || l > Runemax) goto bad; - *rune = l; + *rune = (Rune)l; return 4; } @@ -175,7 +178,7 @@ chartorune(Rune *rune, const char *str) */ c = *(uchar*)str; if(c < Tx) { - *rune = c; + *rune = (Rune)c; return 1; } @@ -192,7 +195,7 @@ chartorune(Rune *rune, const char *str) l = ((c << Bitx) | c1) & Rune2; if(l <= Rune1) goto bad; - *rune = l; + *rune = (Rune)l; return 2; } @@ -207,7 +210,9 @@ chartorune(Rune *rune, const char *str) l = ((((c << Bitx) | c1) << Bitx) | c2) & Rune3; if(l <= Rune2) goto bad; - *rune = l; + if (SurrogateMin <= l && l <= SurrogateMax) + goto bad; + *rune = (Rune)l; return 3; } @@ -220,9 +225,9 @@ chartorune(Rune *rune, const char *str) goto bad; if (c < T5) { l = ((((((c << Bitx) | c1) << Bitx) | c2) << Bitx) | c3) & Rune4; - if (l <= Rune3) + if (l <= Rune3 || l > Runemax) goto bad; - *rune = l; + *rune = (Rune)l; return 4; } @@ -240,7 +245,8 @@ bad: } int -isvalidcharntorune(const char* str, int length, Rune* rune, int* consumed) { +isvalidcharntorune(const char* str, int length, Rune* rune, int* consumed) +{ *consumed = charntorune(rune, str, length); return *rune != Runeerror || *consumed == 3; } @@ -257,7 +263,7 @@ runetochar(char *str, const Rune *rune) */ c = *rune; if(c <= Rune1) { - str[0] = c; + str[0] = (char)c; return 1; } @@ -266,28 +272,30 @@ runetochar(char *str, const Rune *rune) * 0080-07FF => T2 Tx */ if(c <= Rune2) { - str[0] = T2 | (c >> 1*Bitx); - str[1] = Tx | (c & Maskx); + str[0] = (char)(T2 | (c >> 1*Bitx)); + str[1] = (char)(Tx | (c & Maskx)); return 2; } /* - * If the Rune is out of range, convert it to the error rune. + * If the Rune is out of range or a surrogate half, convert it to the error rune. * Do this test here because the error rune encodes to three bytes. * Doing it earlier would duplicate work, since an out of range * Rune wouldn't have fit in one or two bytes. */ if (c > Runemax) c = Runeerror; + if (SurrogateMin <= c && c <= SurrogateMax) + c = Runeerror; /* * three character sequence * 0800-FFFF => T3 Tx Tx */ if (c <= Rune3) { - str[0] = T3 | (c >> 2*Bitx); - str[1] = Tx | ((c >> 1*Bitx) & Maskx); - str[2] = Tx | (c & Maskx); + str[0] = (char)(T3 | (c >> 2*Bitx)); + str[1] = (char)(Tx | ((c >> 1*Bitx) & Maskx)); + str[2] = (char)(Tx | (c & Maskx)); return 3; } @@ -295,10 +303,10 @@ runetochar(char *str, const Rune *rune) * four character sequence (21-bit value) * 10000-1FFFFF => T4 Tx Tx Tx */ - str[0] = T4 | (c >> 3*Bitx); - str[1] = Tx | ((c >> 2*Bitx) & Maskx); - str[2] = Tx | ((c >> 1*Bitx) & Maskx); - str[3] = Tx | (c & Maskx); + str[0] = (char)(T4 | (c >> 3*Bitx)); + str[1] = (char)(Tx | ((c >> 2*Bitx) & Maskx)); + str[2] = (char)(Tx | ((c >> 1*Bitx) & Maskx)); + str[3] = (char)(Tx | (c & Maskx)); return 4; } @@ -317,7 +325,7 @@ runenlen(const Rune *r, int nrune) nb = 0; while(nrune--) { - c = *r++; + c = (int)*r++; if (c <= Rune1) nb++; else if (c <= Rune2)
  27. Download patch cpp/src/phonenumbers/base/logging.h

    --- 6.3~svn698-4/cpp/src/phonenumbers/base/logging.h 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/base/logging.h 2015-07-14 15:21:09.000000000 +0000 @@ -38,4 +38,8 @@ template <typename T> T* CHECK_NOTNULL(T return ptr; } +#if !defined(IGNORE_UNUSED) +#define IGNORE_UNUSED(X) (void)(X) +#endif + #endif // I18N_PHONENUMBERS_BASE_LOGGING_H_
  28. Download patch java/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java

    --- 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java 2015-07-14 15:21:09.000000000 +0000 @@ -390,6 +390,9 @@ public class AsYouTypeFormatter { ableToFormat = true; isExpectingCountryCallingCode = false; possibleFormats.clear(); + lastMatchPosition = 0; + formattingTemplate.setLength(0); + currentFormattingPattern = ""; return attemptToChooseFormattingPattern(); } @@ -637,6 +640,8 @@ public class AsYouTypeFormatter { } private String inputDigitHelper(char nextChar) { + // Note that formattingTemplate is not guaranteed to have a value, it could be empty, e.g. + // when the next digit is entered after extracting an IDD or NDD. Matcher digitMatcher = DIGIT_PATTERN.matcher(formattingTemplate); if (digitMatcher.find(lastMatchPosition)) { String tempTemplate = digitMatcher.replaceFirst(Character.toString(nextChar));
  29. Download patch debian/control

    --- 6.3~svn698-4/debian/control 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/control 2015-07-21 13:09:24.000000000 +0000 @@ -1,73 +1,78 @@ Source: libphonenumber Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: Daniel Pocock <daniel@pocock.pro>, Fredrik Roubert <roubert@google.com> -Build-Depends: cdbs, +Maintainer: Fredrik Roubert <roubert@google.com> +Build-Depends: ant, + ant-optional, cmake, - debhelper (>= 9), + debhelper (>= 7.0.50~), default-jdk | java-sdk, + javahelper (>= 0.34), libboost-dev (>= 1.40), - libboost-system-dev (>= 1.40), libboost-thread-dev (>= 1.40), libgtest-dev, libicu-dev (>= 4.4), libprotobuf-dev (>= 2.4), libre2-dev, - maven-debian-helper (>= 1.5), protobuf-compiler, - default-jdk-doc, - junit4, - libbuild-helper-maven-plugin-java, - libmaven-antrun-plugin-java, - libmaven-assembly-plugin-java, - libmaven-compiler-plugin-java, - libmaven-exec-plugin-java, - libmaven-jar-plugin-java, - libmaven-javadoc-plugin-java, - libmaven-war-plugin-java, - libprotobuf-java, - libservlet2.5-java, - libservlet2.5-java-doc -Standards-Version: 3.9.5 + quilt +Standards-Version: 3.9.6 Section: libs Homepage: http://code.google.com/p/libphonenumber/ Vcs-Browser: http://code.google.com/p/libphonenumber/source/browse/ Vcs-Svn: http://libphonenumber.googlecode.com/svn/trunk/ -Package: libphonenumber6-java -Section: java -Architecture: all -Depends: ${misc:Depends}, ${maven:Depends} -Recommends: ${maven:OptionalDepends} -Description: parsing/formatting/validating phone numbers - java +Package: libphonenumber-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: libphonenumber7 (=${binary:Version}), ${misc:Depends}, libprotobuf-dev (>= 2.4) +Description: parsing/formatting/validating phone numbers - development Google's common C++ and Java library for parsing, formatting, storing and validating international phone numbers. . - This package contains the runtime library JARs for Java users. + This package contains the static libraries and include files. -Package: libphonenumber6-dev +Package: libphonenumber7 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: parsing/formatting/validating phone numbers - runtime + Google's common C++ and Java library for parsing, formatting, storing and + validating international phone numbers. + . + This package contains the runtime libraries. + +Package: libgeocoding-dev Section: libdevel Architecture: any -Provides: libphonenumber-dev -Conflicts: libphonenumber-dev -Replaces: libphonenumber-dev -Depends: libphonenumber6 (=${binary:Version}), ${misc:Depends}, - libboost-dev (>= 1.40), - libboost-system-dev (>= 1.40), - libboost-thread-dev (>= 1.40), - libprotobuf-dev (>= 2.4) -Description: parsing/formatting/validating phone numbers - development files +Multi-Arch: same +Depends: libgeocoding7 (=${binary:Version}), ${misc:Depends} +Description: parsing/formatting/validating phone numbers - development Google's common C++ and Java library for parsing, formatting, storing and validating international phone numbers. . This package contains the static libraries and include files. -Package: libphonenumber6 +Package: libgeocoding7 +Section: libs Architecture: any -Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Description: parsing/formatting/validating phone numbers +Description: parsing/formatting/validating phone numbers - runtime + Google's common C++ and Java library for parsing, formatting, storing and + validating international phone numbers. + . + This package contains the runtime libraries. + +Package: libphonenumber-java +Section: java +Architecture: all +Depends: ${java:Depends}, ${misc:Depends} +Description: parsing/formatting/validating phone numbers - java Google's common C++ and Java library for parsing, formatting, storing and validating international phone numbers. . - This package contains the runtime libraries for C++ users. + This package contains the JAR files.
  30. Download patch CONTRIBUTORS

    --- 6.3~svn698-4/CONTRIBUTORS 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/CONTRIBUTORS 2015-07-14 15:21:09.000000000 +0000 @@ -51,6 +51,7 @@ Fredrik Roubert Alec McTurk Alexandru Manea András Eisenberger +Anssi Hannula Boshi Lian -- Maintains Chinese geocoding data Bradford Smith Cecilia Roes
  31. Download patch java/libphonenumber/pom.xml

    --- 6.3~svn698-4/java/libphonenumber/pom.xml 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/libphonenumber/pom.xml 2015-07-14 15:21:09.000000000 +0000 @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>6.2.3-SNAPSHOT</version> + <version>7.0.8</version> <packaging>jar</packaging> - <url>http://code.google.com/p/libphonenumber/</url> + <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>6.2.3-SNAPSHOT</version> + <version>7.0.8</version> </parent> <build>
  32. Download patch java/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java

    --- 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java 2015-07-14 15:21:09.000000000 +0000 @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2014 The Libphonenumber 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 com.google.i18n.phonenumbers.internal; + +import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; + +/** + * Internal phonenumber matching API used to isolate the underlying implementation of the + * matcher and allow different implementations to be swapped in easily. + */ +public interface MatcherApi { + /** + * Returns whether the given national number (a string containing only decimal digits) matches + * the national number pattern defined in the given {@code PhoneNumberDesc} message. + */ + boolean matchesNationalNumber(String nationalNumber, PhoneNumberDesc numberDesc, + boolean allowPrefixMatch); + + /** + * Returns whether the given national number (a string containing only decimal digits) matches + * the possible number pattern defined in the given {@code PhoneNumberDesc} message. + */ + boolean matchesPossibleNumber(String nationalNumber, PhoneNumberDesc numberDesc); +}
  33. Download patch cpp/src/phonenumbers/shortnumberutil.h

    --- 6.3~svn698-4/cpp/src/phonenumbers/shortnumberutil.h 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/shortnumberutil.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -// Copyright (C) 2012 The Libphonenumber 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. - -// Utility for international short phone numbers, such as short codes and -// emergency numbers. Note most commercial short numbers are not handled here, -// but by the phonenumberutil. -// -// Author: David Yonge-Mallo -// -// This class is deprecated. Users should migrate to ShortNumberInfo instead for -// this information. - -#ifndef I18N_PHONENUMBERS_SHORTNUMBERUTIL_H_ -#define I18N_PHONENUMBERS_SHORTNUMBERUTIL_H_ - -#include <string> - -#include "phonenumbers/base/basictypes.h" - -namespace i18n { -namespace phonenumbers { - -using std::string; - -// Deprecated - use ShortNumberInfo instead. -class ShortNumberUtil { - public: - ShortNumberUtil(); - - // Returns true if the number might be used to connect to an emergency service - // in the given region. - // - // This method takes into account cases where the number might contain - // formatting, or might have additional digits appended (when it is okay to do - // that in the region specified). - bool ConnectsToEmergencyNumber(const string& number, - const string& region_code) const; - - // Returns true if the number exactly matches an emergency service number in - // the given region. - // - // This method takes into account cases where the number might contain - // formatting, but doesn't allow additional digits to be appended. - bool IsEmergencyNumber(const string& number, - const string& region_code) const; - - private: - DISALLOW_COPY_AND_ASSIGN(ShortNumberUtil); -}; - -} // namespace phonenumbers -} // namespace i18n - -#endif // I18N_PHONENUMBERS_SHORTNUMBERUTIL_H_
  34. Download patch cpp/src/phonenumbers/utf/utfdef.h

    --- 6.3~svn698-4/cpp/src/phonenumbers/utf/utfdef.h 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/utf/utfdef.h 2015-07-14 15:21:09.000000000 +0000 @@ -25,4 +25,3 @@ typedef unsigned int uint; typedef unsigned long ulong; #define nelem(x) (sizeof(x)/sizeof((x)[0])) -#define nil ((void*)0)
  35. Download patch cpp/src/phonenumbers/test_metadata.cc
  36. Download patch java/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java

    --- 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java 2015-07-14 15:21:09.000000000 +0000 @@ -22,6 +22,7 @@ import com.google.i18n.phonenumbers.Phon import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import com.google.i18n.phonenumbers.prefixmapper.PrefixFileReader; +import java.util.List; import java.util.Locale; /** @@ -60,11 +61,27 @@ public class PhoneNumberOfflineGeocoder /** * Returns the customary display name in the given language for the given territory the phone - * number is from. + * number is from. If it could be from many territories, nothing is returned. */ private String getCountryNameForNumber(PhoneNumber number, Locale language) { - String regionCode = phoneUtil.getRegionCodeForNumber(number); - return getRegionDisplayName(regionCode, language); + List<String> regionCodes = + phoneUtil.getRegionCodesForCountryCode(number.getCountryCode()); + if (regionCodes.size() == 1) { + return getRegionDisplayName(regionCodes.get(0), language); + } else { + String regionWhereNumberIsValid = "ZZ"; + for (String regionCode : regionCodes) { + if (phoneUtil.isValidNumberForRegion(number, regionCode)) { + if (!regionWhereNumberIsValid.equals("ZZ")) { + // If we can't assign the phone number as definitely belonging to only one territory, + // then we return nothing. + return ""; + } + regionWhereNumberIsValid = regionCode; + } + } + return getRegionDisplayName(regionWhereNumberIsValid, language); + } } /**
  37. Download patch debian/patches/boost_build_fix.patch

    --- 6.3~svn698-4/debian/patches/boost_build_fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/patches/boost_build_fix.patch 2015-07-21 12:47:54.000000000 +0000 @@ -0,0 +1,21 @@ +=== modified file 'cpp/CMakeLists.txt' +Index: b/cpp/CMakeLists.txt +=================================================================== +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -510,6 +510,7 @@ install (FILES + "src/phonenumbers/phonenumberutil.h" + "src/phonenumbers/regexp_adapter.h" + "src/phonenumbers/regexp_cache.h" ++ "src/phonenumbers/region_code.h" + "src/phonenumbers/shortnumberinfo.h" + "src/phonenumbers/unicodestring.h" + DESTINATION include/phonenumbers/ +@@ -552,6 +553,7 @@ install (FILES + ) + + install (FILES "src/phonenumbers/base/synchronization/lock.h" ++ "src/phonenumbers/base/synchronization/lock_posix.h" + DESTINATION include/phonenumbers/base/synchronization/) + + install (TARGETS phonenumber LIBRARY DESTINATION lib/ ARCHIVE DESTINATION lib/)
  38. Download patch debian/libphonenumber7.symbols.arm64
  39. Download patch cpp/test/phonenumbers/phonenumberutil_test.cc

    --- 6.3~svn698-4/cpp/test/phonenumbers/phonenumberutil_test.cc 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/test/phonenumbers/phonenumberutil_test.cc 2015-11-11 22:37:10.000000000 +0000 @@ -39,9 +39,7 @@ namespace i18n { namespace phonenumbers { -using std::endl; using std::find; -using std::make_pair; using std::ostream; using google::protobuf::RepeatedPtrField; @@ -173,6 +171,20 @@ TEST_F(PhoneNumberUtilTest, GetSupported EXPECT_GT(regions.size(), 0U); } +TEST_F(PhoneNumberUtilTest, GetSupportedGlobalNetworkCallingCodes) { + set<int> calling_codes; + + phone_util_.GetSupportedGlobalNetworkCallingCodes(&calling_codes); + EXPECT_GT(calling_codes.size(), 0U); + for (set<int>::const_iterator it = calling_codes.begin(); + it != calling_codes.end(); ++it) { + EXPECT_GT(*it, 0); + string region_code; + phone_util_.GetRegionCodeForCountryCode(*it, &region_code); + EXPECT_EQ(RegionCode::UN001(), region_code); + } +} + TEST_F(PhoneNumberUtilTest, GetRegionCodesForCountryCallingCode) { list<string> regions; @@ -1110,7 +1122,7 @@ TEST_F(PhoneNumberUtilTest, FormatNumber // numbers are always output in international format, but short numbers are // in national format. test_number.set_country_code(1); - test_number.set_national_number(6502530000L); + test_number.set_national_number(6502530000LL); phone_util_.FormatNumberForMobileDialing( test_number, RegionCode::US(), false, &formatted_number); EXPECT_EQ("+16502530000", formatted_number); @@ -1728,21 +1740,6 @@ TEST_F(PhoneNumberUtilTest, IsPossibleNu number.set_national_number(123456789ULL); EXPECT_EQ(PhoneNumberUtil::TOO_LONG, phone_util_.IsPossibleNumberWithReason(number)); - - // Try with number that we don't have metadata for. - PhoneNumber ad_number; - ad_number.set_country_code(376); - ad_number.set_national_number(12345ULL); - EXPECT_EQ(PhoneNumberUtil::IS_POSSIBLE, - phone_util_.IsPossibleNumberWithReason(ad_number)); - ad_number.set_country_code(376); - ad_number.set_national_number(1ULL); - EXPECT_EQ(PhoneNumberUtil::TOO_SHORT, - phone_util_.IsPossibleNumberWithReason(ad_number)); - ad_number.set_country_code(376); - ad_number.set_national_number(123456789012345678ULL); - EXPECT_EQ(PhoneNumberUtil::TOO_LONG, - phone_util_.IsPossibleNumberWithReason(ad_number)); } TEST_F(PhoneNumberUtilTest, IsNotPossibleNumber) { @@ -2414,9 +2411,9 @@ TEST_F(PhoneNumberUtilTest, NormaliseStr } TEST_F(PhoneNumberUtilTest, NormaliseStripNonDiallableCharacters) { - string input_number("03*4-56&+a#234"); + string input_number("03*4-56&+1a#234"); NormalizeDiallableCharsOnly(&input_number); - static const string kExpectedOutput("03*456+234"); + static const string kExpectedOutput("03*456+1#234"); EXPECT_EQ(kExpectedOutput, input_number) << "Conversion did not correctly remove non-diallable characters"; } @@ -2685,7 +2682,7 @@ TEST_F(PhoneNumberUtilTest, CountryWithN phone_util_.Format(ad_number, PhoneNumberUtil::NATIONAL, &formatted_number); EXPECT_EQ("12345", formatted_number); EXPECT_EQ(PhoneNumberUtil::UNKNOWN, phone_util_.GetNumberType(ad_number)); - EXPECT_TRUE(phone_util_.IsValidNumber(ad_number)); + EXPECT_FALSE(phone_util_.IsValidNumber(ad_number)); // Test dialing a US number from within Andorra. PhoneNumber us_number;
  40. Download patch codereview.settings

    --- 6.3~svn698-4/codereview.settings 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/codereview.settings 2015-07-14 15:21:09.000000000 +0000 @@ -1,4 +1,4 @@ # This file is used by gcl to get repository specific information. CODE_REVIEW_SERVER: codereview.appspot.com TRY_ON_UPLOAD: False -VIEW_VC: http://code.google.com/p/libphonenumber/source/detail?r= +VIEW_VC: https://github.com/googlei18n/libphonenumber/commit/
  41. Download patch cpp/src/phonenumbers/default_logger.cc

    --- 6.3~svn698-4/cpp/src/phonenumbers/default_logger.cc 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/default_logger.cc 2015-07-14 15:21:09.000000000 +0000 @@ -21,11 +21,10 @@ namespace i18n { namespace phonenumbers { -using std::cout; using std::string; void StdoutLogger::WriteMessage(const string& msg) { - cout << " " << msg; + std::cout << " " << msg; } void StdoutLogger::WriteLevel() { @@ -34,24 +33,24 @@ void StdoutLogger::WriteLevel() { verbosity_level = LOG_FATAL; } - cout << "["; + std::cout << "["; // Handle verbose logs first. if (verbosity_level > LOG_DEBUG) { - cout << "VLOG" << (verbosity_level - LOG_DEBUG); + std::cout << "VLOG" << (verbosity_level - LOG_DEBUG); } else { switch (verbosity_level) { - case LOG_FATAL: cout << "FATAL"; break; + case LOG_FATAL: std::cout << "FATAL"; break; #ifdef ERROR // In case ERROR is defined by MSVC (i.e not set to LOG_ERROR). case ERROR: #endif - case LOG_ERROR: cout << "ERROR"; break; - case LOG_WARNING: cout << "WARNING"; break; - case LOG_INFO: cout << "INFO"; break; - case LOG_DEBUG: cout << "DEBUG"; break; + case LOG_ERROR: std::cout << "ERROR"; break; + case LOG_WARNING: std::cout << "WARNING"; break; + case LOG_INFO: std::cout << "INFO"; break; + case LOG_DEBUG: std::cout << "DEBUG"; break; } } - cout << "]"; + std::cout << "]"; } } // namespace phonenumbers
  42. Download patch java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java

    --- 6.3~svn698-4/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java 2015-07-14 15:21:09.000000000 +0000 @@ -66,7 +66,7 @@ public class AsYouTypeFormatterTest exte } public void testTooLongNumberMatchingMultipleLeadingDigits() { - // See http://code.google.com/p/libphonenumber/issues/detail?id=36 + // See https://github.com/googlei18n/libphonenumber/issues/36 // The bug occurred last time for countries which have two formatting rules with exactly the // same leading digits pattern but differ in length. AsYouTypeFormatter formatter = phoneUtil.getAsYouTypeFormatter(RegionCode.ZZ); @@ -1164,7 +1164,7 @@ public class AsYouTypeFormatterTest exte // when we try again to extract a country code we should ensure we use the last leading digit // pattern, rather than the first one such that it *thinks* it's found a valid formatting rule // again. - // https://code.google.com/p/libphonenumber/issues/detail?id=437 + // https://github.com/googlei18n/libphonenumber/issues/437 assertEquals("+8698812", formatter.inputDigit('2')); assertEquals("+86988123", formatter.inputDigit('3')); assertEquals("+869881234", formatter.inputDigit('4'));
  43. Download patch debian/maven.rules

    --- 6.3~svn698-4/debian/maven.rules 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/maven.rules 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -# 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/ - -com.google.i18n.phonenumbers data-tools jar s/1\..*/1.x/ * * -com.google.i18n.phonenumbers libphonenumber-build-parent pom s/1\..*/1.x/ * * -com.google.i18n.phonenumbers tools pom s/1\..*/1.x/ * * -com.google.i18n.phonenumbers.tools common-build jar s/1\..*/1.x/ * * -com.google.i18n.phonenumbers.tools cpp-build jar s/1\..*/1.x/ * * -com.google.i18n.phonenumbers.tools java-build jar s/1\..*/1.x/ * * -com.googlecode.libphonenumber carrier jar s/1\..*/1.x/ * * -com.googlecode.libphonenumber geocoder jar s/2\..*/2.x/ * * -com.googlecode.libphonenumber libphonenumber-parent pom s/6\..*/6.x/ * * -com.googlecode.libphonenumber libphonenumber jar s/6\..*/6.x/ * * -com.googlecode.libphonenumber prefixmapper jar s/2\..*/2.x/ * * -junit junit jar s/4\..*/4.x/ * * -s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * *
  44. Download patch debian/libphonenumber6.install

    --- 6.3~svn698-4/debian/libphonenumber6.install 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/libphonenumber6.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/lib*.so.*
  45. Download patch debian/libphonenumber6-dev.install

    --- 6.3~svn698-4/debian/libphonenumber6-dev.install 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/libphonenumber6-dev.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/include/* -usr/lib/*/lib*.a -usr/lib/*/lib*.so
  46. Download patch cpp/test/phonenumbers/shortnumberutil_test.cc

    --- 6.3~svn698-4/cpp/test/phonenumbers/shortnumberutil_test.cc 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/test/phonenumbers/shortnumberutil_test.cc 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ -// Copyright (C) 2009 The Libphonenumber 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. - -// Author: David Yonge-Mallo - -#include <gtest/gtest.h> - -#include "phonenumbers/default_logger.h" -#include "phonenumbers/phonenumberutil.h" -#include "phonenumbers/shortnumberutil.h" -#include "phonenumbers/test_util.h" - -namespace i18n { -namespace phonenumbers { - -class ShortNumberUtilTest : public testing::Test { - protected: - ShortNumberUtilTest() : short_util_() { - PhoneNumberUtil::GetInstance()->SetLogger(new StdoutLogger()); - } - - const ShortNumberUtil short_util_; - - private: - DISALLOW_COPY_AND_ASSIGN(ShortNumberUtilTest); -}; - -TEST_F(ShortNumberUtilTest, ConnectsToEmergencyNumber_US) { - EXPECT_TRUE(short_util_.ConnectsToEmergencyNumber("911", RegionCode::US())); - EXPECT_TRUE(short_util_.ConnectsToEmergencyNumber("112", RegionCode::US())); - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber("999", RegionCode::US())); -} - -TEST_F(ShortNumberUtilTest, ConnectsToEmergencyNumberLongNumber_US) { - EXPECT_TRUE(short_util_.ConnectsToEmergencyNumber("9116666666", - RegionCode::US())); - EXPECT_TRUE(short_util_.ConnectsToEmergencyNumber("1126666666", - RegionCode::US())); - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber("9996666666", - RegionCode::US())); -} - -TEST_F(ShortNumberUtilTest, ConnectsToEmergencyNumberWithFormatting_US) { - EXPECT_TRUE(short_util_.ConnectsToEmergencyNumber("9-1-1", RegionCode::US())); - EXPECT_TRUE(short_util_.ConnectsToEmergencyNumber("1-1-2", RegionCode::US())); - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber("9-9-9", - RegionCode::US())); -} - -TEST_F(ShortNumberUtilTest, ConnectsToEmergencyNumberWithPlusSign_US) { - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber("+911", RegionCode::US())); - // This hex sequence is the full-width plus sign U+FF0B. - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber("\xEF\xBC\x8B" "911", - RegionCode::US())); - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber(" +911", - RegionCode::US())); - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber("+112", RegionCode::US())); - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber("+999", RegionCode::US())); -} - -TEST_F(ShortNumberUtilTest, ConnectsToEmergencyNumber_BR) { - EXPECT_TRUE(short_util_.ConnectsToEmergencyNumber("911", RegionCode::BR())); - EXPECT_TRUE(short_util_.ConnectsToEmergencyNumber("190", RegionCode::BR())); - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber("999", RegionCode::BR())); -} - -TEST_F(ShortNumberUtilTest, ConnectsToEmergencyNumberLongNumber_BR) { - // Brazilian emergency numbers don't work when additional digits are appended. - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber("9111", RegionCode::BR())); - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber("1900", RegionCode::BR())); - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber("9996", RegionCode::BR())); -} - -TEST_F(ShortNumberUtilTest, ConnectsToEmergencyNumber_AO) { - // Angola doesn't have any metadata for emergency numbers in the test - // metadata. - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber("911", RegionCode::AO())); - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber("222123456", - RegionCode::AO())); - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber("923123456", - RegionCode::AO())); -} - -TEST_F(ShortNumberUtilTest, ConnectsToEmergencyNumber_ZW) { - // Zimbabwe doesn't have any metadata in the test metadata. - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber("911", RegionCode::ZW())); - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber("01312345", - RegionCode::ZW())); - EXPECT_FALSE(short_util_.ConnectsToEmergencyNumber("0711234567", - RegionCode::ZW())); -} - -TEST_F(ShortNumberUtilTest, IsEmergencyNumber_US) { - EXPECT_TRUE(short_util_.IsEmergencyNumber("911", RegionCode::US())); - EXPECT_TRUE(short_util_.IsEmergencyNumber("112", RegionCode::US())); - EXPECT_FALSE(short_util_.IsEmergencyNumber("999", RegionCode::US())); -} - -TEST_F(ShortNumberUtilTest, IsEmergencyNumberLongNumber_US) { - EXPECT_FALSE(short_util_.IsEmergencyNumber("9116666666", RegionCode::US())); - EXPECT_FALSE(short_util_.IsEmergencyNumber("1126666666", RegionCode::US())); - EXPECT_FALSE(short_util_.IsEmergencyNumber("9996666666", RegionCode::US())); -} - -TEST_F(ShortNumberUtilTest, IsEmergencyNumberWithFormatting_US) { - EXPECT_TRUE(short_util_.IsEmergencyNumber("9-1-1", RegionCode::US())); - EXPECT_TRUE(short_util_.IsEmergencyNumber("*911", RegionCode::US())); - EXPECT_TRUE(short_util_.IsEmergencyNumber("1-1-2", RegionCode::US())); - EXPECT_TRUE(short_util_.IsEmergencyNumber("*112", RegionCode::US())); - EXPECT_FALSE(short_util_.IsEmergencyNumber("9-9-9", RegionCode::US())); - EXPECT_FALSE(short_util_.IsEmergencyNumber("*999", RegionCode::US())); -} - -TEST_F(ShortNumberUtilTest, IsEmergencyNumberWithPlusSign_US) { - EXPECT_FALSE(short_util_.IsEmergencyNumber("+911", RegionCode::US())); - // This hex sequence is the full-width plus sign U+FF0B. - EXPECT_FALSE(short_util_.IsEmergencyNumber("\xEF\xBC\x8B" "911", - RegionCode::US())); - EXPECT_FALSE(short_util_.IsEmergencyNumber(" +911", RegionCode::US())); - EXPECT_FALSE(short_util_.IsEmergencyNumber("+112", RegionCode::US())); - EXPECT_FALSE(short_util_.IsEmergencyNumber("+999", RegionCode::US())); -} - -TEST_F(ShortNumberUtilTest, IsEmergencyNumber_BR) { - EXPECT_TRUE(short_util_.IsEmergencyNumber("911", RegionCode::BR())); - EXPECT_TRUE(short_util_.IsEmergencyNumber("190", RegionCode::BR())); - EXPECT_FALSE(short_util_.IsEmergencyNumber("999", RegionCode::BR())); -} - -TEST_F(ShortNumberUtilTest, EmergencyNumberLongNumber_BR) { - EXPECT_FALSE(short_util_.IsEmergencyNumber("9111", RegionCode::BR())); - EXPECT_FALSE(short_util_.IsEmergencyNumber("1900", RegionCode::BR())); - EXPECT_FALSE(short_util_.IsEmergencyNumber("9996", RegionCode::BR())); -} - -TEST_F(ShortNumberUtilTest, IsEmergencyNumber_AO) { - // Angola doesn't have any metadata for emergency numbers in the test - // metadata. - EXPECT_FALSE(short_util_.IsEmergencyNumber("911", RegionCode::AO())); - EXPECT_FALSE(short_util_.IsEmergencyNumber("222123456", RegionCode::AO())); - EXPECT_FALSE(short_util_.IsEmergencyNumber("923123456", RegionCode::AO())); -} - -TEST_F(ShortNumberUtilTest, IsEmergencyNumber_ZW) { - // Zimbabwe doesn't have any metadata in the test metadata. - EXPECT_FALSE(short_util_.IsEmergencyNumber("911", RegionCode::ZW())); - EXPECT_FALSE(short_util_.IsEmergencyNumber("01312345", RegionCode::ZW())); - EXPECT_FALSE(short_util_.IsEmergencyNumber("0711234567", RegionCode::ZW())); -} - -} // namespace phonenumbers -} // namespace i18n
  47. Download patch java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java
  48. Download patch debian/libphonenumber7.symbols.armhf
  49. Download patch debian/libgeocoding7.symbols

    --- 6.3~svn698-4/debian/libgeocoding7.symbols 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/libgeocoding7.symbols 2015-07-21 13:36:42.000000000 +0000 @@ -0,0 +1,54 @@ +libgeocoding.so.7 libgeocoding7 #MINVER# + (c++)"i18n::phonenumbers::AreaCodeMap::ReadAreaCodeMap(i18n::phonenumbers::PrefixDescriptions const*)@Base" 7 + (c++)"i18n::phonenumbers::AreaCodeMap::AreaCodeMap()@Base" 7 + (c++)"i18n::phonenumbers::AreaCodeMap::AreaCodeMap()@Base" 7 + (c++)"i18n::phonenumbers::AreaCodeMap::~AreaCodeMap()@Base" 7 + (c++)"i18n::phonenumbers::AreaCodeMap::~AreaCodeMap()@Base" 7 + (c++)"i18n::phonenumbers::DefaultMapStorage::ReadFromMap(i18n::phonenumbers::PrefixDescriptions const*)@Base" 7 + (c++)"i18n::phonenumbers::DefaultMapStorage::DefaultMapStorage()@Base" 7 + (c++)"i18n::phonenumbers::DefaultMapStorage::DefaultMapStorage()@Base" 7 + (c++)"i18n::phonenumbers::DefaultMapStorage::~DefaultMapStorage()@Base" 7 + (c++)"i18n::phonenumbers::DefaultMapStorage::~DefaultMapStorage()@Base" 7 + (c++)"i18n::phonenumbers::DefaultMapStorage::~DefaultMapStorage()@Base" 7 + (c++)"i18n::phonenumbers::MappingFileProvider::MappingFileProvider(int const*, int, i18n::phonenumbers::CountryLanguages const* (*)(int))@Base" 7 + (c++)"i18n::phonenumbers::MappingFileProvider::MappingFileProvider(int const*, int, i18n::phonenumbers::CountryLanguages const* (*)(int))@Base" 7 + (c++)"i18n::phonenumbers::get_country_languages(int)@Base" 7 + (c++)"i18n::phonenumbers::get_prefix_descriptions(int)@Base" 7 + (c++)"i18n::phonenumbers::get_country_calling_codes()@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::Init(int const*, int, i18n::phonenumbers::CountryLanguages const* (*)(int), char const**, int, i18n::phonenumbers::PrefixDescriptions const* (*)(int))@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::PhoneNumberOfflineGeocoder(int const*, int, i18n::phonenumbers::CountryLanguages const* (*)(int), char const**, int, i18n::phonenumbers::PrefixDescriptions const* (*)(int))@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::PhoneNumberOfflineGeocoder()@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::PhoneNumberOfflineGeocoder(int const*, int, i18n::phonenumbers::CountryLanguages const* (*)(int), char const**, int, i18n::phonenumbers::PrefixDescriptions const* (*)(int))@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::PhoneNumberOfflineGeocoder()@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::~PhoneNumberOfflineGeocoder()@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::~PhoneNumberOfflineGeocoder()@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::~PhoneNumberOfflineGeocoder()@Base" 7 + (c++)"i18n::phonenumbers::get_country_calling_codes_size()@Base" 7 + (c++)"i18n::phonenumbers::get_prefix_language_code_pairs()@Base" 7 + (c++)"i18n::phonenumbers::get_prefix_language_code_pairs_size()@Base" 7 + (c++|arch=amd64 arm64 mips64 mips64el ppc64 ppc64el sparc64 s390x)"i18n::phonenumbers::AreaCodeMap::BinarySearch(int, int, long) const@Base" 7 + (c++|arch=!amd64 !arm64 !mips64 !mips64el !ppc64 !ppc64el !sparc64 !s390x)"i18n::phonenumbers::AreaCodeMap::BinarySearch(int, int, long long) const@Base" 7 + (c++)"i18n::phonenumbers::AreaCodeMap::Lookup(i18n::phonenumbers::PhoneNumber const&) const@Base" 7 + (c++)"i18n::phonenumbers::DefaultMapStorage::GetDescription(int) const@Base" 7 + (c++)"i18n::phonenumbers::DefaultMapStorage::GetNumOfEntries() const@Base" 7 + (c++)"i18n::phonenumbers::DefaultMapStorage::GetPossibleLengths() const@Base" 7 + (c++)"i18n::phonenumbers::DefaultMapStorage::GetPossibleLengthsSize() const@Base" 7 + (c++)"i18n::phonenumbers::DefaultMapStorage::GetPrefix(int) const@Base" 7 + (c++)"i18n::phonenumbers::MappingFileProvider::GetFileName(int, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >*) const@Base" 7 + (c++)"i18n::phonenumbers::MappingFileProvider::FindBestMatchingLanguageCode(i18n::phonenumbers::CountryLanguages const*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >*) const@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::GetAreaDescription(i18n::phonenumbers::PhoneNumber const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::GetRegionDisplayName(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const*, icu_55::Locale const&) const@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::MayFallBackToEnglish(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::GetCountryNameForNumber[abi:cxx11](i18n::phonenumbers::PhoneNumber const&, icu_55::Locale const&) const@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::GetDescriptionForNumber[abi:cxx11](i18n::phonenumbers::PhoneNumber const&, icu_55::Locale const&) const@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::GetDescriptionForNumber(i18n::phonenumbers::PhoneNumber const&, icu_55::Locale const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::LoadAreaCodeMapFromFile(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::GetPhonePrefixDescriptions(int, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::GetDescriptionForValidNumber[abi:cxx11](i18n::phonenumbers::PhoneNumber const&, icu_55::Locale const&) const@Base" 7 + (c++)"i18n::phonenumbers::PhoneNumberOfflineGeocoder::GetDescriptionForValidNumber(i18n::phonenumbers::PhoneNumber const&, icu_55::Locale const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 7 + (c++)"typeinfo for i18n::phonenumbers::DefaultMapStorage@Base" 7 + (c++)"typeinfo for i18n::phonenumbers::PhoneNumberOfflineGeocoder@Base" 7 + (c++)"typeinfo name for i18n::phonenumbers::DefaultMapStorage@Base" 7 + (c++)"typeinfo name for i18n::phonenumbers::PhoneNumberOfflineGeocoder@Base" 7 + (c++)"vtable for i18n::phonenumbers::DefaultMapStorage@Base" 7 + (c++)"vtable for i18n::phonenumbers::PhoneNumberOfflineGeocoder@Base" 7
  50. Download patch java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java

    --- 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java 2015-07-14 15:21:09.000000000 +0000 @@ -58,6 +58,7 @@ import java.util.regex.Pattern; public class PhoneNumberUtil { // @VisibleForTesting static final MetadataLoader DEFAULT_METADATA_LOADER = new MetadataLoader() { + @Override public InputStream loadMetadata(String metadataFileName) { return PhoneNumberUtil.class.getResourceAsStream(metadataFileName); } @@ -487,6 +488,7 @@ public class PhoneNumberUtil { } return PhoneNumberMatcher.checkNumberGroupingIsValid( number, candidate, util, new PhoneNumberMatcher.NumberGroupingChecker() { + @Override public boolean checkGroups(PhoneNumberUtil util, PhoneNumber number, StringBuilder normalizedCandidate, String[] expectedNumberGroups) { @@ -518,6 +520,7 @@ public class PhoneNumberUtil { } return PhoneNumberMatcher.checkNumberGroupingIsValid( number, candidate, util, new PhoneNumberMatcher.NumberGroupingChecker() { + @Override public boolean checkGroups(PhoneNumberUtil util, PhoneNumber number, StringBuilder normalizedCandidate, String[] expectedNumberGroups) { @@ -661,10 +664,9 @@ public class PhoneNumberUtil { source.close(); } catch (IOException e) { logger.log(Level.WARNING, "error closing input stream (ignored)", e); - } finally { - return metadataCollection; } } + return metadataCollection; } /** @@ -809,7 +811,7 @@ public class PhoneNumberUtil { * works in such a way that the resultant subscriber number should be diallable, at least on some * devices. An example of how this could be used: * - * <pre> + * <pre>{@code * PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance(); * PhoneNumber number = phoneUtil.parse("16502530000", "US"); * String nationalSignificantNumber = phoneUtil.getNationalSignificantNumber(number); @@ -824,7 +826,7 @@ public class PhoneNumberUtil { * areaCode = ""; * subscriberNumber = nationalSignificantNumber; * } - * </pre> + * }</pre> * * N.B.: area code is a very ambiguous concept, so the I18N team generally recommends against * using it for most purposes, but recommends using the more general {@code national_number} @@ -869,7 +871,7 @@ public class PhoneNumberUtil { * number is formatted in the international format, if there is a subscriber number part that * follows. An example of how this could be used: * - * <pre> + * <pre>{@code * PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance(); * PhoneNumber number = phoneUtil.parse("18002530000", "US"); * String nationalSignificantNumber = phoneUtil.getNationalSignificantNumber(number); @@ -885,7 +887,7 @@ public class PhoneNumberUtil { * nationalDestinationCode = ""; * subscriberNumber = nationalSignificantNumber; * } - * </pre> + * }</pre> * * Refer to the unittests to see the difference between this function and * {@link #getLengthOfGeographicalAreaCode}. @@ -1981,9 +1983,7 @@ public class PhoneNumberUtil { } private PhoneNumberType getNumberTypeHelper(String nationalNumber, PhoneMetadata metadata) { - PhoneNumberDesc generalNumberDesc = metadata.getGeneralDesc(); - if (!generalNumberDesc.hasNationalNumberPattern() || - !isNumberMatchingDesc(nationalNumber, generalNumberDesc)) { + if (!isNumberMatchingDesc(nationalNumber, metadata.getGeneralDesc())) { return PhoneNumberType.UNKNOWN; } @@ -2114,16 +2114,7 @@ public class PhoneNumberUtil { // match that of the region code. return false; } - PhoneNumberDesc generalNumDesc = metadata.getGeneralDesc(); String nationalSignificantNumber = getNationalSignificantNumber(number); - - // For regions where we don't have metadata for PhoneNumberDesc, we treat any number passed in - // as a valid number if its national significant number is between the minimum and maximum - // lengths defined by ITU for a national significant number. - if (!generalNumDesc.hasNationalNumberPattern()) { - int numberLength = nationalSignificantNumber.length(); - return numberLength > MIN_LENGTH_FOR_NSN && numberLength <= MAX_LENGTH_FOR_NSN; - } return getNumberTypeHelper(nationalSignificantNumber, metadata) != PhoneNumberType.UNKNOWN; } @@ -2140,7 +2131,7 @@ public class PhoneNumberUtil { List<String> regions = countryCallingCodeToRegionCodeMap.get(countryCode); if (regions == null) { String numberString = getNationalSignificantNumber(number); - logger.log(Level.WARNING, + logger.log(Level.INFO, "Missing/invalid country_code (" + countryCode + ") for number " + numberString); return null; } @@ -2381,21 +2372,8 @@ public class PhoneNumberUtil { String regionCode = getRegionCodeForCountryCode(countryCode); // Metadata cannot be null because the country calling code is valid. PhoneMetadata metadata = getMetadataForRegionOrCallingCode(countryCode, regionCode); - PhoneNumberDesc generalNumDesc = metadata.getGeneralDesc(); - // Handling case of numbers with no metadata. - if (!generalNumDesc.hasNationalNumberPattern()) { - logger.log(Level.FINER, "Checking if number is possible with incomplete metadata."); - int numberLength = nationalNumber.length(); - if (numberLength < MIN_LENGTH_FOR_NSN) { - return ValidationResult.TOO_SHORT; - } else if (numberLength > MAX_LENGTH_FOR_NSN) { - return ValidationResult.TOO_LONG; - } else { - return ValidationResult.IS_POSSIBLE; - } - } Pattern possibleNumberPattern = - regexCache.getPatternForRegex(generalNumDesc.getPossibleNumberPattern()); + regexCache.getPatternForRegex(metadata.getGeneralDesc().getPossibleNumberPattern()); return testNumberLengthAgainstPattern(possibleNumberPattern, nationalNumber); } @@ -2854,6 +2832,7 @@ public class PhoneNumberUtil { final long maxTries) { return new Iterable<PhoneNumberMatch>() { + @Override public Iterator<PhoneNumberMatch> iterator() { return new PhoneNumberMatcher( PhoneNumberUtil.this, text, defaultRegion, leniency, maxTries);
  51. Download patch java/internal/prefixmapper/src/com/google/i18n/phonenumbers/prefixmapper/PrefixTimeZonesMap.java

    --- 6.3~svn698-4/java/internal/prefixmapper/src/com/google/i18n/phonenumbers/prefixmapper/PrefixTimeZonesMap.java 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/internal/prefixmapper/src/com/google/i18n/phonenumbers/prefixmapper/PrefixTimeZonesMap.java 2015-07-14 15:21:09.000000000 +0000 @@ -37,7 +37,7 @@ public class PrefixTimeZonesMap implemen private static final String RAW_STRING_TIMEZONES_SEPARATOR = "&"; /** - * Creates a {@link PrefixTimeZoneMap} initialized with {@code sortedPrefixTimeZoneMap}. Note + * Creates a {@link PrefixTimeZonesMap} initialized with {@code sortedPrefixTimeZoneMap}. Note * that the underlying implementation of this method is expensive thus should not be called by * time-critical applications. * Binary files 6.3~svn698-4/java/lib/junit-4.8.1.jar and 7.0.8-0ubuntu3/java/lib/junit-4.8.1.jar differ
  52. Download patch cpp/src/phonenumbers/utf/utf.h

    --- 6.3~svn698-4/cpp/src/phonenumbers/utf/utf.h 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/utf/utf.h 2015-07-14 15:21:09.000000000 +0000 @@ -1,27 +1,22 @@ /* * The authors of this software are Rob Pike and Ken Thompson. - * Copyright (c) 1998-2002 by Lucent Technologies. - * Portions Copyright (c) 2009 The Go Authors. All rights reserved. + * Copyright (c) 1998-2002 by Lucent Technologies. + * Portions Copyright (c) 2009 The Go Authors. All rights reserved. * Permission to use, copy, modify, and distribute this software for any * purpose without fee is hereby granted, provided that this entire notice * is included in all copies of any software which is or includes a copy * or modification of this software and in all copies of the supporting * documentation for such software. * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED - * WARRANTY. IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE ANY + * WARRANTY. IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE ANY * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE. - */ + */ #ifndef _UTFH_ #define _UTFH_ 1 -// stdint.h content doesn't seem to be used in this file and doesn't exist on -// Windows, therefore we comment it out here so that the code could be compiled -// on Windows. -//#include <stdint.h> - -typedef signed int Rune; /* Code-point values in Unicode 4.0 are 21 bits wide.*/ +typedef unsigned int Rune; /* Code-point values in Unicode 4.0 are 21 bits wide.*/ enum { @@ -71,7 +66,7 @@ int chartorune(Rune* r, const char* s); // n bytes of s. If the UTF sequence is incomplete within n bytes, // charntorune will set *r to Runeerror and return 0. If it is complete // but not in UTF format, it will set *r to Runeerror and return 1. -// +// // Added 2004-09-24 by Wei-Hwa Huang int charntorune(Rune* r, const char* s, int n); @@ -126,7 +121,7 @@ int utfnlen(const char* s, long n); // byte terminating a string is considered to be part of the string s. // (cf. strchr) -const char* utfrune(const char* s, Rune r); +/*const*/ char* utfrune(const char* s, Rune r); // utfrrune returns a pointer to the last occurrence of rune r in the @@ -134,7 +129,7 @@ const char* utfrune(const char* s, Rune // byte terminating a string is considered to be part of the string s. // (cf. strrchr) -const char* utfrrune(const char* s, Rune r); +/*const*/ char* utfrrune(const char* s, Rune r); // utfutf returns a pointer to the first occurrence of the UTF string @@ -155,7 +150,7 @@ char* utfecpy(char *s1, char *es1, const // These functions are rune-string analogues of the corresponding // functions in strcat (3). -// +// // These routines first appeared in Plan 9. // SEE ALSO // memmove (3) @@ -208,8 +203,8 @@ Rune totitlerune(Rune r); // isupperrune tests for upper case characters, including Unicode // upper case letters and targets of the toupper mapping. islowerrune -// and istitlerune are defined analogously. - +// and istitlerune are defined analogously. + int isupperrune(Rune r); int islowerrune(Rune r); int istitlerune(Rune r); @@ -227,12 +222,6 @@ int isalpharune(Rune r); int isdigitrune(Rune r); -// isideographicrune tests for ideographic characters and numbers, as -// defined by the Unicode standard. - -int isideographicrune(Rune r); - - // isspacerune tests for whitespace characters, including "C" locale // whitespace, Unicode defined whitespace, and the "zero-width // non-break space" character.
  53. Download patch cpp/src/phonenumbers/matcher_api.h

    --- 6.3~svn698-4/cpp/src/phonenumbers/matcher_api.h 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/matcher_api.h 2015-07-14 15:21:09.000000000 +0000 @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2014 The Libphonenumber 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. + */ + +#ifndef I18N_PHONENUMBERS_MATCHER_API_H_ +#define I18N_PHONENUMBERS_MATCHER_API_H_ + +#include <string> + +namespace i18n { +namespace phonenumbers { + +using std::string; + +class PhoneNumberDesc; + +// Internal phonenumber matching API used to isolate the underlying +// implementation of the matcher and allow different implementations to be +// swapped in easily. +class MatcherApi { + public: + virtual ~MatcherApi() {} + + // Returns whether the given national number (a string containing only decimal + // digits) matches the national number pattern defined in the given + // PhoneNumberDesc message. + virtual bool MatchesNationalNumber(const string& national_number, + const PhoneNumberDesc& number_desc, + bool allow_prefix_match) const = 0; + + // Returns whether the given national number (a string containing only decimal + // digits) matches the possible number pattern defined in the given + // PhoneNumberDesc message. + virtual bool MatchesPossibleNumber( + const string& national_number, + const PhoneNumberDesc& number_desc) const = 0; +}; + +} // namespace phonenumbers +} // namespace i18n + +#endif // I18N_PHONENUMBERS_MATCHER_API_H_
  54. Download patch java/demo/war/phonenumberparser.jsp

    --- 6.3~svn698-4/java/demo/war/phonenumberparser.jsp 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/demo/war/phonenumberparser.jsp 2015-07-14 15:21:09.000000000 +0000 @@ -33,7 +33,7 @@ <input type="submit" value="Submit"> <input type="reset" value="Reset"> <p></p> - <a href="http://code.google.com/p/libphonenumber/">Back to libphonenumber</a> + <a href="https://github.com/googlei18n/libphonenumber/">Back to libphonenumber</a> </form> </body> </html>
  55. Download patch debian/libphonenumber7.symbols.i386
  56. Download patch debian/libphonenumber7.symbols.amd64
  57. Download patch cpp/src/phonenumbers/shortnumberutil.cc

    --- 6.3~svn698-4/cpp/src/phonenumbers/shortnumberutil.cc 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/shortnumberutil.cc 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -// Copyright (C) 2012 The Libphonenumber 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. - -// Author: David Yonge-Mallo - -#include "phonenumbers/shortnumberutil.h" - -#include "phonenumbers/shortnumberinfo.h" - -namespace i18n { -namespace phonenumbers { - -using std::string; - -ShortNumberUtil::ShortNumberUtil() { -} - -bool ShortNumberUtil::ConnectsToEmergencyNumber(const string& number, - const string& region_code) const { - ShortNumberInfo short_info; - return short_info.ConnectsToEmergencyNumber(number, region_code); -} - -bool ShortNumberUtil::IsEmergencyNumber(const string& number, - const string& region_code) const { - ShortNumberInfo short_info; - return short_info.IsEmergencyNumber(number, region_code); -} - -} // namespace phonenumbers -} // namespace i18n
  58. Download patch cpp/src/phonenumbers/short_metadata.cc
  59. Download patch java/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java

    --- 6.3~svn698-4/java/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java 2015-07-14 15:21:09.000000000 +0000 @@ -38,9 +38,11 @@ public class CountryCodeToRegionCodeMapF ArrayList<String> listWithRegionCode; - listWithRegionCode = new ArrayList<String>(2); + listWithRegionCode = new ArrayList<String>(4); listWithRegionCode.add("US"); + listWithRegionCode.add("BB"); listWithRegionCode.add("BS"); + listWithRegionCode.add("CA"); countryCodeToRegionCodeMap.put(1, listWithRegionCode); listWithRegionCode = new ArrayList<String>(1); Binary files 6.3~svn698-4/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB and 7.0.8-0ubuntu3/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB differ Binary files 6.3~svn698-4/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA and 7.0.8-0ubuntu3/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA differ Binary files 6.3~svn698-4/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX and 7.0.8-0ubuntu3/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX differ Binary files 6.3~svn698-4/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR and 7.0.8-0ubuntu3/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR differ
  60. Download patch java/demo/war/WEB-INF/appengine-web.xml

    --- 6.3~svn698-4/java/demo/war/WEB-INF/appengine-web.xml 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/demo/war/WEB-INF/appengine-web.xml 2015-07-14 15:21:09.000000000 +0000 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <appengine-web-app xmlns="http://appengine.google.com/ns/1.0"> - <application>libphonenumber</application> + <application>libphonenumber-hrd</application> <version>1</version> <threadsafe>true</threadsafe> Binary files 6.3~svn698-4/java/demo/war/WEB-INF/lib/commons-fileupload-1.2.1.jar and 7.0.8-0ubuntu3/java/demo/war/WEB-INF/lib/commons-fileupload-1.2.1.jar differ Binary files 6.3~svn698-4/java/demo/war/WEB-INF/lib/commons-io-1.4.jar and 7.0.8-0ubuntu3/java/demo/war/WEB-INF/lib/commons-io-1.4.jar differ
  61. Download patch java/demo/pom.xml

    --- 6.3~svn698-4/java/demo/pom.xml 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/demo/pom.xml 2015-07-14 15:21:09.000000000 +0000 @@ -4,11 +4,11 @@ <parent> <artifactId>libphonenumber-parent</artifactId> <groupId>com.googlecode.libphonenumber</groupId> - <version>6.2.3-SNAPSHOT</version> + <version>7.0.8</version> </parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>demo</artifactId> - <version>6.2.3-SNAPSHOT</version> + <version>7.0.8</version> <properties> <gae.version>1.5.4</gae.version> @@ -43,17 +43,17 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>6.2.3-SNAPSHOT</version> + <version>7.0.8</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>geocoder</artifactId> - <version>2.15-SNAPSHOT</version> + <version>2.24</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>carrier</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.14</version> </dependency> </dependencies>
  62. Download patch debian/watch

    --- 6.3~svn698-4/debian/watch 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -version=3 -https://github.com/libphonenumber/libphonenumber/tags \ - .*/archive/libphonenumber-(\d[\d\.]+)\.tar\.gz
  63. Download patch debian/patches/series

    --- 6.3~svn698-4/debian/patches/series 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/patches/series 2015-11-06 16:25:11.000000000 +0000 @@ -1,4 +1,3 @@ -0003-maven-exclude-demo.patch -0006-main-lib-jdk5.patch -0008-tools-jdk5.patch -0009-maven-tests-forkmode.patch +boost_build_fix.patch +cpp_symbols_map.patch +hash_as_diallable_char.patch
  64. Download patch debian/patches/0008-tools-jdk5.patch

    --- 6.3~svn698-4/debian/patches/0008-tools-jdk5.patch 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/patches/0008-tools-jdk5.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,168 +0,0 @@ -diff --git a/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java b/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java -index d36273f..f49aca7 100644 ---- a/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java -+++ b/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java -@@ -137,7 +137,7 @@ public class BuildMetadataFromXml { - } else { - // For most countries, there will be only one region code for the country calling code. - List<String> listWithRegionCode = new ArrayList<String>(1); -- if (!regionCode.isEmpty()) { // For alternate formats, there are no region codes at all. -+ if (regionCode.length() != 0) { // For alternate formats, there are no region codes at all. - listWithRegionCode.add(regionCode); - } - countryCodeToRegionCodeMap.put(countryCode, listWithRegionCode); -@@ -202,7 +202,7 @@ public class BuildMetadataFromXml { - validateRE(element.getAttribute(NATIONAL_PREFIX_TRANSFORM_RULE))); - } - } -- if (!nationalPrefix.isEmpty()) { -+ if (nationalPrefix.length() != 0) { - metadata.setNationalPrefix(nationalPrefix); - if (!metadata.hasNationalPrefixForParsing()) { - metadata.setNationalPrefixForParsing(nationalPrefix); -diff --git a/tools/java/cpp-build/test/com/google/i18n/phonenumbers/BuildMetadataCppFromXmlTest.java b/tools/java/cpp-build/test/com/google/i18n/phonenumbers/BuildMetadataCppFromXmlTest.java -index b1976e8..3d3a161 100644 ---- a/tools/java/cpp-build/test/com/google/i18n/phonenumbers/BuildMetadataCppFromXmlTest.java -+++ b/tools/java/cpp-build/test/com/google/i18n/phonenumbers/BuildMetadataCppFromXmlTest.java -@@ -30,6 +30,7 @@ import org.junit.Test; - import java.io.ByteArrayOutputStream; - import java.io.File; - import java.io.OutputStream; -+import java.io.UnsupportedEncodingException; - import java.nio.charset.Charset; - - /** -@@ -78,7 +79,7 @@ public class BuildMetadataCppFromXmlTest { - } - - @Test -- public void generateMetadata() { -+ public void generateMetadata() throws UnsupportedEncodingException { - String[] args = new String[] { - IGNORED, INPUT_PATH_XML, OUTPUT_DIR, "metadata" }; - // Most of the useful asserts are done in the mock class. -@@ -97,7 +98,7 @@ public class BuildMetadataCppFromXmlTest { - } - - @Test -- public void generateLiteMetadata() { -+ public void generateLiteMetadata() throws UnsupportedEncodingException { - String[] args = new String[] { - IGNORED, INPUT_PATH_XML, OUTPUT_DIR, "lite_metadata" }; - // Most of the useful asserts are done in the mock class. -@@ -116,7 +117,7 @@ public class BuildMetadataCppFromXmlTest { - } - - @Test -- public void generateAlternateFormat() { -+ public void generateAlternateFormat() throws UnsupportedEncodingException { - String[] args = new String[] { - IGNORED, INPUT_PATH_XML, OUTPUT_DIR, "alternate_format" }; - // Most of the useful asserts are done in the mock class. -@@ -175,11 +176,11 @@ public class BuildMetadataCppFromXmlTest { - assertEquals(expectedVariant, variant); - return sourceOut; - } -- String capturedHeaderFile() { -- return new String(headerOut.toByteArray(), UTF_8); -+ String capturedHeaderFile() throws UnsupportedEncodingException { -+ return new String(headerOut.toByteArray(), "UTF-8"); - } -- String capturedSourceFile() { -- return new String(sourceOut.toByteArray(), UTF_8); -+ String capturedSourceFile() throws UnsupportedEncodingException { -+ return new String(sourceOut.toByteArray(), "UTF-8"); - } - } - } -diff --git a/tools/java/data/pom.xml b/tools/java/data/pom.xml -index 626aea9..0fb2b66 100644 ---- a/tools/java/data/pom.xml -+++ b/tools/java/data/pom.xml -@@ -48,8 +48,8 @@ - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> -- <source>1.6</source> -- <target>1.6</target> -+ <source>1.5</source> -+ <target>1.5</target> - </configuration> - </plugin> - <plugin> -diff --git a/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java -index 57980fa..3d2fe14 100644 ---- a/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java -+++ b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java -@@ -151,7 +151,7 @@ public class BuildMetadataProtoFromXml extends Command { - String regionCode = metadata.getId(); - // For non-geographical country calling codes (e.g. +800), or for alternate formats, use the - // country calling codes instead of the region code to form the file name. -- if (regionCode.equals("001") || regionCode.isEmpty()) { -+ if (regionCode.equals("001") || regionCode.length() == 0) { - regionCode = Integer.toString(metadata.getCountryCode()); - } - PhoneMetadataCollection outMetadataCollection = new PhoneMetadataCollection(); -@@ -196,7 +196,7 @@ public class BuildMetadataProtoFromXml extends Command { - // calling codes listed in it. - boolean hasRegionCodes = false; - for (List<String> listWithRegionCode : countryCodeToRegionCodeMap.values()) { -- if (!listWithRegionCode.isEmpty()) { -+ if (listWithRegionCode.size() > 0) { - hasRegionCodes = true; - break; - } -diff --git a/tools/java/java-build/src/com/google/i18n/phonenumbers/buildtools/GeneratePhonePrefixData.java b/tools/java/java-build/src/com/google/i18n/phonenumbers/buildtools/GeneratePhonePrefixData.java -index 419f69d..65985c7 100644 ---- a/tools/java/java-build/src/com/google/i18n/phonenumbers/buildtools/GeneratePhonePrefixData.java -+++ b/tools/java/java-build/src/com/google/i18n/phonenumbers/buildtools/GeneratePhonePrefixData.java -@@ -145,7 +145,6 @@ public class GeneratePhonePrefixData { - throws IOException { - final SortedMap<Integer, String> phonePrefixMap = new TreeMap<Integer, String>(); - parseTextFile(input, new PhonePrefixMappingHandler() { -- @Override - public void process(int prefix, String location) { - if (phonePrefixMap.put(prefix, location) != null) { - throw new RuntimeException(String.format("duplicated prefix %d", prefix)); -@@ -194,7 +193,6 @@ public class GeneratePhonePrefixData { - final Set<Integer> phonePrefixes = new HashSet<Integer>(); - FileInputStream inputStream = new FileInputStream(countryCodeFile); - parseTextFile(inputStream, new PhonePrefixMappingHandler() { -- @Override - public void process(int prefix, String location) { - phonePrefixes.add(Integer.parseInt(String.valueOf(prefix).substring(0, 4))); - } -@@ -414,7 +412,7 @@ public class GeneratePhonePrefixData { - Iterator<Map.Entry<Integer, String>> it = map.entrySet().iterator(); - while (it.hasNext()) { - Map.Entry<Integer, String> mapping = it.next(); -- if (mapping.getValue().isEmpty()) { -+ if (mapping.getValue().length() == 0) { - it.remove(); - } - } -diff --git a/tools/java/java-build/src/com/google/i18n/phonenumbers/buildtools/GenerateTimeZonesMapData.java b/tools/java/java-build/src/com/google/i18n/phonenumbers/buildtools/GenerateTimeZonesMapData.java -index b07a187..710badc 100644 ---- a/tools/java/java-build/src/com/google/i18n/phonenumbers/buildtools/GenerateTimeZonesMapData.java -+++ b/tools/java/java-build/src/com/google/i18n/phonenumbers/buildtools/GenerateTimeZonesMapData.java -@@ -82,7 +82,7 @@ public class GenerateTimeZonesMapData { - } - Integer prefix = Integer.parseInt(line.substring(0, indexOfPipe)); - String timezones = line.substring(indexOfPipe + 1); -- if (timezones.isEmpty()) { -+ if (timezones.length() == 0) { - throw new RuntimeException(String.format("line %d: missing time zones", lineNumber)); - } - if (timeZoneMap.put(prefix, timezones) != null) { -diff --git a/tools/java/java-build/test/com/google/i18n/phonenumbers/buildtools/GeneratePhonePrefixDataTest.java b/tools/java/java-build/test/com/google/i18n/phonenumbers/buildtools/GeneratePhonePrefixDataTest.java -index 828707a..ef6879a 100644 ---- a/tools/java/java-build/test/com/google/i18n/phonenumbers/buildtools/GeneratePhonePrefixDataTest.java -+++ b/tools/java/java-build/test/com/google/i18n/phonenumbers/buildtools/GeneratePhonePrefixDataTest.java -@@ -93,7 +93,6 @@ public class GeneratePhonePrefixDataTest extends TestCase { - final Map<Integer, String> mappings = new HashMap<Integer, String>(); - GeneratePhonePrefixData.parseTextFile(new ByteArrayInputStream(input.getBytes()), - new PhonePrefixMappingHandler() { -- @Override - public void process(int phonePrefix, String location) { - mappings.put(phonePrefix, location); - }
  65. Download patch debian/libphonenumber-dev.install

    --- 6.3~svn698-4/debian/libphonenumber-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/libphonenumber-dev.install 2015-07-21 13:07:20.000000000 +0000 @@ -0,0 +1,3 @@ +usr/include/* +usr/lib/*/libp*.a +usr/lib/*/libp*.so
  66. Download patch debian/patches/hash_as_diallable_char.patch

    --- 6.3~svn698-4/debian/patches/hash_as_diallable_char.patch 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/patches/hash_as_diallable_char.patch 2015-11-06 16:26:15.000000000 +0000 @@ -0,0 +1,28 @@ +Index: libphonenumber-7.0.8/cpp/src/phonenumbers/phonenumberutil.cc +=================================================================== +--- libphonenumber-7.0.8.orig/cpp/src/phonenumbers/phonenumberutil.cc ++++ libphonenumber-7.0.8/cpp/src/phonenumbers/phonenumberutil.cc +@@ -288,6 +288,7 @@ class PhoneNumberRegExpsAndMappings { + void InitializeMapsAndSets() { + diallable_char_mappings_.insert(std::make_pair('+', '+')); + diallable_char_mappings_.insert(std::make_pair('*', '*')); ++ diallable_char_mappings_.insert(std::make_pair('#', '#')); + // Here we insert all punctuation symbols that we wish to respect when + // formatting alpha numbers, as they show the intended number groupings. + all_plus_number_grouping_symbols_.insert( +Index: libphonenumber-7.0.8/cpp/test/phonenumbers/phonenumberutil_test.cc +=================================================================== +--- libphonenumber-7.0.8.orig/cpp/test/phonenumbers/phonenumberutil_test.cc ++++ libphonenumber-7.0.8/cpp/test/phonenumbers/phonenumberutil_test.cc +@@ -2411,9 +2411,9 @@ TEST_F(PhoneNumberUtilTest, NormaliseStr + } + + TEST_F(PhoneNumberUtilTest, NormaliseStripNonDiallableCharacters) { +- string input_number("03*4-56&+a#234"); ++ string input_number("03*4-56&+1a#234"); + NormalizeDiallableCharsOnly(&input_number); +- static const string kExpectedOutput("03*456+234"); ++ static const string kExpectedOutput("03*456+1#234"); + EXPECT_EQ(kExpectedOutput, input_number) + << "Conversion did not correctly remove non-diallable characters"; + }
  67. Download patch debian/libphonenumber6-java.jlibs

    --- 6.3~svn698-4/debian/libphonenumber6-java.jlibs 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/libphonenumber6-java.jlibs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -java/build/jar/libphonenumber.jar
  68. Download patch cpp/src/phonenumbers/utf/unilib.cc

    --- 6.3~svn698-4/cpp/src/phonenumbers/utf/unilib.cc 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/utf/unilib.cc 2015-07-14 15:21:09.000000000 +0000 @@ -46,15 +46,15 @@ inline bool IsInterchangeValidCodepoint( } // namespace int SpanInterchangeValid(const char* begin, int byte_length) { - char32 rune; + Rune rune; const char* p = begin; const char* end = begin + byte_length; while (p < end) { int bytes_consumed = charntorune(&rune, p, end - p); // We want to accept Runeerror == U+FFFD as a valid char, but it is used // by chartorune to indicate error. Luckily, the real codepoint is size 3 - // while errors return bytes_consumed == 1. - if ((rune == Runeerror && bytes_consumed == 1) || + // while errors return bytes_consumed <= 1. + if ((rune == Runeerror && bytes_consumed <= 1) || !IsInterchangeValidCodepoint(rune)) { break; // Found }
  69. Download patch java/internal/prefixmapper/pom.xml

    --- 6.3~svn698-4/java/internal/prefixmapper/pom.xml 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/internal/prefixmapper/pom.xml 2015-07-14 15:21:09.000000000 +0000 @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.15-SNAPSHOT</version> + <version>2.24</version> <packaging>jar</packaging> - <url>http://code.google.com/p/libphonenumber/</url> + <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>6.2.3-SNAPSHOT</version> + <version>7.0.8</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -29,7 +29,7 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>6.2.3-SNAPSHOT</version> + <version>7.0.8</version> </dependency> </dependencies>
  70. Download patch debian/maven.cleanIgnoreRules

    --- 6.3~svn698-4/debian/maven.cleanIgnoreRules 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/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/ -
  71. Download patch debian/maven.properties

    --- 6.3~svn698-4/debian/maven.properties 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/maven.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -# Include here properties to pass to Maven during the build. -# For example: -#maven.test.skip=true -
  72. Download patch cpp/src/phonenumbers/phonenumberutil.cc
  73. Download patch cpp/src/phonenumbers/phonenumbermatcher.cc

    --- 6.3~svn698-4/cpp/src/phonenumbers/phonenumbermatcher.cc 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/phonenumbermatcher.cc 2015-07-14 15:21:09.000000000 +0000 @@ -55,7 +55,6 @@ #include "phonenumbers/regexp_adapter_re2.h" #endif // I18N_PHONENUMBERS_USE_RE2_AND_ICU -using std::make_pair; using std::map; using std::numeric_limits; using std::string; @@ -372,7 +371,7 @@ class AlternateFormats : public Singleto it != format_data_.metadata().end(); ++it) { calling_code_to_alternate_formats_map_.insert( - make_pair(it->country_code(), &*it)); + std::make_pair(it->country_code(), &*it)); } }
  74. Download patch java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java

    --- 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java 2015-07-14 15:21:09.000000000 +0000 @@ -347,7 +347,6 @@ final class PhoneNumberMatcher implement */ private PhoneNumberMatch extractInnerMatch(String candidate, int offset) { for (Pattern possibleInnerMatch : INNER_MATCHES) { - int rangeStart = 0; Matcher groupMatcher = possibleInnerMatch.matcher(candidate); boolean isFirstMatch = true; while (groupMatcher.find() && maxTries > 0) { @@ -690,6 +689,7 @@ final class PhoneNumberMatcher implement return true; } + @Override public boolean hasNext() { if (state == State.NOT_READY) { lastMatch = find(searchIndex); @@ -703,6 +703,7 @@ final class PhoneNumberMatcher implement return state == State.READY; } + @Override public PhoneNumberMatch next() { // Check the state and find the next match as a side-effect if necessary. if (!hasNext()) { @@ -719,6 +720,7 @@ final class PhoneNumberMatcher implement /** * Always throws {@link UnsupportedOperationException} as removal is not supported. */ + @Override public void remove() { throw new UnsupportedOperationException(); }
  75. Download patch java/geocoder/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java

    --- 6.3~svn698-4/java/geocoder/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/geocoder/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java 2015-07-14 15:21:09.000000000 +0000 @@ -51,6 +51,8 @@ public class PhoneNumberOfflineGeocoderT new PhoneNumber().setCountryCode(1).setNationalNumber(6174240000L); private static final PhoneNumber US_INVALID_NUMBER = new PhoneNumber().setCountryCode(1).setNationalNumber(123456789L); + private static final PhoneNumber NANPA_TOLL_FREE = + new PhoneNumber().setCountryCode(1).setNationalNumber(8002431234L); private static final PhoneNumber BS_NUMBER1 = new PhoneNumber().setCountryCode(1).setNationalNumber(2423651234L); private static final PhoneNumber AU_NUMBER = @@ -84,6 +86,13 @@ public class PhoneNumberOfflineGeocoderT geocoder.getDescriptionForNumber(US_NUMBER4, new Locale("en", "US"))); } + public void testGetDescriptionForNumberBelongingToMultipleCountriesIsEmpty() { + // Test that nothing is returned when the number passed in is valid but not + // covered by the geocoding data file and belongs to multiple countries + assertEquals("", + geocoder.getDescriptionForNumber(NANPA_TOLL_FREE, new Locale("en", "US"))); + } + public void testGetDescriptionForNumber_en_US() { assertEquals("CA", geocoder.getDescriptionForNumber(US_NUMBER1, new Locale("en", "US")));
  76. Download patch debian/libphonenumber-java.jlibs

    --- 6.3~svn698-4/debian/libphonenumber-java.jlibs 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/libphonenumber-java.jlibs 2014-07-27 06:13:35.000000000 +0000 @@ -0,0 +1 @@ +java/build/jar/libphonenumber.jar
  77. Download patch debian/libgeocoding-dev.install

    --- 6.3~svn698-4/debian/libgeocoding-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/libgeocoding-dev.install 2015-07-21 13:07:28.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libg*.a +usr/lib/*/libg*.so
  78. Download patch debian/maven.ignoreRules

    --- 6.3~svn698-4/debian/maven.ignoreRules 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/maven.ignoreRules 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +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/ - -net.kindleit maven-gae-plugin * * * * -org.apache.maven.plugins maven-assembly-plugin * * * * -org.apache.maven.plugins maven-javadoc-plugin * * * * -org.apache.maven.plugins maven-release-plugin * * * * -org.apache.maven.plugins maven-source-plugin * * * * -org.mortbay.jetty maven-jetty-plugin * * * * -org.sonatype.oss oss-parent * * * *
  79. Download patch cpp/symbols.map

    --- 6.3~svn698-4/cpp/symbols.map 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/symbols.map 2015-11-11 22:37:10.000000000 +0000 @@ -0,0 +1,15 @@ +{ +global: + extern "C++" { + i18n::phonenumbers::*; + typeinfo?for?i18n::phonenumbers::*; + typeinfo?name?for?i18n::phonenumbers::*; + VTT?for?i18n::phonenumbers::*; + virtual?thunk?to?i18n::phonenumbers::*; + vtable?for?i18n::phonenumbers::*; + }; +local: + extern "C++" { + *; + }; +};
  80. Download patch java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberInfo.java
  81. Download patch debian/patches/0009-maven-tests-forkmode.patch

    --- 6.3~svn698-4/debian/patches/0009-maven-tests-forkmode.patch 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/patches/0009-maven-tests-forkmode.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ ---- a/java/pom.xml -+++ b/java/pom.xml -@@ -92,7 +92,6 @@ - <artifactId>maven-surefire-plugin</artifactId> - <version>2.12</version> - <configuration> -- <forkMode>never</forkMode> - <includes> - <include>**/*Test.java</include> - </includes>
  82. Download patch java/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java

    --- 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java 2015-11-11 22:37:12.000000000 +0000 +++ 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java 2015-07-14 15:21:09.000000000 +0000 @@ -33,7 +33,6 @@ import java.util.logging.Logger; * An offline mapper from phone numbers to time zones. */ public class PhoneNumberToTimeZonesMapper { - private static PhoneNumberToTimeZonesMapper instance = null; private static final String MAPPING_DATA_DIRECTORY = "/com/google/i18n/phonenumbers/timezones/data/"; private static final String MAPPING_DATA_FILE_NAME = "map_data"; @@ -173,7 +172,7 @@ public class PhoneNumberToTimeZonesMappe */ private List<String> getTimeZonesForGeocodableNumber(PhoneNumber number) { List<String> timezones = prefixTimeZonesMap.lookupTimeZonesForNumber(number); - return Collections.unmodifiableList(timezones.size() == 0 ? UNKNOWN_TIME_ZONE_LIST + return Collections.unmodifiableList(timezones.isEmpty() ? UNKNOWN_TIME_ZONE_LIST : timezones); } @@ -186,7 +185,7 @@ public class PhoneNumberToTimeZonesMappe */ private List<String> getCountryLevelTimeZonesforNumber(PhoneNumber number) { List<String> timezones = prefixTimeZonesMap.lookupCountryLevelTimeZonesForNumber(number); - return Collections.unmodifiableList(timezones.size() == 0 ? UNKNOWN_TIME_ZONE_LIST + return Collections.unmodifiableList(timezones.isEmpty() ? UNKNOWN_TIME_ZONE_LIST : timezones); } } Binary files 6.3~svn698-4/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data and 7.0.8-0ubuntu3/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data differ
  83. Download patch cpp/src/phonenumbers/regexp_cache.cc

    --- 6.3~svn698-4/cpp/src/phonenumbers/regexp_cache.cc 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/regexp_cache.cc 2015-07-14 15:21:09.000000000 +0000 @@ -52,7 +52,7 @@ const RegExp& RegExpCache::GetRegExp(con if (it != cache_impl_->end()) return *it->second; const RegExp* regexp = regexp_factory_.CreateRegExp(pattern); - cache_impl_->insert(make_pair(pattern, regexp)); + cache_impl_->insert(std::make_pair(pattern, regexp)); return *regexp; }
  84. Download patch cpp/src/phonenumbers/shortnumberinfo.cc
  85. Download patch java/libphonenumber/src/com/google/i18n/phonenumbers/internal/RegexBasedMatcher.java

    --- 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/internal/RegexBasedMatcher.java 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/internal/RegexBasedMatcher.java 2015-07-14 15:21:09.000000000 +0000 @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2014 The Libphonenumber 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 com.google.i18n.phonenumbers.internal; + +import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; +import com.google.i18n.phonenumbers.RegexCache; + +import java.util.regex.Matcher; + +/** + * Implementation of the matcher API using the regular expressions in the PhoneNumberDesc + * proto message to match numbers. + */ +public final class RegexBasedMatcher implements MatcherApi { + public static MatcherApi create() { + return new RegexBasedMatcher(); + } + + private final RegexCache regexCache = new RegexCache(100); + + private RegexBasedMatcher() {} + + // @Override + public boolean matchesNationalNumber(String nationalNumber, PhoneNumberDesc numberDesc, + boolean allowPrefixMatch) { + Matcher nationalNumberPatternMatcher = regexCache.getPatternForRegex( + numberDesc.getNationalNumberPattern()).matcher(nationalNumber); + return nationalNumberPatternMatcher.matches() + || (allowPrefixMatch && nationalNumberPatternMatcher.lookingAt()); + } + + // @Override + public boolean matchesPossibleNumber(String nationalNumber, PhoneNumberDesc numberDesc) { + Matcher possibleNumberPatternMatcher = regexCache.getPatternForRegex( + numberDesc.getPossibleNumberPattern()).matcher(nationalNumber); + return possibleNumberPatternMatcher.matches(); + } +}
  86. Download patch debian/patches/cpp_symbols_map.patch

    --- 6.3~svn698-4/debian/patches/cpp_symbols_map.patch 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/patches/cpp_symbols_map.patch 2014-07-27 06:13:35.000000000 +0000 @@ -0,0 +1,51 @@ +Index: libphonenumber/cpp/CMakeLists.txt +=================================================================== +--- libphonenumber.orig/cpp/CMakeLists.txt 2014-05-06 13:05:10.506317974 +0200 ++++ libphonenumber/cpp/CMakeLists.txt 2014-05-06 13:09:45.698309843 +0200 +@@ -344,6 +344,8 @@ + endif () + endif () + ++set(symbol_map "${CMAKE_SOURCE_DIR}/symbols.map") ++ + if (${BUILD_GEOCODER} STREQUAL "ON") + add_library (geocoding STATIC ${GEOCODING_SOURCES}) + # The geocoder doesn't use RE2 so there is no reason not to build a shared +@@ -355,6 +357,8 @@ + PREFIX "lib" + SOVERSION ${libphonenumber_VERSION_MAJOR} + VERSION ${libphonenumber_VERSION_MAJOR}.${libphonenumber_VERSION_MINOR}) ++ set_target_properties(geocoding-shared PROPERTIES LINK_FLAGS "${ldflags} -Wl,--version-script,${symbol_map}") ++ set_target_properties(geocoding-shared PROPERTIES LINK_DEPENDS ${symbol_map}) + endif () + + # Build a shared library (with -fPIC). +@@ -383,6 +387,8 @@ + PREFIX "lib" + SOVERSION ${libphonenumber_VERSION_MAJOR} + VERSION ${libphonenumber_VERSION_MAJOR}.${libphonenumber_VERSION_MINOR}) ++ set_target_properties(phonenumber-shared PROPERTIES LINK_FLAGS "${ldflags} -Wl,--version-script,${symbol_map}") ++ set_target_properties(phonenumber-shared PROPERTIES LINK_DEPENDS ${symbol_map}) + endif () + + # Libraries used by both libphonenumber and libgeocoding. +Index: libphonenumber/cpp/symbols.map +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ libphonenumber/cpp/symbols.map 2014-05-06 13:05:10.502317974 +0200 +@@ -0,0 +1,15 @@ ++{ ++global: ++ extern "C++" { ++ i18n::phonenumbers::*; ++ typeinfo?for?i18n::phonenumbers::*; ++ typeinfo?name?for?i18n::phonenumbers::*; ++ VTT?for?i18n::phonenumbers::*; ++ virtual?thunk?to?i18n::phonenumbers::*; ++ vtable?for?i18n::phonenumbers::*; ++ }; ++local: ++ extern "C++" { ++ *; ++ }; ++};
  87. Download patch debian/patches/0003-maven-exclude-demo.patch

    --- 6.3~svn698-4/debian/patches/0003-maven-exclude-demo.patch 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/patches/0003-maven-exclude-demo.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -diff --git a/java/pom.xml b/java/pom.xml -index 4e7cdb5..eb68bcc 100644 ---- a/java/pom.xml -+++ b/java/pom.xml -@@ -76,7 +76,7 @@ - <module>internal/prefixmapper</module> - <module>carrier</module> - <module>geocoder</module> -- <module>demo</module> -+ <!--<module>demo</module>--> - </modules> - - <build>
  88. Download patch cpp/test/phonenumbers/asyoutypeformatter_test.cc

    --- 6.3~svn698-4/cpp/test/phonenumbers/asyoutypeformatter_test.cc 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/test/phonenumbers/asyoutypeformatter_test.cc 2015-07-14 15:21:09.000000000 +0000 @@ -94,7 +94,7 @@ TEST_F(AsYouTypeFormatterTest, InvalidPl } TEST_F(AsYouTypeFormatterTest, TooLongNumberMatchingMultipleLeadingDigits) { - // See http://code.google.com/p/libphonenumber/issues/detail?id=36 + // See https://github.com/googlei18n/libphonenumber/issues/36 // The bug occurred last time for countries which have two formatting rules // with exactly the same leading digits pattern but differ in length. formatter_.reset(phone_util_.GetAsYouTypeFormatter(RegionCode::GetUnknown())); @@ -1226,7 +1226,7 @@ TEST_F(AsYouTypeFormatterTest, // leading digit patterns; when we try again to extract a country code we // should ensure we use the last leading digit pattern, rather than the first // one such that it *thinks* it's found a valid formatting rule again. - // https://code.google.com/p/libphonenumber/issues/detail?id=437 + // https://github.com/googlei18n/libphonenumber/issues/437 EXPECT_EQ("+8698812", formatter_->InputDigit('2', &result_)); EXPECT_EQ("+86988123", formatter_->InputDigit('3', &result_)); EXPECT_EQ("+869881234", formatter_->InputDigit('4', &result_));
  89. Download patch debian/libphonenumber7.symbols.ppc64el
  90. Download patch cpp/src/phonenumbers/metadata.cc
  91. Download patch java/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java

    --- 6.3~svn698-4/java/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java 2015-07-14 15:21:09.000000000 +0000 @@ -100,7 +100,7 @@ public class PhoneNumberToCarrierMapper * Gets the name of the carrier for the given phone number only when it is 'safe' to display to * users. A carrier name is considered safe if the number is valid and for a region that doesn't * support - * {@linkplain http://en.wikipedia.org/wiki/Mobile_number_portability mobile number portability}. + * <a href="http://en.wikipedia.org/wiki/Mobile_number_portability">mobile number portability</a>. * * @param number the phone number for which we want to get a carrier name * @param languageCode the language code in which the name should be written
  92. Download patch debian/maven.publishedRules

    --- 6.3~svn698-4/debian/maven.publishedRules 2015-08-09 20:11:10.000000000 +0000 +++ 7.0.8-0ubuntu3/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/ -
  93. Download patch debian/libphonenumber7.symbols.powerpc
  94. Download patch java/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java

    --- 6.3~svn698-4/java/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java 2015-07-14 15:21:09.000000000 +0000 @@ -37,7 +37,7 @@ public class ExampleNumbersTest extends private static final Logger LOGGER = Logger.getLogger(ExampleNumbersTest.class.getName()); private PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.createInstance(PhoneNumberUtil.DEFAULT_METADATA_LOADER); - private ShortNumberInfo shortNumberInfo = new ShortNumberInfo(phoneNumberUtil); + private ShortNumberInfo shortNumberInfo = ShortNumberInfo.getInstance(); private List<PhoneNumber> invalidCases = new ArrayList<PhoneNumber>(); private List<PhoneNumber> wrongTypeCases = new ArrayList<PhoneNumber>(); @@ -183,7 +183,8 @@ public class ExampleNumbersTest extends List<String> invalidStringCases = new ArrayList<String>(); for (String regionCode : shortNumberInfo.getSupportedRegions()) { String exampleShortNumber = shortNumberInfo.getExampleShortNumber(regionCode); - if (!shortNumberInfo.isValidShortNumberForRegion(exampleShortNumber, regionCode)) { + if (!shortNumberInfo.isValidShortNumberForRegion( + phoneNumberUtil.parse(exampleShortNumber, regionCode), regionCode)) { String invalidStringCase = "region_code: " + regionCode + ", national_number: " + exampleShortNumber; invalidStringCases.add(invalidStringCase); @@ -198,7 +199,8 @@ public class ExampleNumbersTest extends for (ShortNumberInfo.ShortNumberCost cost : ShortNumberInfo.ShortNumberCost.values()) { exampleShortNumber = shortNumberInfo.getExampleShortNumberForCost(regionCode, cost); if (!exampleShortNumber.equals("")) { - if (cost != shortNumberInfo.getExpectedCostForRegion(exampleShortNumber, regionCode)) { + if (cost != shortNumberInfo.getExpectedCostForRegion( + phoneNumberUtil.parse(exampleShortNumber, regionCode), regionCode)) { wrongTypeCases.add(phoneNumber); LOGGER.log(Level.SEVERE, "Wrong cost for " + phoneNumber.toString()); } @@ -217,12 +219,13 @@ public class ExampleNumbersTest extends MetadataManager.getShortNumberMetadataForRegion(regionCode).getEmergency(); if (desc.hasExampleNumber()) { String exampleNumber = desc.getExampleNumber(); - if (!exampleNumber.matches(desc.getPossibleNumberPattern()) || - !shortNumberInfo.isEmergencyNumber(exampleNumber, regionCode)) { + PhoneNumber phoneNumber = phoneNumberUtil.parse(exampleNumber, regionCode); + if (!shortNumberInfo.isPossibleShortNumberForRegion(phoneNumber, regionCode) + || !shortNumberInfo.isEmergencyNumber(exampleNumber, regionCode)) { wrongTypeCounter++; LOGGER.log(Level.SEVERE, "Emergency example number test failed for " + regionCode); - } else if (shortNumberInfo.getExpectedCostForRegion(exampleNumber, regionCode) != - ShortNumberInfo.ShortNumberCost.TOLL_FREE) { + } else if (shortNumberInfo.getExpectedCostForRegion(phoneNumber, regionCode) + != ShortNumberInfo.ShortNumberCost.TOLL_FREE) { wrongTypeCounter++; LOGGER.log(Level.WARNING, "Emergency example number not toll free for " + regionCode); } @@ -240,8 +243,8 @@ public class ExampleNumbersTest extends if (desc.hasExampleNumber()) { String exampleNumber = desc.getExampleNumber(); PhoneNumber carrierSpecificNumber = phoneNumberUtil.parse(exampleNumber, regionCode); - if (!exampleNumber.matches(desc.getPossibleNumberPattern()) || - !shortNumberInfo.isCarrierSpecific(carrierSpecificNumber)) { + if (!shortNumberInfo.isPossibleShortNumberForRegion(carrierSpecificNumber, regionCode) + || !shortNumberInfo.isCarrierSpecific(carrierSpecificNumber)) { wrongTagCounter++; LOGGER.log(Level.SEVERE, "Carrier-specific test failed for " + regionCode); }
  95. Download patch debian/copyright
  96. Download patch cpp/src/phonenumbers/phonenumberutil.h

    --- 6.3~svn698-4/cpp/src/phonenumbers/phonenumberutil.h 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/phonenumberutil.h 2015-07-14 15:21:09.000000000 +0000 @@ -155,6 +155,11 @@ class PhoneNumberUtil : public Singleton // for. void GetSupportedRegions(set<string>* regions) const; + // Convenience method to get a list of what global network calling codes the + // library has metadata for. + void GetSupportedGlobalNetworkCallingCodes( + set<int>* calling_codes) const; + // Gets a PhoneNumberUtil instance to carry out international phone number // formatting, parsing, or validation. The instance is loaded with phone // number metadata for a number of most commonly used regions, as specified by
  97. Download patch java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java

    --- 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java 2015-07-14 15:21:09.000000000 +0000 @@ -31,10 +31,10 @@ public class CountryCodeToRegionCodeMap // countries sharing a calling code, such as the NANPA countries, the one // indicated with "isMainCountryForCode" in the metadata should be first. static Map<Integer, List<String>> getCountryCodeToRegionCodeMap() { - // The capacity is set to 286 as there are 215 different entries, + // The capacity is set to 285 as there are 214 different entries, // and this offers a load factor of roughly 0.75. Map<Integer, List<String>> countryCodeToRegionCodeMap = - new HashMap<Integer, List<String>>(286); + new HashMap<Integer, List<String>>(285); ArrayList<String> listWithRegionCode; @@ -103,8 +103,9 @@ public class CountryCodeToRegionCodeMap listWithRegionCode.add("HU"); countryCodeToRegionCodeMap.put(36, listWithRegionCode); - listWithRegionCode = new ArrayList<String>(1); + listWithRegionCode = new ArrayList<String>(2); listWithRegionCode.add("IT"); + listWithRegionCode.add("VA"); countryCodeToRegionCodeMap.put(39, listWithRegionCode); listWithRegionCode = new ArrayList<String>(1); @@ -570,10 +571,6 @@ public class CountryCodeToRegionCodeMap countryCodeToRegionCodeMap.put(378, listWithRegionCode); listWithRegionCode = new ArrayList<String>(1); - listWithRegionCode.add("VA"); - countryCodeToRegionCodeMap.put(379, listWithRegionCode); - - listWithRegionCode = new ArrayList<String>(1); listWithRegionCode.add("UA"); countryCodeToRegionCodeMap.put(380, listWithRegionCode); Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_54 and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_54 differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91 and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91 differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CR and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CR differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MC and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MC differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB differ Binary files 6.3~svn698-4/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US and 7.0.8-0ubuntu3/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US differ
  98. Download patch debian/libgeocoding7.install

    --- 6.3~svn698-4/debian/libgeocoding7.install 1970-01-01 00:00:00.000000000 +0000 +++ 7.0.8-0ubuntu3/debian/libgeocoding7.install 2015-07-21 13:07:52.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/libg*.so.*
  99. Download patch cpp/src/phonenumbers/base/basictypes.h

    --- 6.3~svn698-4/cpp/src/phonenumbers/base/basictypes.h 2014-08-27 19:13:52.000000000 +0000 +++ 7.0.8-0ubuntu3/cpp/src/phonenumbers/base/basictypes.h 2015-07-14 15:21:09.000000000 +0000 @@ -189,13 +189,72 @@ char (&ArraySizeHelper(const T (&array)[ // the expression is false, most compilers will issue a warning/error // containing the name of the variable. +#if __cplusplus >= 201103L + +// Under C++11, just use static_assert. +#define COMPILE_ASSERT(expr, msg) static_assert(expr, #msg) + +#else + template <bool> struct CompileAssert { }; -#if !defined(COMPILE_ASSERT) +// Annotate a variable indicating it's ok if the variable is not used. +// (Typically used to silence a compiler warning when the assignment +// is important for some other reason.) +// Use like: +// int x ALLOW_UNUSED = ...; +#if defined(COMPILER_GCC) +#define ALLOW_UNUSED __attribute__((unused)) +#else +#define ALLOW_UNUSED +#endif + #define COMPILE_ASSERT(expr, msg) \ - typedef CompileAssert<(bool(expr))> msg[bool(expr) ? 1 : -1] + typedef CompileAssert<(bool(expr))> msg[bool(expr) ? 1 : -1] ALLOW_UNUSED + +// Implementation details of COMPILE_ASSERT: +// +// - COMPILE_ASSERT works by defining an array type that has -1 +// elements (and thus is invalid) when the expression is false. +// +// - The simpler definition +// +// #define COMPILE_ASSERT(expr, msg) typedef char msg[(expr) ? 1 : -1] +// +// does not work, as gcc supports variable-length arrays whose sizes +// are determined at run-time (this is gcc's extension and not part +// of the C++ standard). As a result, gcc fails to reject the +// following code with the simple definition: +// +// int foo; +// COMPILE_ASSERT(foo, msg); // not supposed to compile as foo is +// // not a compile-time constant. +// +// - By using the type CompileAssert<(bool(expr))>, we ensures that +// expr is a compile-time constant. (Template arguments must be +// determined at compile-time.) +// +// - The outer parentheses in CompileAssert<(bool(expr))> are necessary +// to work around a bug in gcc 3.4.4 and 4.0.1. If we had written +// +// CompileAssert<bool(expr)> +// +// instead, these compilers will refuse to compile +// +// COMPILE_ASSERT(5 > 0, some_message); +// +// (They seem to think the ">" in "5 > 0" marks the end of the +// template argument list.) +// +// - The array size is (bool(expr) ? 1 : -1), instead of simply +// +// ((expr) ? 1 : -1). +// +// This is to avoid running into a bug in MS VC 7.1, which +// causes ((0.0) ? 1 : -1) to incorrectly evaluate to 1. + #endif } // namespace phonenumbers
  100. Download patch cpp/src/phonenumbers/alternate_format.cc
  101. ...

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