[subversion-commit] SVN tetex commit + diffs: r375 - in tetex-base/trunk/debian: . rules.d

Frank Küster frank at costa.debian.org
Mon Dec 5 18:39:29 UTC 2005


Author: frank
Date: 2005-12-05 18:39:28 +0000 (Mon, 05 Dec 2005)
New Revision: 375

Removed:
   tetex-base/trunk/debian/setup-ucf.in
Modified:
   tetex-base/trunk/debian/NEWS.Debian
   tetex-base/trunk/debian/TODO
   tetex-base/trunk/debian/changelog
   tetex-base/trunk/debian/control
   tetex-base/trunk/debian/postinst.in
   tetex-base/trunk/debian/preinst.in
   tetex-base/trunk/debian/rules
   tetex-base/trunk/debian/rules.d/filelists.mk
   tetex-base/trunk/debian/rules.d/install.mk
   tetex-base/trunk/debian/rules.in
   tetex-base/trunk/debian/setup-conflinks.in
   tetex-base/trunk/debian/tetex-base.dirs.in
   tetex-base/trunk/debian/tetex-extra.postinst.in
   tetex-base/trunk/debian/variables
Log:
- install files in TEXMFDIST
- do not install TeX input files in TEXMFSYSCONFIG
- first transitional code, not yet tested and refined


Modified: tetex-base/trunk/debian/NEWS.Debian
===================================================================
--- tetex-base/trunk/debian/NEWS.Debian	2005-12-05 18:38:41 UTC (rev 374)
+++ tetex-base/trunk/debian/NEWS.Debian	2005-12-05 18:39:28 UTC (rev 375)
@@ -1,3 +1,20 @@
+tetex-base (3.0-11) unstable; urgency=low
+
+  * Configuration file handling:
+
+    teTeX does no longer ship any TeX input or map files as configuration
+    files (see tetex-bin's README.Debian, section "Configuration file
+    placement".  Former conffiles are removed if they are unchanged from
+    the last distributed version.
+
+  * New TEXMF trees
+  
+    teTeX now installs its files into /usr/share/texmf-tetex, accessible
+    as TEXMFDIST.  It also depends on a version of tex-common that
+    supports the new TEXMFSYSCONFIG tree in /etc/texmf.
+  
+ -- Frank Küster <frank at debian.org>  Mon,  5 Dec 2005 18:02:19 +0100
+
 tetex-base (3.0-7) unstable; urgency=low
 
   * The new TeX Directory Structure (TDS) has new locations for some font

Modified: tetex-base/trunk/debian/TODO
===================================================================
--- tetex-base/trunk/debian/TODO	2005-12-05 18:38:41 UTC (rev 374)
+++ tetex-base/trunk/debian/TODO	2005-12-05 18:39:28 UTC (rev 375)
@@ -5,29 +5,15 @@
 - Generally look at the documentation - should we add some
    Debian-specific information in doc/texmf?
 
-- after upgrade from 2.0.2 to 3.0, remove, and install again, dpkg
-   thinks cyrtex.cfg is modified (because it is _gone_!)
-
-   not reproducible
-
 - check perl/ruby scripts for dependencies
 
 - adapt tetex-xwarn wrapper for XML::Parser
 
 - permissions of language.dat?
 
-- needs a transition from 00updmap.cfg to 00tetex-base.cfg and language.dat
-
-- after upgrade, with tetex-extra, lambda.ini is left over (only when
-   purging package by package?)  Also, 00tetex.cnf in fmt.d seems to
-   be left
-
-- are there already TDS upgrade instructions in NEWS.Debian?
-
 - the README.pst-osci with the new license information is lost
 
-- /etc/texmf/map/dvips/context/original-context-symbol.map is changed
-   (newline)
-
 - /etc/texmf/updmap.d/00updmap.cfg.dpkg-dist is created without
    asking?
+
+- the symlink-to-dir stuff is missing in tetex-base's postrm

Modified: tetex-base/trunk/debian/changelog
===================================================================
--- tetex-base/trunk/debian/changelog	2005-12-05 18:38:41 UTC (rev 374)
+++ tetex-base/trunk/debian/changelog	2005-12-05 18:39:28 UTC (rev 375)
@@ -6,9 +6,10 @@
   * Remove tetex-extra's format and log files when the package is removed,
     thanks to Kevin B. McCarty <kmccarty at princeton.edu> (closes: #341110)
     [frank]
-  * Install files in TEXMFDIST, i.e. /usr/share/texmf-tetex [frank]
+  * Install files in TEXMFDIST, i.e. /usr/share/texmf-tetex, and depend on
+    tex-common (>=0.12) [frank]
 
- -- Frank Küster <frank at debian.org>  Mon,  5 Dec 2005 16:17:26 +0100
+ -- Frank Küster <frank at debian.org>  Mon,  5 Dec 2005 18:31:39 +0100
 
 tetex-base (3.0-10) unstable; urgency=low
 

Modified: tetex-base/trunk/debian/control
===================================================================
--- tetex-base/trunk/debian/control	2005-12-05 18:38:41 UTC (rev 374)
+++ tetex-base/trunk/debian/control	2005-12-05 18:39:28 UTC (rev 375)
@@ -8,7 +8,7 @@
 
 Package: tetex-base
 Architecture: all
-Depends: ${misc:Depends}, ucf (>= 1.02), tex-common (>= 0.7)
+Depends: ${misc:Depends}, ucf (>= 1.02), tex-common (>= 0.12)
 Replaces: texidoc, bibtex, texpsfnt, mfbasfnt, xdvik, dvipsk, mfnfss, latex, texlib, mflib, textfm, kpathsea, latex2e-doc, ltxgraph, csplain, cslatex, cstexfonts, tetex-extra (<< 2.0.2a-1), tetex-doc (<< 1.0.2+20011128), tetex-nonfree, pxfonts, txfonts, mfpic, texdoctk, tetex-bin (<< 2.99)
 Pre-Depends: dpkg (>=1.6.8)
 Conflicts: texidoc, bibtex, texpsfnt, mfbasfnt, xdvik, mfnfss, texlib, mflib, textfm, kpathsea, latex2e-doc, ltxgraph, csplain, cslatex, cstexfonts, tetex-bin (<= 2.99.7), xbase (<< 3.3.2.3a-2), tetex-nonfree (<< 1.0.2+20000804-2), pxfonts, txfonts, mfpic, cspsfonts, arabtex (<= 3.10-5)

Modified: tetex-base/trunk/debian/postinst.in
===================================================================
--- tetex-base/trunk/debian/postinst.in	2005-12-05 18:38:41 UTC (rev 374)
+++ tetex-base/trunk/debian/postinst.in	2005-12-05 18:39:28 UTC (rev 375)
@@ -95,10 +95,12 @@
     # upgrading from pre-release sarge: it is now safe to remove obsolete dirs
     for dir in $NOWLINKDIRS; do
       postinst_remove_saveddir /usr/share/texmf/$dir
+      postinst_remove_saveddir /usr/share/texmf-tetex/$dir
     done
     # this change is from 2.0.2 to 3.0
     for link in $NOWDIRLINKS; do
       postinst_remove_savedlink /usr/share/texmf/$link
+      postinst_remove_savedlink /usr/share/texmf-tetex/$link
     done
 
 # rename unused conffiles. This must be done after moving (in
@@ -110,9 +112,6 @@
     done
 
     
-# handling of ucf-managed configuration files
-    /usr/share/tetex-base/setup-ucf -base
-
 # Update language.dat (update-language is in tex-common on which we depend)
     update-language
 

Modified: tetex-base/trunk/debian/preinst.in
===================================================================
--- tetex-base/trunk/debian/preinst.in	2005-12-05 18:38:41 UTC (rev 374)
+++ tetex-base/trunk/debian/preinst.in	2005-12-05 18:39:28 UTC (rev 375)
@@ -69,12 +69,13 @@
   upgrade|install)
 # change directories to symlinks in a safe way, thanks to Branden Robinson:
 # dpkg won't change a directory to a symlink; therefore we first move it out of the way      
-    for dir in $NOWLINKDIRS; do
-      preinst_move_dir /usr/share/texmf/$dir
-    done
-# same in the other direction
+#     for dir in $NOWLINKDIRS; do
+#       preinst_move_dir /usr/share/texmf/$dir
+#     done
+# same in the other direction, once in /usr/share/texmf and once in /usr/share/texmf-tetex
     for dir in $NOWDIRLINKS; do
       preinst_move_symlink /usr/share/texmf/$dir
+      preinst_move_symlink /usr/share/texmf-tetex/$dir
     done
 
 # force removal of a file diversion of dvipdfm
@@ -84,30 +85,32 @@
 	--divert ${dvipdfmdef}.tetex ${dvipdfmdef}
     fi
 # move conffiles from their 2.0.2 locations
-    for conffile in $MOVE_GENERIC_UCF; do
-      dest=/etc/texmf/generic/`basename $conffile`
-      source=/etc/texmf/latex/`basename $conffile`
-      move_old_conffile $source $dest
-    done
-    for conffile in $MOVE_CONTEXT_UCF $MOVE_CONTEXT_NOUCF; do
-      source=/etc/texmf/<:=$contextmaps_oldplace:>/`basename $conffile`
-      dest=/etc/texmf/<:=$contextmaps_newplace:>/`basename $conffile`
-      move_old_conffile $source $dest nocomment
-    done
-    move_old_conffile /etc/texmf/dvips/context.map \
-      /etc/texmf/map/dvips/tetex/contnav.map
-    move_old_conffile /etc/texmf/etex/language.def \
-      /etc/texmf/plain/language.def nocomment # no ucf needed?
-    move_old_conffile /etc/texmf/pdftex/cmttf.map \
-      /etc/texmf/map/pdftex/cmttf/cmttf.map nocomment # no ucf needed?
+#     for conffile in $MOVE_GENERIC_UCF; do
+#       dest=/etc/texmf/generic/`basename $conffile`
+#       source=/etc/texmf/latex/`basename $conffile`
+#       move_old_conffile $source $dest
+#     done
+#     for conffile in $MOVE_CONTEXT_UCF $MOVE_CONTEXT_NOUCF; do
+#       source=/etc/texmf/<:=$contextmaps_oldplace:>/`basename $conffile`
+#       dest=/etc/texmf/<:=$contextmaps_newplace:>/`basename $conffile`
+#       move_old_conffile $source $dest nocomment
+#     done
+#     move_old_conffile /etc/texmf/dvips/context.map \
+#       /etc/texmf/map/dvips/tetex/contnav.map
+#     move_old_conffile /etc/texmf/etex/language.def \
+#       /etc/texmf/plain/language.def nocomment # no ucf needed?
+#     move_old_conffile /etc/texmf/pdftex/cmttf.map \
+#       /etc/texmf/map/pdftex/cmttf/cmttf.map nocomment # no ucf needed?
 
     ;;
   abort-upgrade)
     for dir in $NOWLINKDIRS; do
-      preinst_restore_dir $dir
+      preinst_restore_dir /usr/share/texmf/$dir
+      preinst_restore_dir /usr/share/texmf-tetex/$dir
     done
     for dir in $NOWDIRLINKS; do
-      preinst_restore_symlink $dir
+      preinst_restore_symlink /usr/share/texmf/$dir
+      preinst_restore_symlink /usr/share/texmf-tetex/$dir
     done
     ;;
 esac

Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules	2005-12-05 18:38:41 UTC (rev 374)
+++ tetex-base/trunk/debian/rules	2005-12-05 18:39:28 UTC (rev 375)
@@ -15,11 +15,11 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=3
 
-EPERL_FILES := debian/preinst debian/postinst debian/prerm debian/postrm \
+EPERL_FILES := debian/preinst debian/postinst debian/postrm \
    debian/tetex-base.dirs \
    debian/tetex-extra.postinst debian/tetex-extra.preinst \
    debian/tetex-extra.postrm debian/tetex-extra.dirs \
-   debian/setup-ucf debian/setup-conflinks \
+   debian/setup-conflinks \
    debian/common.functions
 eperl_sourcefiles=debian/variables debian/COPYRIGHT.scripts \
    debian/common.variables debian/common.functions
@@ -32,8 +32,8 @@
 package=tetex-base
 extra=tetex-extra
 docpack=tetex-doc
-txmfdir=debian/$(package)/usr/share/texmf
-extxmfdir=debian/$(extra)/usr/share/texmf
+txmfdir=debian/$(package)/usr/share/texmf-tetex
+extxmfdir=debian/$(extra)/usr/share/texmf-tetex
 vardir=debian/$(package)/var/lib/texmf
 pkgdir=debian/$(package)/usr/share/tetex-base
 etcdir=/etc/texmf
@@ -196,8 +196,6 @@
 	install -D --mode=755 debian/reportbug.base debian/$(package)/usr/share/bug/tetex-base/script
 	install -D --mode=644 debian/reportbug-control.base debian/$(package)/usr/share/bug/tetex-base/control
 	install -D --mode=755 debian/reportbug.extra debian/$(extra)/usr/share/bug/tetex-extra/script
-# Install scripts for postinst
-	install -D --mode=755 debian/setup-ucf debian/$(package)/usr/share/$(package)/setup-ucf
 
 	dh_fixperms -i --exclude=var/cache/fonts
 	dh_gencontrol -i

Modified: tetex-base/trunk/debian/rules.d/filelists.mk
===================================================================
--- tetex-base/trunk/debian/rules.d/filelists.mk	2005-12-05 18:38:41 UTC (rev 374)
+++ tetex-base/trunk/debian/rules.d/filelists.mk	2005-12-05 18:39:28 UTC (rev 375)
@@ -111,8 +111,8 @@
 
 debian/tetex-extra.files : $(stampdir)/files.extra
 # Process files.extra into a debian/tetex-extra.files file that can be
-# used by dh_movefiles; cater for files that are going to be moved to /etc
-	sed -e "s#debian/tetex-base/##;s#usr/share/texmf-tetex/fonts/map#etc/texmf/map#" \
+# used by dh_movefiles
+	sed -e "s#debian/tetex-base/##" \
             $(stampdir)/files.extra > debian/tetex-extra.files
 
 

Modified: tetex-base/trunk/debian/rules.d/install.mk
===================================================================
--- tetex-base/trunk/debian/rules.d/install.mk	2005-12-05 18:38:41 UTC (rev 374)
+++ tetex-base/trunk/debian/rules.d/install.mk	2005-12-05 18:39:28 UTC (rev 375)
@@ -76,6 +76,7 @@
 
 # setup map state directory
 	cp debian/README.texmaps debian/$(package)/usr/share/$(package)/
+
 ## Done installing tetex-base!
 	touch $@
 
@@ -139,7 +140,7 @@
 	find debian/$(package)/usr/share/texmf-tetex -type d -empty | xargs rmdir || true
 	find debian/$(package)/usr/share/texmf-tetex -type d -empty | xargs rmdir || true
 	find debian/$(package)/usr/share/texmf-tetex -type d -empty | xargs rmdir || true
-	find debian/$(package)/usr/share/doc/texmf-tetex -type d -empty | xargs rmdir || true
-	find debian/$(package)/usr/share/doc/texmf-tetex -type d -empty | xargs rmdir || true
-	find debian/$(package)/usr/share/doc/texmf-tetex -type d -empty | xargs rmdir || true
+	find debian/$(package)/usr/share/doc/texmf -type d -empty | xargs rmdir || true
+	find debian/$(package)/usr/share/doc/texmf -type d -empty | xargs rmdir || true
+	find debian/$(package)/usr/share/doc/texmf -type d -empty | xargs rmdir || true
 endef

Modified: tetex-base/trunk/debian/rules.in
===================================================================
--- tetex-base/trunk/debian/rules.in	2005-12-05 18:38:41 UTC (rev 374)
+++ tetex-base/trunk/debian/rules.in	2005-12-05 18:39:28 UTC (rev 375)
@@ -24,7 +24,7 @@
    debian/tetex-base.dirs \
    debian/tetex-extra.postinst debian/tetex-extra.preinst \
    debian/tetex-extra.postrm debian/tetex-extra.dirs \
-   debian/setup-ucf debian/setup-conflinks \
+   debian/setup-conflinks \
    debian/common.functions
 eperl_sourcefiles=debian/variables debian/COPYRIGHT.scripts \
    debian/common.variables debian/common.functions
@@ -201,8 +201,6 @@
 	install -D --mode=755 debian/reportbug.base debian/$(package)/usr/share/bug/tetex-base/script
 	install -D --mode=644 debian/reportbug-control.base debian/$(package)/usr/share/bug/tetex-base/control
 	install -D --mode=755 debian/reportbug.extra debian/$(extra)/usr/share/bug/tetex-extra/script
-# Install scripts for postinst
-	install -D --mode=755 debian/setup-ucf debian/$(package)/usr/share/$(package)/setup-ucf
 
 	dh_fixperms -i --exclude=var/cache/fonts
 	dh_gencontrol -i

Modified: tetex-base/trunk/debian/setup-conflinks.in
===================================================================
--- tetex-base/trunk/debian/setup-conflinks.in	2005-12-05 18:38:41 UTC (rev 374)
+++ tetex-base/trunk/debian/setup-conflinks.in	2005-12-05 18:39:28 UTC (rev 375)
@@ -13,191 +13,50 @@
 #EXTD=$extra_prefix/usr/share/texmf/dvips
 #EXETC=$extra_prefix${DVIPS}
 basedir=debian/tetex-base
-ldatdir=$basedir/etc/texmf/generic/
 pkgdir=$basedir/usr/share/tetex-base
+ldatdir=$basedir/usr/share/texmf-tetex/tex/generic/config
 LANGUAGE_DIR="$basedir/<:=$LANGUAGE_DIR:>"
 LANGUAGE_MEMORY_DIR=<:=$LANGUAGE_MEMORY_DIR:>
 
-# dvips_generated="download35.map builtin35.map psfonts_t1.map psfonts_pk.map \
-#    ps2pk.map"
-# pdftex_generated="pdftex_dl14.map pdftex_ndl14.map"
-# dvipdfm_generated="dvipdfm_dl14.map dvipdfm_ndl14.map"
 
-BASE_UCF="<:=$BASE_UCF:>"
-BLUESKY_UCF="<:=$BLUESKY_UCF:>"
-MOVE_GENERIC_UCF="<:=$MOVE_GENERIC_UCF:>"
-#BLUESKY="psfonts.ams  psfonts.cm psfonts.amz psfonts.cmz"
-config_misc="mirr"
-config_antp="antp"
-config_antt="antt"
-config_tetex="outline dfaxhigh pdf dfaxlo pk download35 www gsftopk"
-config_pl="pl"
-config_qfonts="qbk qcr qhv qpl qtm qzc"
-config_omega="omega"
 
-base_confdirs="
-context/config
-"
-
-BASE_CONFFILES="
-tex/cslatex/fonttext.cfg
-tex/cslatex/hyphen.cfg
-tex/latex/base/latex209.cfg
-tex/latex/base/ltxdoc.cfg
-tex/latex/base/ltxguide.cfg
-tex/latex/base/texsys.cfg
-tex/latex/graphics/color.cfg
-tex/latex/graphics/graphics.cfg
-context/config/texexec.ini
-context/config/texexec.rme
-tex/context/config/cont-usr.tex
-"
-EXTRA_CONFFILES_NOFINDNAME="tex/latex/seminar/seminar.con"
-
-
 ###################################
-# Function definition
-###################################
-
-#  move_and_link pdftex/config pdftex
-move_and_link (){
-  source=$1
-  dest=$2 # `.' means: directly in /etc/texmf; no trailing /
-  newname=$3
-  texmfdir=debian/$package/usr/share/texmf
-  sourcedir=$texmfdir/`dirname $source`
-  sourcedir=${sourcedir%./} # unnoetig
-  dest=${dest%.} #unnoetig
-  oldname=`basename $source`
-  if [ -z "$newname" ]; then 
-    newname="$oldname"
-  fi
-  # TODO: use variable names here for the directories
-  if [ -n "$dest" ]; then # not directly in /etc/texmf
-    if [ ! -d debian/$package/etc/texmf/$dest ]; then mkdir -p debian/$package/etc/texmf/$dest; fi
-    destdir=debian/$package/etc/texmf/$dest
-    linkdir=/etc/texmf/$dest
-  else
-    destdir=debian/$package/etc/texmf/
-    linkdir=/etc/texmf
-  fi
-  if [ -f $sourcedir/$oldname -o -d $sourcedir/$oldname ]; then
-    mv $sourcedir/$oldname $destdir/$newname
-    (cd $sourcedir; ln -s $linkdir/$newname $oldname)
-  else
-    echo "*** $sourcedir/$source doesn't exist"
-    exit 1
-  fi
-}
-find_ucf_file(){
-  name=`basename $1`
-  # I want perl for this function
-  numhits=`find debian/$package/ -type f -name $name | wc -l`
-  if [ $numhits -eq 1 ]; then
-    pattern="."
-  else
-    case $name in 
-      language.dat|fonttext.cfg)
-	pattern=generic
-	;;
-    esac
-  fi
-  find debian/$package/ -type f -name $name | grep "$pattern"
-}
-
-###################################
 # Here starts the main program
 ###################################
 
 if [ x"$1" = "x-base" ] ; then
   package=tetex-base
+  texmfdir=debian/$package/usr/share/texmf-tetex
 
-# Miscellaneous config files
-
-  for file in $BASE_CONFFILES; do
-    destdir0=`dirname $file`
-    destdir0=${destdir0#tex/}
-    destdir=${destdir0%%/*}
-    move_and_link $file $destdir
-  done
-  move_and_link tex/generic/config . generic
-  move_and_link tex/cyrplain/config/cyrtex.cfg cyrplain
-  move_and_link tex/plain/config/language.def plain 
-  move_and_link tex/platex/config/language.dat platex
-  move_and_link tex/platex/config/hyphen.cfg platex
 # install latex's language dat in language.d
   sed -n -e '0,\@^% The hyphenation pattern files are in the dir@ d; 0,/^$/ d; p' \
     $ldatdir/language.dat >> $LANGUAGE_DIR/00tetex.cnf
   rm $ldatdir/language.dat
   cp debian/tetex-base.language.list debian/$package/$LANGUAGE_MEMORY_DIR/tetex-base.list
 
-
 # remove upstream's updmap.cfg
-  rm debian/$package/usr/share/texmf/web2c/updmap.cfg
-# ucf move
-  for name in $BASE_UCF; do
-    # this could probably be easier if the files would be taken from their place in etc
-    file=`find_ucf_file $name`
-    mv $file $pkgdir;
-    cp debian/md5sums/`basename $file`.md5sum $pkgdir/
-  done
-  ln -s /etc/texmf/mktex.cnf debian/$package/usr/share/texmf/web2c/
-  ln -s /etc/texmf/dvips/config.builtin35 debian/$package/usr/share/texmf/dvips/tetex/
-#
-# now in tex-common
-#
-# Remove the out-of-date ls-R file from /usr/share/texmf.  The symlink
-# to one is in tex-common
-   rm -f debian/$package/usr/share/texmf/ls-R
-#  ln -s /var/lib/texmf/ls-R-TEXMFMAIN debian/$package/usr/share/texmf/ls-R
+  rm $texmfdir/web2c/updmap.cfg
 
+   rm -f $texmfdir/ls-R
+# create our ls-R symlink
+  ln -s /var/lib/texmf/ls-R-TEXMFDIST-TETEX $texmfdir/ls-R
+
   # texdoctk stuff
-  mv debian/tetex-base/usr/share/texmf/texdoctk debian/tetex-base/etc
-  ln -s /etc/texdoctk debian/tetex-base/usr/share/texmf
-  # texdocrc is not in BASE_UCF, and therefore must be handled separately
+  mv $texmfdir/texdoctk debian/$package/etc
+  ln -s /etc/texdoctk $texmfdir
+  # texdocrc is handled by ucf
   mv debian/$package/etc/texdoctk/texdocrc.defaults $pkgdir/texdocrc
   cp debian/md5sums/texdocrc.md5sum $pkgdir/
 
 #####
 # Font configuration
 #####
-  move_and_link metafont/misc/modes.mf . 
-  move_and_link dvips/config . dvips
-  move_and_link dvipdfm/config . dvipdfm
-  move_and_link fonts/map/dvips map dvips
-  move_and_link fonts/map/dvipdfm map dvipdfm
-  move_and_link fonts/map/pdftex map pdftex
-  for family in antp antt misc tetex pl qfonts omega; do
-    eval configname="\$config_$family"
-    for config in $configname; do
-      move_and_link dvips/$family/config.$config dvips
-    done
-  done
-  move_and_link dvips/omega/omega.cfg dvips
 
 elif [ x"$1" = "x-extra" ] ; then
   package=tetex-extra
-  EXTRA_CONFFILES_LATEX="`find debian/tetex-extra/usr/share/texmf/tex/latex -name "*.cfg"`"
-  EXTRA_CONFFILES_LAMBDA="`find debian/tetex-extra/usr/share/texmf/tex/lambda -name "*.cfg"`"
+  texmfdir=debian/$package/usr/share/texmf-tetex
 
-
-  move_and_link tex/lambda/config . lambda
-
-  for file in $EXTRA_CONFFILES_LATEX $EXTRA_CONFFILES_NOFINDNAME; do
-    filename=${file#debian/tetex-extra/usr/share/texmf}
-    move_and_link $filename latex
-  done
-  for file in $EXTRA_CONFFILES_LAMDA; do
-    filename=${file#debian/tetex-extra/usr/share/texmf}
-    move_and_link $filename lambda
-  done
-
-  # ucf move
-  for file in $BLUESKY_UCF; do
-    mv debian/$package/usr/share/texmf/dvips/bluesky/$file debian/$package/usr/share/$package
-    ln -s /etc/texmf/dvips/$file debian/$package/usr/share/texmf/dvips/bluesky/
-  done
-
+  :
 else
   echo "Bad usage!"
   exit 1

Deleted: tetex-base/trunk/debian/setup-ucf.in
===================================================================
--- tetex-base/trunk/debian/setup-ucf.in	2005-12-05 18:38:41 UTC (rev 374)
+++ tetex-base/trunk/debian/setup-ucf.in	2005-12-05 18:39:28 UTC (rev 375)
@@ -1,51 +0,0 @@
-#include variables
-#!/bin/sh -e
-# 
-# setup-ucf script for the Debian tetex-base and -extra packages.
-# $Id: setup-ucf.in,v 1.1.2.2 2005/02/16 12:26:04 frank Exp $
-<:=@COPYRIGHT:>//
-
-
-## variables
-#UCF="ucf --verbose -d --debconf-ok"
-UCF="ucf --debconf-ok"
-
-if [ "$1" = "-base" ]; then
-  package=tetex-base
-elif [ "$1" = "-extra" ]; then
-  package=tetex-extra
-fi
-
-DVIPS=/etc/texmf/dvips
-UCF_SOURCEDIR=/usr/share/$package
-
-
-BLUESKY_UCF="<:=$BLUESKY_UCF:>"
-BASE_UCF="<:=$BASE_UCF:>"
-
-
-# start the work
-
-if [ x"$1" = "x-base" ] ; then
-
-  for name in $BASE_UCF; do
-    filename=`basename $name`
-    $UCF $UCF_SOURCEDIR/$filename /etc/texmf/$name
-  done
-  $UCF $UCF_SOURCEDIR/texdocrc /etc/texdoctk/texdocrc
-
-elif [ x"$1" = "x-extra" ] ; then
-
-  for file in $BLUESKY_UCF; do
-    $UCF $UCF_SOURCEDIR/$file $DVIPS/$file
-  done
-
-else
-  echo "Bad usage!"
-  exit 1
-fi
-
-# Local Variables:
-# mode: shell-script
-# skeleton-pair: t
-# End:

Modified: tetex-base/trunk/debian/tetex-base.dirs.in
===================================================================
--- tetex-base/trunk/debian/tetex-base.dirs.in	2005-12-05 18:38:41 UTC (rev 374)
+++ tetex-base/trunk/debian/tetex-base.dirs.in	2005-12-05 18:39:28 UTC (rev 375)
@@ -1,14 +1,10 @@
 #include variables
-usr/share/texmf
+usr/share/texmf-tetex
 usr/share/doc/tetex-base
 usr/share/tetex-base/maps
 etc/X11/app-defaults
 etc/texmf/updmap.d
 <:=$LANGUAGE_DIR:>
-etc/texmf/map
-etc/texmf/plain
-etc/texmf/platex
-etc/texmf/cyrplain
 var/lib/texmf/web2c
 var/lib/tex-common/fontmap-cfg
 var/lib/tex-common/language-cnf

Modified: tetex-base/trunk/debian/tetex-extra.postinst.in
===================================================================
--- tetex-base/trunk/debian/tetex-extra.postinst.in	2005-12-05 18:38:41 UTC (rev 374)
+++ tetex-base/trunk/debian/tetex-extra.postinst.in	2005-12-05 18:39:28 UTC (rev 375)
@@ -2,7 +2,7 @@
 #!/bin/sh -e
 # 
 # postinst maintainer script for the Debian tetex-extra package.
-# $Id: tetex-extra.postinst.in,v 1.1.2.2 2004/12/30 14:05:20 frank Exp $
+# $Id$
 <:=@COPYRIGHT:>//
 
 ## Define static variables we need
@@ -19,7 +19,6 @@
   configure|abort-*)
     # here starts the real postinst stuff
 
-    /usr/share/tetex-base/setup-ucf -extra
     mktexlsr
     echo "Creating missing formats."
     create_tetex_formats --missing

Modified: tetex-base/trunk/debian/variables
===================================================================
--- tetex-base/trunk/debian/variables	2005-12-05 18:38:41 UTC (rev 374)
+++ tetex-base/trunk/debian/variables	2005-12-05 18:39:28 UTC (rev 375)
@@ -49,8 +49,10 @@
 <:### Variables needed for upgrades since woody:>//
 <:$OLD_WEB2C="/usr/share/texmf/web2c":>//
 <:$WOODY_FMTCNF="$PKG_SHAREDIR/fmtutil.cnf.1.0.7":>//
-<:$NOWLINKDIRS="tex/generic/config":>//
-<:$NOWDIRLINKS="tex/latex/config tex/platex/config tex/cyrplain/config tex/context/config":>//
+<:$NOWLINKDIRS="":>//
+<:$NOWDIRLINKS="tex/latex/config tex/platex/config tex/cyrplain/config tex/context/config \
+ dvips/config fonts/map/dvipdfm fonts/map/dvips fonts/map/pdftex dvipdfm/config \
+ tex/generic/config tex/lambda/config":>//
 <:$OLD_TEXDOCTK="texdoc-100.dat texdoc-102.dat texdoc-103.dat":>//
 <:### Variables needed for upgrades since sarge:>//
 <:# Misc package variables:>//




More information about the Pkg-tetex-commits mailing list