Tony Mancill pushed to branch master at Debian Java Maintainers / icu4j
Commits: 78451e8e by tony mancill at 2019-02-24T22:52:49Z Drop the build-dep on default-jdk-doc (Closes: #923182) - - - - - 2921bef5 by tony mancill at 2019-02-24T23:41:52Z No longer bother to configure JDK API doc links - - - - - 5d6dfd96 by tony mancill at 2019-02-24T23:59:56Z Bump Standards-Version to 4.3.0 - - - - - 428542e2 by tony mancill at 2019-02-24T23:59:56Z Mark libicu4j-java and libicu4j-java-doc as Multi-arch: foreign - - - - - 31b95348 by tony mancill at 2019-02-24T23:59:56Z Correct minor typo in package description - - - - - 76322a96 by tony mancill at 2019-02-25T00:00:44Z prepare changelog for upload - - - - - 5 changed files: - debian/changelog - debian/control - − debian/patches/javadoc_local_link.diff - debian/patches/series - debian/patches/use-default-doclet.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,14 @@ +icu4j (62.1-2) unstable; urgency=medium + + * Team upload. + * Drop the build-dep on default-jdk-doc and the patch to configure JDK + API doc links (Closes: #923182) + * Bump Standards-Version to 4.3.0 + * Mark libicu4j-java and libicu4j-java-doc as Multi-arch: foreign + * Correct minor typo in package description + + -- tony mancill <[email protected]> Sun, 24 Feb 2019 16:00:38 -0800 + icu4j (62.1-1) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -10,16 +10,16 @@ Build-Depends: ant (>= 1.7.0), debhelper (>= 11), default-jdk, - default-jdk-doc, javahelper, maven-repo-helper (>= 1.6~) -Standards-Version: 4.2.1 +Standards-Version: 4.3.0 Vcs-Git: https://salsa.debian.org/java-team/icu4j.git Vcs-Browser: https://salsa.debian.org/java-team/icu4j Homepage: http://www.icu-project.org Package: libicu4j-java Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends} Description: Library for Unicode support and internationalization ICU is a mature, widely used set of C/C++ and Java libraries for @@ -33,6 +33,7 @@ Description: Library for Unicode support and internationalization Package: libicu4j-java-doc Section: doc Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends} Recommends: default-jdk-doc Description: Library for Unicode support and internationalization - Docs @@ -44,4 +45,4 @@ Description: Library for Unicode support and internationalization - Docs gives applications the same results on all platforms and between C/C++ and Java software. . - This package provides the documentations. + This package provides the documentation. ===================================== debian/patches/javadoc_local_link.diff deleted ===================================== @@ -1,14 +0,0 @@ -Description: Link to local JDK API -Author: Kai-Chung Yan <[email protected]> -Last-Update: 2016-03-01 ---- a/build.xml -+++ b/build.xml -@@ -57,7 +57,7 @@ - <property name="icu4j.api.doc.window.title" value="ICU4J ${api.doc.version}"/> - <property name="icu4j.api.doc.header" value="ICU4J ${api.doc.version}"/> - -- <property name="icu4j.api.doc.jdk.link" value="http://docs.oracle.com/javase/8/docs/api/"/> -+ <property name="icu4j.api.doc.jdk.link" value="file:///usr/share/doc/default-jdk/api"/> - <property name="icu4j.api.doc.copyright.footer" value="<font size=-1>Copyright © 2016 Unicode, Inc. and others.</font>"/> - - <!-- API docs for maven repo --> ===================================== debian/patches/series ===================================== @@ -1,4 +1,3 @@ #01-java8-compatibility.patch -javadoc_local_link.diff reproducible-build.patch use-default-doclet.patch ===================================== debian/patches/use-default-doclet.patch ===================================== @@ -3,7 +3,15 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -1275,7 +1275,7 @@ +@@ -57,7 +57,6 @@ + <property name="icu4j.api.doc.window.title" value="ICU4J ${api.doc.version}"/> + <property name="icu4j.api.doc.header" value="ICU4J ${api.doc.version}"/> + +- <property name="icu4j.api.doc.jdk.link" value="http://docs.oracle.com/javase/8/docs/api/"/> + <property name="icu4j.api.doc.copyright.footer" value="<font size=-1>Copyright © 2016 Unicode, Inc. and others.</font>"/> + + <!-- API docs for maven repo --> +@@ -1275,7 +1274,7 @@ </target> <!-- doc targets --> @@ -12,43 +20,55 @@ Forwarded: not-needed <target name="docsStrict" description="Build API documents with all doclint check enabled"> <condition property="doclint.option" value="-Xdoclint:all"> -@@ -1332,7 +1332,7 @@ +@@ -1332,8 +1331,7 @@ docencoding="UTF-8" charset="UTF-8" bottom="${icu4j.api.doc.copyright.footer}" - additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar}${path.separator}${jcite.libs} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet -taglet ch.arrenbrecht.jcite.JCiteTaglet -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8" +- link="${icu4j.api.doc.jdk.link}" + additionalparam="${doclint.option} -breakiterator -use -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8" - link="${icu4j.api.doc.jdk.link}" source="1.5" stylesheetfile="${docs.style.sheet}" -@@ -1368,7 +1368,7 @@ + failonerror="true"> +@@ -1368,8 +1366,7 @@ docencoding="UTF-8" charset="UTF-8" bottom="${icu4j.api.doc.copyright.footer}" - additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet" +- link="${icu4j.api.doc.jdk.link}" + additionalparam="${doclint.option} -breakiterator -use" - link="${icu4j.api.doc.jdk.link}" source="1.5" failonerror="true"> -@@ -1413,7 +1413,7 @@ + <packageset dir="${icu4j.core.dir}/src"> +@@ -1413,8 +1410,7 @@ docencoding="UTF-8" charset="UTF-8" bottom="${icu4j.api.doc.copyright.footer}" - additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar}${path.separator}${jcite.libs} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet -taglet ch.arrenbrecht.jcite.JCiteTaglet -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8" +- link="${icu4j.api.doc.jdk.link}" + additionalparam="${doclint.option} -breakiterator -use -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8" - link="${icu4j.api.doc.jdk.link}" source="1.5" stylesheetfile="${docs.style.sheet}" -@@ -1452,7 +1452,7 @@ + failonerror="true"> +@@ -1452,8 +1448,7 @@ docencoding="UTF-8" charset="UTF-8" bottom="${icu4j.api.doc.copyright.footer}" - additionalparam="${doclint.option} -breakiterator -use -tagletpath ${icu4j.build-tools.jar}${path.separator}${jcite.libs} -taglet com.ibm.icu.dev.tool.docs.ICUTaglet -taglet ch.arrenbrecht.jcite.JCiteTaglet -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8" +- link="${icu4j.api.doc.jdk.link}" + additionalparam="${doclint.option} -breakiterator -use -J-Djcitesourcepath=${jcite.addl.src} -J-Dfile.encoding=UTF-8" - link="${icu4j.api.doc.jdk.link}" source="1.5" stylesheetfile="${docs.style.sheet}" -@@ -1636,7 +1636,6 @@ + failonerror="true" +@@ -1480,7 +1475,6 @@ + charset="UTF-8" + bottom="${icu4j.api.doc.copyright.footer}" + additionalparam="${doclint.option} -breakiterator -use" +- link="${icu4j.api.doc.jdk.link}" + source="1.5" + failonerror="true" + classpath="${icu4j.jar.file}"> +@@ -1636,7 +1630,6 @@ <packageset dir="${icu4j.charset.dir}/src"> <include name="com/ibm/icu/charset/**"/> </packageset> @@ -56,7 +76,7 @@ Forwarded: not-needed </javadoc> </target> -@@ -1662,13 +1661,6 @@ +@@ -1662,13 +1655,6 @@ <packageset dir="${icu4j.translit.dir}/src"> <include name="com/ibm/icu/text/**"/> </packageset> @@ -70,7 +90,7 @@ Forwarded: not-needed </javadoc> </target> -@@ -1708,12 +1700,6 @@ +@@ -1708,12 +1694,6 @@ <packageset dir="${icu4j.translit.dir}/src"> <include name="com/ibm/icu/text/**"/> </packageset> View it on GitLab: https://salsa.debian.org/java-team/icu4j/compare/ee9e8e89c999f9cacc95a14c163622d9f2da0b35...76322a9658ae2a02d711df7f08a76d0bee090dde -- View it on GitLab: https://salsa.debian.org/java-team/icu4j/compare/ee9e8e89c999f9cacc95a14c163622d9f2da0b35...76322a9658ae2a02d711df7f08a76d0bee090dde You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
