Bug#190721: splitting of texdoctk is hosed
On 13.06.03 Atsuhito Kohda (kohda@pm.tokushima-u.ac.jp) wrote:
>
> From: Hilmar Preusse <hille42@web.de>
> Subject: Bug#190721: splitting of texdoctk is hosed
> Date: Thu, 12 Jun 2003 22:55:53 +0200
>
> > > I suspect this is not so good idea...
> > >
> > Again, what to do with that bug? That idea sounds good, especially if
> > I look at #170382 and #173872. My proposal is to exactly that.
>
> Perhaps it is the easiest way to remove texdoctk stuffs from
> tetex-* packages and some member buids texdoctk independently from
> texdoctk source. The problem is, it needs some maintainer.
>
Why not build the texdoctk-package out of the tetex-bin/base sources
and tetex-maint as maintainer? Patch included.
Some other things: The manpages of epstopdf and of dvi2fax are now
delivered with tetex. Can be removed from tetex-bin/debian/
Same for makeinfo.1. It is never installed.
Just my 0,002 Cent,
Hilmar
--
sigmentation fault
diff -urN debian.old/changelog debian/changelog
--- debian.old/changelog Thu Jun 19 16:34:11 2003
+++ debian/changelog Thu Jun 19 16:02:41 2003
@@ -1,3 +1,9 @@
+tetex-base (2.0.2-4.1) unstable; urgency=low
+
+ * moved texdoctk config files to texdoctk-conffiles
+
+ -- Hilmar Preusse <hille42@web.de> Thu, 19 Jun 2003 16:02:23 +0200
+
tetex-base (2.0.2-4) unstable; urgency=low
* Fixed tetex-extra.postinst, it would now call updmap. [kohda]
diff -urN debian.old/control debian/control
--- debian.old/control Thu Jun 19 16:34:11 2003
+++ debian/control Thu Jun 19 16:01:58 2003
@@ -24,10 +24,10 @@
Package: tetex-extra
Architecture: all
Pre-Depends: dpkg (>=1.6.8)
-Conflicts: kpathsea, texlib, textfm, bibtex, texpsfnt, mfbasfnt, mfnfss, xdvik, amsfonts, amstex, amslatex, ltxmisc, ltxtool, psnfss, mfdcfnt, mflib, pandora, hyperref, tetex-french, cspsfonts, tetex-nonfree, pb-diagram, revtex4 (<= 4.0-2), tetex-eurosym, texdoctk
-Replaces: kpathsea, texlib, textfm, latex, bibtex, texidoc, texpsfnt, mfbasfnt, mfnfss, xdvik, amsfonts, amstex, amslatex, ltxmisc, ltxtool, psnfss, mfdcfnt, mflib, pandora, hyperref, cspsfonts, tetex-bin (<< 1.0.7+20021025-3), tetex-french, tetex-nonfree, pb-diagram, tetex-base (<< 2.0-2), tetex-eurosym, texdoctk
+Conflicts: kpathsea, texlib, textfm, bibtex, texpsfnt, mfbasfnt, mfnfss, xdvik, amsfonts, amstex, amslatex, ltxmisc, ltxtool, psnfss, mfdcfnt, mflib, pandora, hyperref, tetex-french, cspsfonts, tetex-nonfree, pb-diagram, revtex4 (<= 4.0-2), tetex-eurosym
+Replaces: kpathsea, texlib, textfm, latex, bibtex, texidoc, texpsfnt, mfbasfnt, mfnfss, xdvik, amsfonts, amstex, amslatex, ltxmisc, ltxtool, psnfss, mfdcfnt, mflib, pandora, hyperref, cspsfonts, tetex-bin (<< 1.0.7+20021025-3), tetex-french, tetex-nonfree, pb-diagram, tetex-base (<< 2.0-2), tetex-eurosym
Depends: tetex-base (>= 2.0), tetex-bin (>> 2.0.2-3), gsfonts, perl-tk
-Provides: tetex-nonfree, pb-diagram, tetex-eurosym, texdoctk
+Provides: tetex-nonfree, pb-diagram, tetex-eurosym
Description: extra teTeX library files
teTeX is a TeX distribution for UNIX compatible systems.
.
@@ -49,3 +49,11 @@
Documentation for the Debian teTeX distribution
.
Includes: latex2e-doc
+
+Package: texdoctk-conffiles
+Section: doc
+Architecture: all
+Description: Config-Files for texdoctk
+ These are the config files for texdoctk. As they are delivered from
+ upstream in different tar-balls, they exist in Debian separately from
+ texdoctk.
diff -urN debian.old/postrm debian/postrm
--- debian.old/postrm Thu Jun 19 16:34:11 2003
+++ debian/postrm Thu Jun 19 16:01:29 2003
@@ -4,8 +4,7 @@
rm -f /usr/share/texmf/doc /usr/share/doc/texmf/local 2>/dev/null || true
if [ "x$1" = "xpurge" ]; then
- rm -fr /var/spool/texmf /var/lib/texmf /var/cache/fonts /etc/texmf \
- /etc/texdoctk || true
+ rm -fr /var/spool/texmf /var/lib/texmf /var/cache/fonts /etc/texmf || true
fi
#DEBHELPER#
diff -urN debian.old/rules debian/rules
--- debian.old/rules Thu Jun 19 16:34:11 2003
+++ debian/rules Thu Jun 19 16:12:46 2003
@@ -89,7 +89,7 @@
debian/remove-bad-license-files
# Run dh_clean to clean up the source tree.
- dh_clean ./files* ./debian/*.files
+ dh_clean ./files* ./debian/tetex*.files
### Install the files for the packages.
@@ -139,7 +139,7 @@
# Create a list of files for tetex-extra.
- grep -E "/bluesky/|/fonts/.*/(adobe|bitstrea)/|/fonts/.*/(cmextra|gothic|pandora|concrete|rsfs|stmary|bbold|bbm|wasy)/|/fonts/.*/(ec|tc)/|/fonts/.*/ams/|/fonts/.*/sauter|/fonts/.*/urw/|/eurosym|/texdoctk|/french/|/hoekwater/|/omega/|/tex/.*/pictex/|/tex/amstex/|/texmf/.*/pstricks/|/texmf/.*/texdraw/|/texmf/.*/xypic/|/texmf/bibtex/|/texmf/metapost/" files.all-doc > files.extra
+ grep -E "/bluesky/|/fonts/.*/(adobe|bitstrea)/|/fonts/.*/(cmextra|gothic|pandora|concrete|rsfs|stmary|bbold|bbm|wasy)/|/fonts/.*/(ec|tc)/|/fonts/.*/ams/|/fonts/.*/sauter|/fonts/.*/urw/|/eurosym|/french/|/hoekwater/|/omega/|/tex/.*/pictex/|/tex/amstex/|/texmf/.*/pstricks/|/texmf/.*/texdraw/|/texmf/.*/xypic/|/texmf/bibtex/|/texmf/metapost/" files.all-doc > files.extra
# Drop docs and extra from a list.
sort files.all-doc files.extra | uniq -u > files.all-doc-extra
@@ -260,10 +260,13 @@
dh_movefiles --sourcedir=debian/$(package)
# texdoctk stuffs
- mv debian/$(extra)/usr/share/texmf/texdoctk debian/$(extra)/etc
- (cd debian/$(extra)/etc/texdoctk; mv texdocrc.defaults texdocrc)
+ cp -a texmf/texdoctk debian/texdoctk-conffiles/etc
+# mv debian/$(extra)/usr/share/texmf/texdoctk debian/$(extra)/etc
+ (cd debian/texdoctk-conffiles/etc/texdoctk; mv texdocrc.defaults texdocrc)
+# (cd debian/$(extra)/etc/texdoctk; mv texdocrc.defaults texdocrc)
# rm -f debian/$(extra)/etc/texdoctk/texdoc-103.dat-orig
- (cd debian/$(extra)/usr/share/texmf; ln -s /etc/texdoctk .)
+ (cd debian/texdoctk-conffiles/usr/share/texmf; ln -s /etc/texdoctk .)
+# (cd debian/$(extra)/usr/share/texmf; ln -s /etc/texdoctk .)
# empty directory
-rmdir $(txmfdir)/texdoctk
diff -urN debian.old/texdoctk-conffiles.dirs debian/texdoctk-conffiles.dirs
--- debian.old/texdoctk-conffiles.dirs Thu Jan 1 01:00:00 1970
+++ debian/texdoctk-conffiles.dirs Thu Jun 19 16:31:31 2003
@@ -0,0 +1,2 @@
+etc/texdoctk
+usr/share/texmf
diff -urN debian.old/texdoctk-conffiles.files debian/texdoctk-conffiles.files
--- debian.old/texdoctk-conffiles.files Thu Jan 1 01:00:00 1970
+++ debian/texdoctk-conffiles.files Thu Jun 19 16:13:28 2003
@@ -0,0 +1 @@
+etc/texdoctk/*
diff -urN debian.old/texdoctk-conffiles.postrm debian/texdoctk-conffiles.postrm
--- debian.old/texdoctk-conffiles.postrm Thu Jan 1 01:00:00 1970
+++ debian/texdoctk-conffiles.postrm Thu Jun 19 16:01:14 2003
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "x$1" = "xpurge" ]; then
+ rm -fr /etc/texdoctk || true
+fi
+
+#DEBHELPER#
diff -urN debian.old/README.Debian debian/README.Debian
--- debian.old/README.Debian Thu Jun 19 13:30:39 2003
+++ debian/README.Debian Thu Jun 19 14:02:01 2003
@@ -68,9 +68,8 @@
- Is texmf.cnf modified a lot? Please check /etc/texmf/texmf.d/
- Do you set any TeX related environment variables?
- Try again. This might work in some cases.
-- For amstex, metapost, eurosym, texdoctk, txfonts, pxfonts etc. you need
- tetex-extra at present.
- (pdftex/pdflatex should work basically only with tetex-base now.)
+- For amstex, metapost, eurosym, txfonts, pxfonts etc. you need tetex-extra
+ at present. (pdftex/pdflatex should work basically only with tetex-base now.)
- Is your language.dat correct?
How to report a bug:
diff -urN debian.old/changelog debian/changelog
--- debian.old/changelog Thu Jun 19 13:30:39 2003
+++ debian/changelog Thu Jun 19 15:01:48 2003
@@ -1,3 +1,9 @@
+tetex-bin (2.0.2-4.2) unstable; urgency=low
+
+ * moved texdoctk out of tetex-bin
+
+ -- Hilmar Preusse <hille42@web.de> Thu, 19 Jun 2003 15:01:09 +0200
+
tetex-bin (2.0.2-4.1) unstable; urgency=low
* Fixed debian/config [kohda] (Closes: #195604, #195621)
diff -urN debian.old/control debian/control
--- debian.old/control Thu Jun 19 13:30:39 2003
+++ debian/control Thu Jun 19 15:29:50 2003
@@ -46,3 +46,16 @@
Description: kpathsea.a and include files for teTeX
Custom kpathsea library to build tex binaries for teTeX
+Package: texdoctk
+Priority: optional
+Architecture: all
+Conflicts: tetex-bin (<= 2.0.2-4.2), tetex-extra (<= 2.0.2-4.1)
+Depends: perl-tk, tetex-base, tetex-doc, tetex-bin, gv | postscript-viewer, gv | pdf-viewer, w3m | www-browser, xterm | x-terminal-emulator, mime-support, texdoctk-conffiles
+Recommends: html2ps, a2ps, gs
+Suggests: lpr, tetex-extra, texinfo
+Description: GUI for easier access of TeX package and program documentations
+ texdoctk is a GUI for easier access of a large part of the vast amount
+ of package and program documentations and tutorials for TeX and its
+ different derivatives (mainly LaTeX).
+ .
+ It is delivered with teTeX 2.0 but split off in Debian.
\ No newline at end of file
diff -urN debian.old/menu debian/menu
--- debian.old/menu Thu Jun 19 13:30:39 2003
+++ debian/menu Thu Jun 19 13:44:02 2003
@@ -4,6 +4,3 @@
title="XDvi"\
command="/usr/bin/xdvi"\
hints="DVI,Documents"
-?package(tetex-bin):needs=X11 section=Help \
- title="Texdoctk" command="/usr/bin/texdoctk"
-
diff -urN debian.old/rules debian/rules
--- debian.old/rules Thu Jun 19 13:30:39 2003
+++ debian/rules Thu Jun 19 15:35:36 2003
@@ -201,10 +201,10 @@
dh_testdir
dh_testroot
dh_installdebconf
- dh_installdocs -p$(package) -p$(sublib)
+ dh_installdocs -p$(package) -p$(sublib) -ptexdoctk
dh_installexamples
dh_installchangelogs -p$(package) -p$(sublib) ChangeLog
- dh_installmenu
+ dh_installmenu -A
dh_installcron
dh_installman new-manpages/[a-z]*
# dh_undocumented fdf2tan.1 makempy.1 mptopdf.1 omfonts.1 texfont.1 texfind.1 mktexfmt.8 ebb.1 pdftosrc.1
@@ -212,7 +212,7 @@
dh_strip
dh_compress
dh_fixperms
- dh_perl
+ dh_perl -A
dh_makeshlibs -V
dh_installdeb
dh_shlibdeps
diff -urN debian.old/texdoctk.files debian/texdoctk.files
--- debian.old/texdoctk.files Thu Jan 1 01:00:00 1970
+++ debian/texdoctk.files Thu Jun 19 14:42:47 2003
@@ -0,0 +1,2 @@
+usr/bin/texdoctk
+usr/share/man/man1/texdoctk.1
diff -urN debian.old/texdoctk.menu debian/texdoctk.menu
--- debian.old/texdoctk.menu Thu Jan 1 01:00:00 1970
+++ debian/texdoctk.menu Thu Jun 19 13:44:10 2003
@@ -0,0 +1,2 @@
+?package(tetex-bin):needs=X11 section=Help \
+ title="Texdoctk" command="/usr/bin/texdoctk"
Reply to: