diff -Nru liboro-java-2.0.8a/debian/changelog liboro-java-2.0.8a/debian/changelog --- liboro-java-2.0.8a/debian/changelog 2015-06-29 11:57:04.000000000 +0000 +++ liboro-java-2.0.8a/debian/changelog 2016-07-27 13:10:52.000000000 +0000 @@ -1,3 +1,13 @@ +liboro-java (2.0.8a-12) unstable; urgency=medium + + * Build reproducibility: + - Set the encoding to UTF-8 when generating the Javadoc + * Moved the package to Git + * Standards-Version updated to 3.9.8 + * Updated debian/copyright to the Copyright Format 1.0 + + -- Emmanuel Bourg Wed, 27 Jul 2016 15:10:43 +0200 + liboro-java (2.0.8a-11) unstable; urgency=medium * Build reproducibility: diff -Nru liboro-java-2.0.8a/debian/control liboro-java-2.0.8a/debian/control --- liboro-java-2.0.8a/debian/control 2015-05-28 07:30:09.000000000 +0000 +++ liboro-java-2.0.8a/debian/control 2016-07-27 12:40:08.000000000 +0000 @@ -4,10 +4,10 @@ Maintainer: Debian Java Maintainers Uploaders: Emmanuel Bourg Build-Depends: debhelper (>= 9), cdbs, default-jdk, ant, maven-repo-helper -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 +Vcs-Git: https://anonscm.debian.org/git/pkg-java/liboro-java.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/liboro-java.git Homepage: http://jakarta.apache.org/oro/ -Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/liboro-java -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/liboro-java Package: liboro-java Architecture: all diff -Nru liboro-java-2.0.8a/debian/copyright liboro-java-2.0.8a/debian/copyright --- liboro-java-2.0.8a/debian/copyright 2015-05-28 07:28:25.000000000 +0000 +++ liboro-java-2.0.8a/debian/copyright 2016-07-27 12:57:12.000000000 +0000 @@ -1,63 +1,73 @@ -This package was debianized by Takashi Okamoto tora@debian.org on -Tue, 21 Nov 2000 05:59:06 +0000. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Jakarta ORO +Source: http://svn.apache.org/repos/asf/jakarta/oro/ -It was downloaded from: - http://jakarta.apache.org/oro/ +Files: * +Copyright: 2000-2003, The Apache Software Foundation +License: Apache-1.1 -Copyright: -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. 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. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation", "Jakarta-Oro" - * must not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * or "Jakarta-Oro", nor may "Apache" or "Jakarta-Oro" appear in their - * name, without prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR - * ITS 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. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - * Portions of this software are based upon software originally written - * by Daniel F. Savarese. We appreciate his contributions. - */ +Files: debian/* +Copyright: 2000-2004, Takashi Okamoto + 2004, Marc Brockschmidt + 2005-2010, Michael Koch + 2005, Jeroen van Wolffelaar + 2005-2006, Arnaud Vandyck + 2009, Matthias Klose + 2009, Ludovic Claude + 2009-2011, Torsten Werner + 2010, Niels Thykier + 2013-2016, Emmanuel Bourg +License: Apache-1.1 + +License: Apache-1.1 + The Apache Software License, Version 1.1 + . + Copyright (c) 2000 The Apache Software Foundation. All rights + reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + 2. 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. + . + 3. The end-user documentation included with the redistribution, + if any, must include the following acknowledgment: + "This product includes software developed by the + Apache Software Foundation (http://www.apache.org/)." + Alternately, this acknowledgment may appear in the software itself, + if and wherever such third-party acknowledgments normally appear. + . + 4. The names "Apache" and "Apache Software Foundation", "Jakarta-Oro" + must not be used to endorse or promote products derived from this + software without prior written permission. For written + permission, please contact apache@apache.org. + . + 5. Products derived from this software may not be called "Apache" + or "Jakarta-Oro", nor may "Apache" or "Jakarta-Oro" appear in their + name, without prior written permission of the Apache Software Foundation. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR + ITS 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. + ==================================================================== + . + This software consists of voluntary contributions made by many + individuals on behalf of the Apache Software Foundation. For more + information on the Apache Software Foundation, please see + . diff -Nru liboro-java-2.0.8a/debian/patches/02-remove-timestamps-in-javadoc.patch liboro-java-2.0.8a/debian/patches/02-remove-timestamps-in-javadoc.patch --- liboro-java-2.0.8a/debian/patches/02-remove-timestamps-in-javadoc.patch 2015-05-28 11:06:25.000000000 +0000 +++ liboro-java-2.0.8a/debian/patches/02-remove-timestamps-in-javadoc.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Description: Remove the timestamps from the Javadoc to make the build reproducible -Author: Emmanuel Bourg -Forwarded: not-needed ---- a/build.xml -+++ b/build.xml -@@ -159,6 +159,7 @@ - version="true" - windowtitle="${name} ${version} API" - doctitle="${name} ${version} API" -+ additionalparam="-notimestamp" - header="<a href='http://jakarta.apache.org/oro/' target=_top><img src='{@docroot}/../images/logoSmall.gif' alt='Jakarta ORO' width=48 height=47 align=center border=0 hspace=1 vspace=1></a>" - bottom="Copyright © ${year} Apache Software Foundation. All Rights Reserved."> - diff -Nru liboro-java-2.0.8a/debian/patches/02-reproducible-javadoc.patch liboro-java-2.0.8a/debian/patches/02-reproducible-javadoc.patch --- liboro-java-2.0.8a/debian/patches/02-reproducible-javadoc.patch 1970-01-01 00:00:00.000000000 +0000 +++ liboro-java-2.0.8a/debian/patches/02-reproducible-javadoc.patch 2016-07-27 13:09:25.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Make the javadoc reproducible +Author: Emmanuel Bourg +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -159,6 +159,9 @@ + version="true" + windowtitle="${name} ${version} API" + doctitle="${name} ${version} API" ++ additionalparam="-notimestamp" ++ locale="en_US" ++ encoding="UTF-8" + header="<a href='http://jakarta.apache.org/oro/' target=_top><img src='{@docroot}/../images/logoSmall.gif' alt='Jakarta ORO' width=48 height=47 align=center border=0 hspace=1 vspace=1></a>" + bottom="Copyright © ${year} Apache Software Foundation. All Rights Reserved."> + diff -Nru liboro-java-2.0.8a/debian/patches/03-set-javadoc-locale.patch liboro-java-2.0.8a/debian/patches/03-set-javadoc-locale.patch --- liboro-java-2.0.8a/debian/patches/03-set-javadoc-locale.patch 2015-06-29 11:54:06.000000000 +0000 +++ liboro-java-2.0.8a/debian/patches/03-set-javadoc-locale.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Description: Set the locale used for the javadoc to make the build reproducible -Author: Emmanuel Bourg -Forwarded: not-needed ---- a/build.xml -+++ b/build.xml -@@ -160,6 +160,7 @@ - windowtitle="${name} ${version} API" - doctitle="${name} ${version} API" - additionalparam="-notimestamp" -+ locale="en_US" - header="<a href='http://jakarta.apache.org/oro/' target=_top><img src='{@docroot}/../images/logoSmall.gif' alt='Jakarta ORO' width=48 height=47 align=center border=0 hspace=1 vspace=1></a>" - bottom="Copyright © ${year} Apache Software Foundation. All Rights Reserved."> - diff -Nru liboro-java-2.0.8a/debian/patches/series liboro-java-2.0.8a/debian/patches/series --- liboro-java-2.0.8a/debian/patches/series 2015-06-29 11:53:08.000000000 +0000 +++ liboro-java-2.0.8a/debian/patches/series 2016-07-27 13:02:24.000000000 +0000 @@ -1,3 +1,2 @@ 01-build-xml-dont-replace-non-existing-file.patch -02-remove-timestamps-in-javadoc.patch -03-set-javadoc-locale.patch +02-reproducible-javadoc.patch