Author: malat Date: 2016-04-15 14:25:23 +0000 (Fri, 15 Apr 2016) New Revision: 19028
Added: trunk/fop/debian/patches/javadoc_encoding.patch trunk/fop/debian/patches/strip_user_host_from_manifest.patch Modified: trunk/fop/debian/changelog trunk/fop/debian/patches/series trunk/fop/debian/rules Log: upload Modified: trunk/fop/debian/changelog =================================================================== --- trunk/fop/debian/changelog 2016-04-15 12:53:19 UTC (rev 19027) +++ trunk/fop/debian/changelog 2016-04-15 14:25:23 UTC (rev 19028) @@ -1,8 +1,16 @@ -fop (1:2.1-3) UNRELEASED; urgency=medium +fop (1:2.1-3) unstable; urgency=medium + [ Alexis Bienvenüe ] + * Use d/changelog date for pod2man + * Strip user/host from MANIFEST + + debian/patches/strip_user_host_from_manifest.patch + * Fix javadoc encoding. Closes: #820684 + + debian/patches/javadoc_encoding.patch + + [ Mathieu Malaterre ] * Update offo to release 2.2. Closes: #817264 - -- Mathieu Malaterre <[email protected]> Wed, 09 Mar 2016 16:21:10 +0100 + -- Mathieu Malaterre <[email protected]> Fri, 15 Apr 2016 16:24:24 +0200 fop (1:2.1-2) unstable; urgency=medium Added: trunk/fop/debian/patches/javadoc_encoding.patch =================================================================== --- trunk/fop/debian/patches/javadoc_encoding.patch (rev 0) +++ trunk/fop/debian/patches/javadoc_encoding.patch 2016-04-15 14:25:23 UTC (rev 19028) @@ -0,0 +1,16 @@ +Description: Set javadoc output encoding to UTF-8 + Set javadoc output encoding to UTF-8, to make the build reproducible. +Author: Alexis Bienvenüe <[email protected]> + +Index: fop-2.1/build.xml +=================================================================== +--- fop-2.1.orig/build.xml ++++ fop-2.1/build.xml +@@ -963,6 +963,7 @@ NOTE: + windowtitle="${Name} ${version} API" + doctitle="Apache Formatting Objects Processor (FOP)" + bottom="Copyright ${year} The Apache Software Foundation. All Rights Reserved." ++ encoding="UTF-8" docencoding="UTF-8" charset="UTF-8" + overview="${src.dir}/java/org/apache/fop/overview.html" + maxmemory="256M"> + <header><![CDATA[${name} ${version}]]></header> Modified: trunk/fop/debian/patches/series =================================================================== --- trunk/fop/debian/patches/series 2016-04-15 12:53:19 UTC (rev 19027) +++ trunk/fop/debian/patches/series 2016-04-15 14:25:23 UTC (rev 19028) @@ -2,3 +2,5 @@ fixbuildxml.patch replace-sRGB-profile.patch hyph_stacksize.patch +strip_user_host_from_manifest.patch +javadoc_encoding.patch Added: trunk/fop/debian/patches/strip_user_host_from_manifest.patch =================================================================== --- trunk/fop/debian/patches/strip_user_host_from_manifest.patch (rev 0) +++ trunk/fop/debian/patches/strip_user_host_from_manifest.patch 2016-04-15 14:25:23 UTC (rev 19028) @@ -0,0 +1,81 @@ +Description: Strip user and host from MANIFEST + Strip user, host and os variables from MANIFEST.MF, to make the build + reproducible. +Author: Alexis Bienvenüe <[email protected]> + +--- fop-2.1.orig/build.xml ++++ fop-2.1/build.xml +@@ -461,7 +461,7 @@ list of possible build targets. + <attribute name="Implementation-Title" value="${Name}"/> + <attribute name="Implementation-Version" value="${version}"/> + <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/> +- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/> ++ <attribute name="Build-Id" value="${ts} (Java ${java.runtime.version}, Target Java ${javac.target})"/> + </manifest> + </jar> + </target> +@@ -483,7 +483,7 @@ list of possible build targets. + <jar jarfile="${build.dir}/fop.jar" basedir="${build.classes.dir}" manifest="${basedir}/fop.mf"> + <manifest> + <attribute name="Main-Class" value="org.apache.fop.cli.Main"/> +- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/> ++ <attribute name="Build-Id" value="${ts} (Java ${java.runtime.version}, Target Java ${javac.target})"/> + <section name="org/apache/fop/"> + <attribute name="Specification-Title" value="XSL-FO - Extensible Stylesheet Language"/> + <attribute name="Specification-Version" value="1.1"/> +@@ -508,7 +508,7 @@ list of possible build targets. + </tstamp> + <jar jarfile="${build.dir}/fop-sandbox.jar" basedir="${build.sandbox-classes.dir}"> + <manifest> +- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/> ++ <attribute name="Build-Id" value="${ts} (Java ${java.runtime.version}, Target Java ${javac.target})"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + </jar> +@@ -638,7 +638,7 @@ list of possible build targets. + <attribute name="Implementation-Title" value="${fop-transcoder.name}"/> + <attribute name="Implementation-Version" value="${fop-transcoder.version}"/> + <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/> +- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/> ++ <attribute name="Build-Id" value="${ts} (Java ${java.runtime.version}, Target Java ${javac.target})"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + </jar> +@@ -673,7 +673,7 @@ list of possible build targets. + <attribute name="Implementation-Title" value="${fop-transcoder.name}"/> + <attribute name="Implementation-Version" value="${fop-transcoder.version}"/> + <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/> +- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/> ++ <attribute name="Build-Id" value="${ts} (Java ${java.runtime.version}, Target Java ${javac.target})"/> + </manifest> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> + </jar> +@@ -1044,7 +1044,7 @@ NOTE: + <target name="jar-javadocs" depends="javadocs" description="Generates a jar file containing the Javadocs"> + <jar jarfile="${build.dir}/${name}-${version}-javadoc.jar"> + <manifest> +- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/> ++ <attribute name="Build-Id" value="${ts} (Java ${java.runtime.version}, Target Java ${javac.target})"/> + </manifest> + <fileset dir="${build.javadocs.dir}"/> + <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> +@@ -1348,7 +1348,7 @@ NOTE: + </antcall> + <jar jarfile="${build.dir}/${name}-${version}-bundle.jar"> + <manifest> +- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}])"/> ++ <attribute name="Build-Id" value="${ts} (Java ${java.runtime.version})"/> + </manifest> + <fileset dir="${build.dir}"> + <patternset> +--- fop-2.1.orig/examples/plan/build.xml ++++ fop-2.1/examples/plan/build.xml +@@ -133,7 +133,7 @@ + <attribute name="Implementation-Title" value="${Name}"/> + <attribute name="Implementation-Version" value="${version}"/> + <attribute name="Implementation-Vendor" value="Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/> +- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}])"/> ++ <attribute name="Build-Id" value="${ts}"/> + </manifest> + </jar> + </target> Modified: trunk/fop/debian/rules =================================================================== --- trunk/fop/debian/rules 2016-04-15 12:53:19 UTC (rev 19027) +++ trunk/fop/debian/rules 2016-04-15 14:25:23 UTC (rev 19028) @@ -37,7 +37,6 @@ pod2man --section=1 \ --release="Fop-TTFReader " \ - --date="`date`" \ debian/fop-ttfreader.pod > build/fop-ttfreader.1 install/fop-doc:: _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
