Bug#384334: jadetex: Suggested changes, NMU prepared
Package: jadetex
Version: 3.13-6
Followup-For: Bug #384334
Dear Ohura-san!
Frank already posted the absolutly minimal changes which would help
fixing the updates problems with tetex/texlive.
Furthermore, I have prepared a package including several changes, here
is the changelog entry with additional comments.
Please consider the attached changes for an updated package. I attach a
diff between the current 3.13-6 and 3.13-6.2.
jadetex (3.13-6.2) unstable; urgency=low
* NMU
* change fmtutil line to not load the latex format, but put the loading of
latex.ini into jadetex.ini and pdfjadetex.ini (Closes: #384334)
What happens here Frank already has described.
* add alternative dependencies on texlive (Closes: #375037)
This is wishlist bug
* switch to dh_installtex (Closes: #352845, #335225, #343104)
- add the respective call to debian/rules
- remove fmt generation code in postinst
- remove prerm file
closes several bugs calling fmtutil. Furthermore it adds adherence to
the TeX Policy, ie that files installed into /etc/texmf/fmt.d/ are
listed in /var/lib/tex-common/fmt.d to get the update-fmtutil mechanism
right. The removal of the fmt generation code can be done as
dh_installtex adds the respective code automatically to the resp.
scripts.
* adjust texmf.d config snippet:
- add latex in the search path (Closes: #384332)
- drop useless pdftex path component
This closes bug #384332
* bump standards version to 3.7.2, no changes necessary
* move debhelper from build-deps-indep to build-deps
two lintian warnings
* recommend tipa (Closes: #384206)
Best wishes
Norbert
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-rc4
Locale: LANG=en_US.ISO-8859-15, LC_CTYPE=en_US.ISO-8859-15 (charmap=ISO-8859-15)
Versions of packages jadetex depends on:
ii debianutils 2.17 Miscellaneous utilities specific t
ii tex-common 0.27 Common infrastructure for using an
ii texlive-fonts-recommended 2005.dfsg.1-1 TeX Live: Recommended fonts
ii texlive-latex-base 2005.dfsg.1-1 TeX Live: Basic LaTeX packages
ii texlive-latex-recommended 2005.dfsg.1-1 TeX Live: LaTeX recommended packag
Versions of packages jadetex recommends:
ii openjade1.3 1.3.2-9 Implementation of the DSSSL langua
-- no debconf information
diff -urN jadetex-3.13-6/debian/changelog jadetex-3.13/debian/changelog
--- jadetex-3.13-6/debian/changelog 2006-08-23 15:24:47.000000000 +0200
+++ jadetex-3.13/debian/changelog 2006-08-23 18:27:15.000000000 +0200
@@ -1,3 +1,22 @@
+jadetex (3.13-6.2) unstable; urgency=low
+
+ * NMU
+ * change fmtutil line to not load the latex format, but put the loading of
+ latex.ini into jadetex.ini and pdfjadetex.ini (Closes: #384334)
+ * add alternative dependencies on texlive (Closes: #375037)
+ * switch to dh_installtex (Closes: #352845, #335225, #343104)
+ - add the respective call to debian/rules
+ - remove fmt generation code in postinst
+ - remove prerm file
+ * adjust texmf.d config snippet:
+ - add latex in the search path (Closes: #384332)
+ - drop useless pdftex path component
+ * bump standards version to 3.7.2, no changes necessary
+ * move debhelper from build-deps-indep to build-deps
+ * recommend tipa (Closes: #384206)
+
+ -- Norbert Preining <preining@logic.at> Wed, 23 Aug 2006 15:20:00 +0200
+
jadetex (3.13-6) unstable; urgency=low
* Check whether 40jadetex.cnf has been modified when upgrading from the
@@ -58,7 +77,7 @@
we use etex and pdfetex for jadetex and pdfjadetex. (Closes: #253098)
* This might fix #205922 and #253417 as well.
- -- Jordi Mallach <jordi@debian.org> Tue, 10 Aug 2004 21:45:08 +0200
+ -- Jordi Mallach <jordi@debian.org> Tue, 10 Aug 2004 21:45:08 +0200
jadetex (3.13-1) unstable; urgency=medium
diff -urN jadetex-3.13-6/debian/control jadetex-3.13/debian/control
--- jadetex-3.13-6/debian/control 2006-08-23 15:24:47.000000000 +0200
+++ jadetex-3.13/debian/control 2006-08-23 18:25:11.000000000 +0200
@@ -2,12 +2,13 @@
Section: tex
Priority: optional
Maintainer: OHURA Makoto <ohura@debian.org>
-Standards-Version: 3.6.1
-Build-Depends-Indep: debhelper (>=4.0.0), tetex-extra, openjade, docbook-xml (>= 4.2), docbook-dsssl
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>=4.0.0)
+Build-Depends-Indep: tetex-extra, openjade, docbook-xml (>= 4.2), docbook-dsssl, tex-common (>= 0.19)
Package: jadetex
Architecture: all
-Depends: debianutils (>= 1.7), tetex-bin (>= 2.0.1-1), tetex-extra (>= 2.0.1-2)
+Depends: debianutils (>= 1.7), tetex-bin (>= 2.0.1-1) | texlive-latex-base, tetex-extra (>= 2.0.1-2) | texlive-latex-recommended, tetex-extra (>= 2.0.1-2) | texlive-fonts-recommended | tex-common (>= 0.19)
Recommends: openjade1.3 | openjade | jade (>= 1.2-1)
Suggests: docbook-dsssl
Conflicts: cslatex, csplain, tetex-base (<= 2.0.2a-2)
diff -urN jadetex-3.13-6/debian/fmtutil.cnf jadetex-3.13/debian/fmtutil.cnf
--- jadetex-3.13-6/debian/fmtutil.cnf 2006-08-23 15:24:47.000000000 +0200
+++ jadetex-3.13/debian/fmtutil.cnf 2006-08-23 18:25:11.000000000 +0200
@@ -2,6 +2,6 @@
# invoke with 'fmtutil --cnffile <file>'
#
# format engine pattern-file arguments
-jadetex etex language.dat &latex jadetex.ini
-pdfjadetex pdfetex language.dat &pdflatex pdfjadetex.ini
+jadetex etex language.dat jadetex.ini
+pdfjadetex pdfetex language.dat pdfjadetex.ini
diff -urN jadetex-3.13-6/debian/postinst jadetex-3.13/debian/postinst
--- jadetex-3.13-6/debian/postinst 2006-08-23 15:24:47.000000000 +0200
+++ jadetex-3.13/debian/postinst 2006-08-23 18:25:11.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/bash
# jadetex postinst
-# jobs: mktexlsr, fmtutil, remove old cruft we used to make
+# jobs: remove old cruft we used to make
set -e
@@ -10,9 +10,6 @@
TEXINPUTS=
PACKAGE=jadetex
-FMTDIR=/etc/texmf/fmt.d
-FMTCNF="$FMTDIR/40jadetex.cnf"
-TEMPLDIR=/usr/share/texmf/tex/jadetex/config-templates
umask 022
@@ -24,13 +21,6 @@
fi
}
-log ( ) {
- if [ -f $MYTMPFILE ]; then
- echo $* >> $MYTMPFILE
- fi
-
-}
-
remove_conffile_commit () {
# syntax: remove_conffile_commit filename
#
@@ -55,71 +45,6 @@
fi
}
-checkfmt ( ) {
- format=$1
- baseformat=`basename $1 .fmt`
- if ! ( kpsewhich $baseformat.fmt || kpsewhich $baseformat.efmt ) > /dev/null ; then
- warn "WARNING: memory dump $format not found, attempting to reconstruct ..."
- echo "running 'fmtutil --byfmt $baseformat'" >> $MYTMPFILE
- fmtutil --byfmt $baseformat >> $MYTMPFILE
- if kpsewhich $format > /dev/null ; then
- warn " ok, reconstructed"
- else
- warn "ERROR: cannot create TeX memory dump $format"
- warn " Your TeX environment seems to be broken; the memory dump file $format"
- warn " was not found and cannot be created. Probably, TeX is miconfigured."
- warn " You should submit the log file $MYTMPFILE as a bug against"
- warn " the package tetex-bin."
- warn
- warn "JadeTeX cannot be installed."
- exit 1
- fi
- fi
-}
-
-
-make_and_check_fmt ( ) {
- local fmt
- fmt=$1
- fmtutil=fmtutil
- if [ -x /usr/bin/fmtutil-sys ]; then fmtutil=fmtutil-sys; fi
-
- if ! kpsewhich --progname=jadetex jadetex.ini; then
- warn "/etc/texmf/jadetex/$fmt.ini not found, skipping $fmt memory dump"
- warn "If you wish to use JadeTeX, you will have to create the dump manually"
- warn "or else purge then reinstall this package to restore default configuration."
- return 0
- else
- log "running 'fmtutil --byfmt $fmt'..."
- if ! fmtutil --byfmt $fmt >> $MYTMPFILE; then
- warn "ERROR: $fmt fmtutil failed"
- return 1
- else
- log "successfully created $fmt memory dump"
- return 0
- fi
- fi
- return 0
-}
-
-makejadetexfmt ( ) {
- local goterror
- goterror=false
-
- if ! make_and_check_fmt jadetex; then
- goterror=true
- fi
- if ! make_and_check_fmt pdfjadetex; then
- goterror=true
- fi
- if $goterror; then
- return -1
- else
- return 0
- fi
-}
-
-
if [ "$1" = "configure" ]; then
# old crufty stuff we used to build in postinst - I wonder whether we
# should actually do this in preinst?
@@ -137,36 +62,6 @@
warn "removing old texmf.d config snippet"
rm /etc/texmf/texmf.d/96JadeTeX
fi
-
- mktexlsr
-
- MYTMPFILE=`mktemp -t jadetex-postinst.XXXXXX`
- : > $MYTMPFILE
-
- # 40jadetex.cnf is now a conffile
- update-fmtutil
- update-texmf
-
- echo "Checking for TeX memory dumps (.fmt) ..."
- checkfmt latex.fmt
- checkfmt pdftex.fmt
- checkfmt pdflatex.fmt
- echo " done."
-
- echo "Creating JadeTeX memory dumps ..."
- if makejadetexfmt; then
- echo " done."
- else
- warn " failed."
- warn "ERROR: JadeTeX/PDFJadeTeX memory dump creation failed"
- warn " This package could not be installed."
- warn " Please report this bug; include the file $MYTMPFILE"
- warn " in the bug report."
- exit 1
- fi
-
- # remove temp file
- rm -f $MYTMPFILE
fi
#DEBHELPER#
diff -urN jadetex-3.13-6/debian/prerm jadetex-3.13/debian/prerm
--- jadetex-3.13-6/debian/prerm 2006-08-23 15:24:47.000000000 +0200
+++ jadetex-3.13/debian/prerm 1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-#!/bin/sh
-# derived from tetex-base.postrm
-
-set -e
-
-# clear environment
-TETEXDIR=
-TEXMF=
-TEXINPUTS=
-
-ETC_CONFIG=/etc/texmf/jadetex
-FMTDIR=/etc/texmf/fmt.d
-
-if [ "$1" = "remove" ]; then
- # remove the fmt files created at postinst
- JADETEXFMT=$(kpsewhich jadetex.fmt) || true
- PDFJADETEXFMT=$(kpsewhich pdfjadetex.fmt) || true
- rm -f $JADETEXFMT $PDFJADETEXFMT
-
- # remove the logs created as a sideeffect
- WEB2CDIR=$(dirname $JADETEXFMT) || true
- rm -f $WEB2CDIR/jadetex.log $WEB2CDIR/pdfjadetex.log
-
- update-fmtutil
-fi
-
-# the upgrade case will be handled in postinst; no need to run it twice
-if [ "$1" != "upgrade" ]; then
- if which mktexlsr >/dev/null 2>&1; then
- mktexlsr || true
- fi
-fi
-
-#DEBHELPER#
-
-exit 0
-
diff -urN jadetex-3.13-6/debian/rules jadetex-3.13/debian/rules
--- jadetex-3.13-6/debian/rules 2006-08-23 15:24:47.000000000 +0200
+++ jadetex-3.13/debian/rules 2006-08-23 18:25:11.000000000 +0200
@@ -45,7 +45,7 @@
test:
$(checkdir)
sh -n debian/postinst
- sh -n debian/prerm
+ # gone sh -n debian/prerm
sh -n debian/postrm
binary-indep: build test
@@ -67,7 +67,10 @@
# echo $(subst $(prefix),,$(texmfdir))/96JadeTeX.cnf >> debian/conffiles
# the fmtutil snippet is managed in the postinst
- $(install_file) debian/fmtutil.cnf $(fmtdir)/40jadetex.cnf
+ dh_installtex --priority=40 \
+ format=jadetex,etex,language.dat,jadetex.ini \
+ format=pdfjadetex,etex,language.dat,pdfjadetex.ini
+ # $(install_file) debian/fmtutil.cnf $(fmtdir)/40jadetex.cnf
$(install_file) jadetex.1 pdfjadetex.1 $(mandir)/man1/
diff -urN jadetex-3.13-6/debian/texmf.cnf jadetex-3.13/debian/texmf.cnf
--- jadetex-3.13-6/debian/texmf.cnf 2006-08-23 15:24:47.000000000 +0200
+++ jadetex-3.13/debian/texmf.cnf 2006-08-23 18:25:11.000000000 +0200
@@ -1,5 +1,5 @@
-TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,plain,generic,}//
-TEXINPUTS.pdfjadetex = .;$TEXMF/{pdftex,tex}/{jadetex,plain,generic,}//
+TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,latex,plain,generic,}//
+TEXINPUTS.pdfjadetex = .;$TEXMF/tex/{jadetex,latex,plain,generic,}//
%%
%% jacking up TeX settings for the unique uses of jadetex
diff -urN jadetex-3.13-6/jadetex.ini jadetex-3.13/jadetex.ini
--- jadetex-3.13-6/jadetex.ini 2001-07-02 21:51:44.000000000 +0200
+++ jadetex-3.13/jadetex.ini 2006-08-23 18:25:11.000000000 +0200
@@ -1,3 +1,7 @@
+\let\savedump\dump
+\let\dump\relax
+\input latex.ini
+\let\dump\savedump
\input jadetex.ltx
\dump
-\endinput
\ No newline at end of file
+\endinput
diff -urN jadetex-3.13-6/pdfjadetex.ini jadetex-3.13/pdfjadetex.ini
--- jadetex-3.13-6/pdfjadetex.ini 2001-07-02 21:52:12.000000000 +0200
+++ jadetex-3.13/pdfjadetex.ini 2006-08-23 18:25:11.000000000 +0200
@@ -1,3 +1,7 @@
+\let\savedump\dump
+\let\dump\relax
+\input latex.ini
+\let\dump\savedump
\input jadetex.ltx
\dump
\endinput
Reply to: