[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: plan of next upload



> If possible, I would like to fix

> - rename of non-used configuration files under /etc/texmf

I tried this one.  Please check the following patches;
A bit long, sorry.  (I didn't cvs checkout yet.)

I welcome any comments.

Regards,			2003-10-13(Mon)

-- 
 Debian Developer & Debian JP Developer - much more I18N of Debian
 Atsuhito Kohda <kohda@debian.org>
 Department of Math., Univ. of Tokushima

--- tetex-base-2.0.2/debian/postinst	2003-05-30 13:54:57.000000000 +0900
+++ tetex-base/debian/postinst	2003-10-07 15:45:31.000000000 +0900
@@ -50,14 +50,14 @@
 if [ x"$1" = xconfigure ]
 then
 # updmap.cfg handling
-#    db_get tetex-base/updmap || true
-    if [ ! -f ${EUMAPC} ] ; then cp -f ${UMAPCTPL} ${EUMAPC}; fi
-    if [ ! -L ${VUMAPC} ] ; then cp -f ${UMAPCTPL} ${VUMAPC}; fi
-#	    (cd /var/lib/texmf/web2c; ln -fs ${EUMAPC} . )
+    if [ ! -f ${EUMAPC} -a ! -f ${EUMAPC}.dpkg-old ] ; then 
+	cp ${UMAPCTPL} ${EUMAPC}; fi
+    if [ ! -L ${VUMAPC} -a ! -f ${VUMAPC} ] ; then 
+	cp ${UMAPCTPL} ${VUMAPC}; fi
 
 # language.dat handling
-#    db_get tetex-base/lang_dat || true
-    if [ ! -f ${ELDAT} ]; then cp ${LDFLT} ${ELDAT}; fi
+    if [ ! -f ${ELDAT} -a ! -f ${ELDAT}.dpkg-old ]; then 
+	cp ${LDFLT} ${ELDAT}; fi
     if [ ! -f ${VLDAT} ]; then cp ${LDFLT} ${VLDAT}; fi
     if [ ! -L ${LCNFD}/language.dat ]; then
 	(cd ${LCNFD}; ln -s ${VLDAT} .)
--- tetex-base-2.0.2/debian/postrm	2003-07-17 16:53:26.000000000 +0900
+++ tetex-base/debian/postrm	2003-10-07 15:49:23.000000000 +0900
@@ -6,6 +6,7 @@
 if [ "x$1" = "xpurge" ]; then
 # be careful not to delete conffiles of other packages!!
   rm -fr /var/spool/texmf /var/lib/texmf /var/cache/fonts /etc/texdoctk || true
+  rm -f /etc/texmf/updmap.cfg* /etc/texmf/language.dat*
 fi
 
 #DEBHELPER#

--- tetex-bin-2.0.2/debian/postinst	2003-09-01 11:21:13.000000000 +0900
+++ tetex-bin/debian/postinst	2003-10-07 16:57:14.000000000 +0900
@@ -34,15 +34,16 @@
 #unset TEXINPUTS || true
 TEXCONFIG_P=/usr/bin/texconfig
 ETXMFC=/etc/texmf/texmf.cnf
-VTXMFC=/var/lib/texmf/web2c/texmf.cnf
+VDIR=/var/lib/texmf/web2c
+VTXMFC=${VDIR}/texmf.cnf
 TXMFCTPL=/usr/share/tetex-bin/texmf.cnf
 UPDTXMF=/usr/sbin/update-texmf
 EFMTUC=/etc/texmf/fmtutil.cnf
-VFMTUC=/var/lib/texmf/web2c/fmtutil.cnf
+VFMTUC=${VDIR}/fmtutil.cnf
 FMTUCTPL=/usr/share/tetex-bin/fmtutil.cnf
 UPDFMTU=/usr/sbin/update-fmtutil
 EUMAPC=/etc/texmf/updmap.cfg
-VUMAPC=/var/lib/texmf/web2c/updmap.cfg
+VUMAPC=${VDIR}/updmap.cfg
 UMAPCTPL=/usr/share/tetex-base/updmap.cfg
 UPDMAP=/usr/sbin/update-updmap
 LDAT=/var/lib/texmf/language.dat
@@ -63,70 +64,89 @@
 if [ -d /usr/share/texmf/web2c ]; then rm -rf /usr/share/texmf/web2c; fi
 ln -sf /var/lib/texmf/web2c /usr/share/texmf/
 
-# should remove at purge; ${ETXMFC}.dpkg-old ${EFMTUC}.dpkg-old ${EUMAPC}.dpkg-old
+# should remove at purge; ${ETXMFC}.dpkg-old ${EFMTUC}.dpkg-old (tetex-bin)
+# ${EUMAPC}.dpkg-old ${ELDAT}.dpkg-old (tetex-base?)
 
+# texmf.cnf handling
 db_get tetex-bin/texmf || true
 if [ X"$RET" = X"true" ]; then
     if dpkg --compare-versions "$2" lt 1.0.7+20011202-5.1; then
-  # Handle new non-configuration file setup
 	if [ -f ${ETXMFC} ]; then
-	    echo " ${ETXMFC} is no longer used and a file generated by ${UPDTXMF}"
-	    echo "will be used from now on.  Old ${ETXMFC} will be reserved for your reference."
-#	    mv ${ETXMFC} ${ETXMFC}.dpkg-old
-#	    cp -f ${TXMFCTPL} ${ETXMFC}
+	 echo " ${ETXMFC} is no longer used and a file generated by ${UPDTXMF}"
+	 echo "will be used from now on.  Old ${ETXMFC} will be reserved as"
+	 echo "${ETXMFC}.dpkg-old for your reference."
 	fi
     fi
-    if [ -L ${VTXMFC} ] ; then rm -f ${VTXMFC}; fi
-    if [ -x ${UPDTXMF} ] ; then ${UPDTXMF} -v; fi
+# rename unused texmf.cnf
+    if [ -f ${ETXMFC} ]; then mv -f ${ETXMFC} ${ETXMFC}.dpkg-old; fi
+    if [ -L ${VTXMFC} ]; then rm -f ${VTXMFC}; fi
+    if [ -x ${UPDTXMF} ]; then ${UPDTXMF} -v; fi
 else
-    if [ ! -f ${ETXMFC} ] ; then cp -f ${TXMFCTPL} ${ETXMFC}; fi
+    if [ ! -f ${ETXMFC} ]; then
+	if [ -f ${ETXMFC}.dpkg-old ]; then
+	    mv ${ETXMFC}.dpkg-old ${ETXMFC}
+	else
+	    cp ${TXMFCTPL} ${ETXMFC}
+	fi
+    fi
     if [ ! -L ${VTXMFC} ] ; then
 	rm -f ${VTXMFC}
-	(cd /var/lib/texmf/web2c; ln -s ${ETXMFC} . )
+	(cd ${VDIR}; ln -s ${ETXMFC} . )
     fi
 fi
 
+# fmtutil.cnf handling
 db_get tetex-bin/fmtutil || true
 if [ X"$RET" = X"true" ]; then
     if dpkg --compare-versions "$2" lt 1.0.7+20011202-5.1; then
-  # Handle new non-configuration file setup
 	if [ -f ${EFMTUC} ]; then
-	    echo "${EFMTUC} is no longer used and a file generated by ${UPDFMTU}"
-	    echo "will be used from now on.  Old ${EFMTUC} will be reserved for your reference."
-#	    mv ${EFMTUC} ${EFMTUC}.dpkg-old
-#	    cp -f ${FMTUCTPL} ${EFMTUC}
+	  echo "${EFMTUC} is no longer used and a file generated by ${UPDFMTU}"
+	  echo "will be used from now on.  Old ${EFMTUC} will be reserved as"
+	  echo "${EFMTUC}.dpkg-old for your reference."
 	fi
     fi
-    if [ -L ${VFMTUC} ] ; then rm -f ${VFMTUC}; fi
-    if [ -x ${UPDFMTU} ] ; then ${UPDFMTU} -v; fi
+# rename unused fmtutil.cnf
+    if [ -f ${EFMTUC} ]; then mv -f ${EFMTUC} ${EFMTUC}.dpkg-old; fi
+    if [ -L ${VFMTUC} ]; then rm -f ${VFMTUC}; fi
+    if [ -x ${UPDFMTU} ]; then ${UPDFMTU} -v; fi
 else
-    if [ ! -f ${EFMTUC} ] ; then cp -f ${FMTUCTPL} ${EFMTUC}; fi
-    if [ ! -L ${VFMTUC} ] ; then
+    if [ ! -f ${EFMTUC} ]; then
+	if [ -f ${EFMTUC}.dpkg-old ]; then
+	    mv ${EFMTUC}.dpkg-old ${EFMTUC}
+	else
+	    cp ${FMTUCTPL} ${EFMTUC}
+	fi
+    fi
+    if [ ! -L ${VFMTUC} ]; then
 	rm -f ${VFMTUC}
-	(cd /var/lib/texmf/web2c; ln -s ${EFMTUC} . )
+	(cd ${VDIR}; ln -s ${EFMTUC} .)
     fi
 fi
 
+# updmap.cfg handling
 db_get tetex-bin/upd_map || true
 if [ X"$RET" = X"true" ]; then
     if dpkg --compare-versions "$2" lt 1.0.7+20021025-7; then
-  # Handle new non-configuration file setup
 	if [ -f ${EUMAPC} ]; then
-	    echo "${EUMAPC} is no longer used and a file generated by ${UPDMAP}"
-	    echo "will be used from now on.  Old ${EUMAPC} will be reserved for your reference."
-#	    mv -f ${EUMAPC} ${EUMAPC}.dpkg-old
-#	    cp -f ${UMAPCTPL} ${EUMAPC}
+	   echo "${EUMAPC} is no longer used and a file generated by ${UPDMAP}"
+	   echo "will be used from now on.  Old ${EUMAPC} will be reserved as"
+	   echo "${EUMAPC}.dpkg-old for your reference."
 	fi
     fi
+# rename unused updmap.cfg
+    if [ -f ${EUMAPC} ]; then mv -f ${EUMAPC} ${EUMAPC}.dpkg-old; fi
     if [ -L ${VUMAPC} ]; then rm -f ${VUMAPC}; fi
-    if [ -x ${UPDMAP} ]; then
-	${UPDMAP} -v
-    fi
+    if [ -x ${UPDMAP} ]; then ${UPDMAP} -v; fi
 else
-    if [ ! -f ${EUMAPC} ]; then cp -f ${UMAPCTPL} ${EUMAPC}; fi
+    if [ ! -f ${EUMAPC} ]; then 
+	if [ -f ${EUMAPC}.dpkg-old ]; then
+	    mv ${EUMAPC}.dpkg-old ${EUMAPC}
+	else
+	    cp ${UMAPCTPL} ${EUMAPC}
+	fi
     if [ ! -L ${VUMAPC} ]; then
 	rm -f ${VUMAPC}
-	(cd /var/lib/texmf/web2c; ln -s ${EUMAPC} . )
+	(cd ${VDIR}; ln -s ${EUMAPC} .)
     fi
 fi
 
@@ -168,8 +188,11 @@
     { mkdir "$vardir/source" && chmod 1777 "$vardir/source"; }
 fi
 
+# language.dat handling
 db_get tetex-bin/use_debconf || true
 if [ "$RET" = "true" ]; then
+# rename unused language.dat
+    if [ -f ${ELDAT} ]; then mv -f ${ELDAT} ${ELDAT}.dpkg-old; fi
     if [ -f ${DFLT} ]; then
       cp -f ${DFLT} ${LDAT}
       rm -f ${LDATD}/language.dat
@@ -196,13 +219,15 @@
         esac
       done
 else
-    if [ -f ${ELDAT} ]; then
-	rm -f ${LDATD}/language.dat
-	(cd ${LDATD} ; ln -s ${ELDAT} .)
-    elif [ -f ${DFLT} ]; then
-	cp -f ${DFLT} ${ELDAT}
-	(cd ${LDATD} ; ln -s ${ELDAT} .)
+    if [ ! -f ${ELDAT} ]; then
+	if [ -f ${ELDAT}.dpkg-old ]; then
+	    mv ${ELDAT}.dpkg-old ${ELDAT}
+	else
+	    cp ${DFLT} ${ELDAT}
+	fi
     fi
+    rm -f ${LDATD}/language.dat
+    (cd ${LDATD} ; ln -s ${ELDAT} .)
 fi
 
 if [ -e $TEXCONFIG_P -a -e /usr/share/texmf/dvips/config ]



Reply to: