Author: malat-guest Date: 2012-01-10 17:38:17 +0000 (Tue, 10 Jan 2012) New Revision: 15676
Added: trunk/fop/debian/offo-hyphenation_v2.0.zip trunk/fop/debian/source/include-binaries Modified: trunk/fop/debian/changelog trunk/fop/debian/control trunk/fop/debian/copyright trunk/fop/debian/fop-doc.dirs trunk/fop/debian/fop.sh trunk/fop/debian/rules Log: Integrate change from Joachim (offo/hyphenation) and sugestion from drazzib Modified: trunk/fop/debian/changelog =================================================================== --- trunk/fop/debian/changelog 2012-01-10 12:29:55 UTC (rev 15675) +++ trunk/fop/debian/changelog 2012-01-10 17:38:17 UTC (rev 15676) @@ -1,9 +1,13 @@ fop (1:1.0.dfsg2-6) UNRELEASED; urgency=low + [ Mathieu Malaterre ] * Support conf.d like configuration files. Closes: #630198 * Fix fop man page (outdated). Closes: #654592, #512443 * Split packages into fop and libfop-java. Closes: #544546 + [ Joachim Breitner ] + * Include hyphenation patterns from TeX. Closes: #655027 + -- Mathieu Malaterre <mathieu.malate...@gmail.com> Thu, 05 Jan 2012 09:32:15 +0100 fop (1:1.0.dfsg2-5) unstable; urgency=low Modified: trunk/fop/debian/control =================================================================== --- trunk/fop/debian/control 2012-01-10 12:29:55 UTC (rev 15675) +++ trunk/fop/debian/control 2012-01-10 17:38:17 UTC (rev 15676) @@ -12,7 +12,8 @@ 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.4), - libservlet2.5-java, libxml-commons-external-java, maven-repo-helper, libqdox-java + libservlet2.5-java, libxml-commons-external-java, maven-repo-helper, libqdox-java, + unzip Standards-Version: 3.9.2 Homepage: http://xmlgraphics.apache.org/fop/ Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/fop @@ -38,6 +39,8 @@ Package: libfop-java Section: java Architecture: all +Replaces: fop (<< 1:1.0.dfsg2-6) +Breaks: fop (<< 1:1.0.dfsg2-6) Depends: libxerces2-java, libxalan2-java, libbsf-java, libavalon-framework-java (>=4.1.2-2), libbatik-java (>= 1.7), libcommons-io-java, libcommons-logging-java, libxt6, Modified: trunk/fop/debian/copyright =================================================================== --- trunk/fop/debian/copyright 2012-01-10 12:29:55 UTC (rev 15675) +++ trunk/fop/debian/copyright 2012-01-10 17:38:17 UTC (rev 15676) @@ -22,3 +22,24 @@ On Debian systems the full text of the Apache Software License version 2.0 can be found in the `/usr/share/common-licenses/Apache-2.0' file. +Files: debian/offo-hyphenation_v2.0.zip +Comment: + This file contains TeX hyphenation patterns in XML format. It was downloaded from + http://sourceforge.net/projects/offo/files/offo-hyphenation/2.0/offo-hyphenation_v2.0.zip + The same data in a format usable by TeX is shipped in the package texlive-base + in /usr/share/texmf-texlive/tex/generic/hyph-utf8/patterns/. These are covered + by multiple licenses, all of which are free licenses, and different + copyrights. As these files are data and not code, and especially not linked + code, the incompatibilities of these licenses does not pose a problem. A more + though explanation of the TeX licensing situation can be found in + /usr/share/doc/texlive-base/copyright. +License: + LaTeX Project Public License, version 1 or later + LaTeX Project Public License, version 1.3 or later + LaTeX Project Public License, version 1.2 or later + LGPL + GPL-2 + GPL-2+ + GPL-3 + + Modified: trunk/fop/debian/fop-doc.dirs =================================================================== --- trunk/fop/debian/fop-doc.dirs 2012-01-10 12:29:55 UTC (rev 15675) +++ trunk/fop/debian/fop-doc.dirs 2012-01-10 17:38:17 UTC (rev 15676) @@ -1,2 +1 @@ usr/share/doc/fop-doc/html/api - Modified: trunk/fop/debian/fop.sh =================================================================== --- trunk/fop/debian/fop.sh 2012-01-10 12:29:55 UTC (rev 15675) +++ trunk/fop/debian/fop.sh 2012-01-10 17:38:17 UTC (rev 15676) @@ -41,6 +41,7 @@ if [ "$FOP_HYPHENATION_PATH" ]; then find_jars $FOP_HYPHENATION_PATH fi +find_jars /usr/share/fop/fop-hyph.jar find_jars fop LOG_OPTION=-Dorg.apache.commons.logging.Log=org.apache.fop.util.CommandLineLogger Added: trunk/fop/debian/offo-hyphenation_v2.0.zip =================================================================== (Binary files differ) Property changes on: trunk/fop/debian/offo-hyphenation_v2.0.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/fop/debian/rules =================================================================== --- trunk/fop/debian/rules 2012-01-10 12:29:55 UTC (rev 15675) +++ trunk/fop/debian/rules 2012-01-10 17:38:17 UTC (rev 15676) @@ -17,12 +17,19 @@ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=639162#24 # For this reason qdox is not listed in DEB_JARS test -h /usr/share/java/qdox.jar && cp -L /usr/share/java/qdox.jar lib/build + + unzip -j -o debian/offo-hyphenation_v2.0.zip \ + offo-hyphenation/hyph/\* -d hyph/ install/libfop-java:: mh_installpom -plibfop-java $(CURDIR)/debian/pom.xml mh_installjar -plibfop-java -l $(CURDIR)/debian/pom.xml \ $(CURDIR)/build/fop.jar + + mkdir -p $(CURDIR)/debian/libfop-java/usr/share/fop/ + cp -a $(CURDIR)/build/fop-hyph.jar $(CURDIR)/debian/libfop-java/usr/share/fop/ + install/fop:: cp -a debian/fop.sh debian/fop/usr/bin/fop cp -a debian/fop-ttfreader.sh debian/fop/usr/bin/fop-ttfreader @@ -43,6 +50,7 @@ -rm -Rf build mkdir -p lib/build rm -f lib/build/qdox.jar + rm -f hyph/*.xml mh_clean debian/fop.1: debian/fop.1.in Added: trunk/fop/debian/source/include-binaries =================================================================== --- trunk/fop/debian/source/include-binaries (rev 0) +++ trunk/fop/debian/source/include-binaries 2012-01-10 17:38:17 UTC (rev 15676) @@ -0,0 +1 @@ +debian/offo-hyphenation_v2.0.zip _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits