Source: natbraille Severity: wishlist Dear Maintainer,
Please consider replacing saxonb dependency with Saxon-HE. Patch is attached.
>From 1954b3643b28af7a409b404a092efa9c52ce7677 Mon Sep 17 00:00:00 2001 From: Eugene Zhukov <[email protected]> Date: Fri, 8 Jul 2016 14:30:15 +0200 Subject: [PATCH] Switch from saxonb to Saxon-HE --- debian/bin/natbraille | 2 +- debian/control | 8 ++++++-- debian/patches/saxonhe.patch | 35 +++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 3 ++- 5 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 debian/patches/saxonhe.patch diff --git a/debian/bin/natbraille b/debian/bin/natbraille index 93a83bd..b806953 100644 --- a/debian/bin/natbraille +++ b/debian/bin/natbraille @@ -9,7 +9,7 @@ fi JAVACLASSES=/usr/share/java CLASSPATH="${CLASSPATH:-.}:$JAVACLASSES/nat.jar" -CLASSPATH="$CLASSPATH:$JAVACLASSES/commons-io.jar:$JAVACLASSES/fop.jar:$JAVACLASSES/xalan2.jar:$JAVACLASSES/jaxe.jar:$JAVACLASSES/jazzy.jar:$JAVACLASSES/jhall.jar:$JAVACLASSES/jing.jar:$JAVACLASSES/jodconverter.jar:$JAVACLASSES/joptsimple.jar:$JAVACLASSES/juh.jar:$JAVACLASSES/jurt.jar:$JAVACLASSES/log4j-1.2.jar:$JAVACLASSES/ridl.jar:$JAVACLASSES/saxonb.jar:$JAVACLASSES/saxonb-dom.jar:$JAVACLASSES/slf4j-api.jar:$JAVACLASSES/slf4j-jdk14.jar:/usr/share/libreoffice/program/classes/unoil.jar:$JAVACLASSES/xstream.jar:$JAVACLASSES/writer2latex.jar:$JAVACLASSES/jeuclid-core.jar" +CLASSPATH="$CLASSPATH:$JAVACLASSES/commons-io.jar:$JAVACLASSES/fop.jar:$JAVACLASSES/xalan2.jar:$JAVACLASSES/jaxe.jar:$JAVACLASSES/jazzy.jar:$JAVACLASSES/jhall.jar:$JAVACLASSES/jing.jar:$JAVACLASSES/jodconverter.jar:$JAVACLASSES/joptsimple.jar:$JAVACLASSES/juh.jar:$JAVACLASSES/jurt.jar:$JAVACLASSES/log4j-1.2.jar:$JAVACLASSES/ridl.jar:$JAVACLASSES/Saxon-HE.jar:$JAVACLASSES/slf4j-api.jar:$JAVACLASSES/slf4j-jdk14.jar:/usr/share/libreoffice/program/classes/unoil.jar:$JAVACLASSES/xstream.jar:$JAVACLASSES/writer2latex.jar:$JAVACLASSES/jeuclid-core.jar" export CLASSPATH diff --git a/debian/control b/debian/control index 529d930..c143ae1 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,9 @@ Priority: extra Maintainer: Debian Accessibility Team <[email protected]> Uploaders: Samuel Thibault <[email protected]> Build-Depends: debhelper (>= 9), default-jdk -Build-Depends-Indep: libcommons-io-java, libfop-java, libxalan2-java, libjaxe-java, libjazzy-java, javahelp2, libjing-java, libjodconverter-java, libjoptsimple-java, ure, liblog4j1.2-java, libreoffice-java-common, libsaxonb-java, libslf4j-java, libxstream-java, libwriter2latex-java, libjeuclid-core-java +Build-Depends-Indep: libcommons-io-java, libfop-java, libxalan2-java, + libjaxe-java, libjazzy-java, javahelp2, libjing-java, libjodconverter-java, + libjoptsimple-java, ure, liblog4j1.2-java, libreoffice-java-common, libsaxonhe-java, libslf4j-java, libxstream-java, libwriter2latex-java, libjeuclid-core-java Standards-Version: 3.9.8 Vcs-Browser: http://git.debian.org/?p=pkg-a11y/natbraille.git;a=summary Vcs-Git: git://git.debian.org/git/pkg-a11y/natbraille.git @@ -12,7 +14,9 @@ Homepage: http://natbraille.free.fr/ Package: natbraille Architecture: all -Depends: ${misc:Depends}, default-jre, libcommons-io-java, libfop-java, libxalan2-java, libjazzy-java, javahelp2, libjing-java, libjodconverter-java, libjoptsimple-java, ure, liblog4j1.2-java, libreoffice-java-common, libsaxonb-java (>= 9.1.0.8), libslf4j-java, libxstream-java, libwriter2latex-java, writer2latex (>= 1.0.2-7), libjeuclid-core-java, ttf-dejavu-core +Depends: ${misc:Depends}, default-jre, libcommons-io-java, libfop-java, + libxalan2-java, libjazzy-java, javahelp2, libjing-java, libjodconverter-java, + libjoptsimple-java, ure, liblog4j1.2-java, libreoffice-java-common, libsaxonhe-java, libslf4j-java, libxstream-java, libwriter2latex-java, writer2latex (>= 1.0.2-7), libjeuclid-core-java, ttf-dejavu-core Description: French braille typesetting program Nat is a braille translation engine that can translate into transcribed French braille: diff --git a/debian/patches/saxonhe.patch b/debian/patches/saxonhe.patch new file mode 100644 index 0000000..edf3bd0 --- /dev/null +++ b/debian/patches/saxonhe.patch @@ -0,0 +1,35 @@ +Description: Fix fully qualified package names + +--- a/ui/ConfAbrege.java ++++ b/ui/ConfAbrege.java +@@ -76,8 +76,8 @@ import outils.regles.RulesToolKit; + + import nat.ConfigNat; + import net.sf.saxon.Controller; +-import net.sf.saxon.event.Emitter; +-import net.sf.saxon.event.MessageEmitter; ++import net.sf.saxon.serialize.Emitter; ++import net.sf.saxon.serialize.MessageEmitter; + + /** + * Fenêtre de sélection et de visualisation des règles d'abrégé. +--- a/ui/ConfDictCoup.java ++++ b/ui/ConfDictCoup.java +@@ -67,8 +67,8 @@ import org.w3c.dom.Element; + import nat.ConfigNat; + import nat.Transcription; + import net.sf.saxon.Controller; +-import net.sf.saxon.event.Emitter; +-import net.sf.saxon.event.MessageEmitter; ++import net.sf.saxon.serialize.Emitter; ++import net.sf.saxon.serialize.MessageEmitter; + + import outils.HyphenationToolkit; + /** +@@ -882,4 +882,4 @@ public class ConfDictCoup extends JFrame + @Override + public Class<?> getColumnClass(int col) {return colClass[col];} + } +-} +\ No newline at end of file ++} diff --git a/debian/patches/series b/debian/patches/series index 898cf1e..2d7a8c0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ writer2latex_path.diff debian-fixes +saxonhe.patch diff --git a/debian/rules b/debian/rules index 861b37f..6f93863 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,8 @@ JAR=jar JAVADOC=javadoc JAVACLASSES=/usr/share/java -JAVAFLAGS+=-classpath $(JAVACLASSES)/commons-io.jar:$(JAVACLASSES)/fop.jar:$(JAVACLASSES)/xalan2.jar:$(JAVACLASSES)/jaxe.jar:$(JAVACLASSES)/jazzy.jar:$(JAVACLASSES)/jhall.jar:$(JAVACLASSES)/jing.jar:$(JAVACLASSES)/jodconverter.jar:$(JAVACLASSES)/joptsimple.jar:$(JAVACLASSES)/juh.jar:$(JAVACLASSES)/jurt.jar:$(JAVACLASSES)/log4j-1.2.jar:$(JAVACLASSES)/ridl.jar:$(JAVACLASSES)/saxonb.jar:$(JAVACLASSES)/saxon-dom.jar$(JAVACLASSES)/slf4j-api.jar:$(JAVACLASSES)/slf4j-jdk14.jar:/usr/lib/libreoffice/program/classes/unoil.jar:$(JAVACLASSES)/xstream.jar:$(JAVACLASSES)/writer2latex.jar:$(JAVACLASSES)/jeuclid-core.jar +JAVAFLAGS+=-classpath \ +$(JAVACLASSES)/commons-io.jar:$(JAVACLASSES)/fop.jar:$(JAVACLASSES)/xalan2.jar:$(JAVACLASSES)/jaxe.jar:$(JAVACLASSES)/jazzy.jar:$(JAVACLASSES)/jhall.jar:$(JAVACLASSES)/jing.jar:$(JAVACLASSES)/jodconverter.jar:$(JAVACLASSES)/joptsimple.jar:$(JAVACLASSES)/juh.jar:$(JAVACLASSES)/jurt.jar:$(JAVACLASSES)/log4j-1.2.jar:$(JAVACLASSES)/ridl.jar:$(JAVACLASSES)/Saxon-HE.jar:$(JAVACLASSES)/slf4j-api.jar:$(JAVACLASSES)/slf4j-jdk14.jar:/usr/lib/libreoffice/program/classes/unoil.jar:$(JAVACLASSES)/xstream.jar:$(JAVACLASSES)/writer2latex.jar:$(JAVACLASSES)/jeuclid-core.jar JARFILE=nat.jar -- 2.8.1
