Hi,
attached is a first NMU proposal and a debdiff of the source.

Sven
-- 
If God passed a mic to me to speak
I'd say stay in bed, world
Sleep in peace
   [The Cardigans - 03:45: No sleep]
diff -u ptex-bin-3.1.10+0.04b/debian/ptex-bin.preinst ptex-bin-3.1.10+0.04b/debian/ptex-bin.preinst
--- ptex-bin-3.1.10+0.04b/debian/ptex-bin.preinst
+++ ptex-bin-3.1.10+0.04b/debian/ptex-bin.preinst
@@ -46,7 +46,9 @@
     dpkg-divert --package ptex-bin --add --rename --divert \
       /usr/share/man/man1/tftopl.nonja.1.gz /usr/share/man/man1/tftopl.1.gz
 	      
-    mktexlsr
+    if [ -x "`which mktexlsr 2>/dev/null`" ]; then
+	mktexlsr
+    fi
 
     ;;
 
diff -u ptex-bin-3.1.10+0.04b/debian/control ptex-bin-3.1.10+0.04b/debian/control
--- ptex-bin-3.1.10+0.04b/debian/control
+++ ptex-bin-3.1.10+0.04b/debian/control
@@ -8,7 +8,7 @@
 Package: ptex-bin
 Architecture: any
 Replaces: platex
-Depends: ptex-base (>= 1:2.0-3), texlive-base-bin | tetex-bin (>= 2.0.2-17), texlive-math-extra | tetex-extra, ${shlibs:Depends}
+Depends: ptex-base (>= 1:2.0-3), texlive-base-bin, texlive-math-extra, ${shlibs:Depends}
 Suggests: dvipsk-ja, jbibtex-bin, jmpost, mendexk
 Conflicts: platex
 Description: The ASCII pTeX binary files
@@ -33,7 +33,7 @@
 
 Package: jmpost
 Architecture: any
-Depends: ${shlibs:Depends}, texlive-base-bin | tetex-bin (>= 1.0.7+20011202-5.1)
+Depends: ${shlibs:Depends}, texlive-base-bin
 Recommends: ptex-bin, dvipsk-ja
 Description: Japanized MetaPost, a system for drawing pictures
  This is jMetaPost, a Japanized MetaPost based on the original
diff -u ptex-bin-3.1.10+0.04b/debian/jbibtex-bin.postrm ptex-bin-3.1.10+0.04b/debian/jbibtex-bin.postrm
--- ptex-bin-3.1.10+0.04b/debian/jbibtex-bin.postrm
+++ ptex-bin-3.1.10+0.04b/debian/jbibtex-bin.postrm
@@ -27,9 +27,13 @@
 
        mv /etc/texmf/texmf.d/60jbibtex.cnf /etc/texmf/texmf.d/60jbibtex.bak
 
-       update-texmf
-
-       mktexlsr
+       if [ -x "`which update-texmf 2>/dev/null`" ]; then
+	   update-texmf
+       fi
+
+       if [ -x "`which mktexlsr 2>/dev/null`" ]; then
+	   mktexlsr
+       fi
 
         ;;
 
diff -u ptex-bin-3.1.10+0.04b/debian/jmpost.postinst ptex-bin-3.1.10+0.04b/debian/jmpost.postinst
--- ptex-bin-3.1.10+0.04b/debian/jmpost.postinst
+++ ptex-bin-3.1.10+0.04b/debian/jmpost.postinst
@@ -25,7 +25,9 @@
 case "$1" in
     configure)
 
-    mktexlsr
+	if [ -x "`which mktexlsr 2>/dev/null`" ]; then
+	    mktexlsr
+	fi
 
     ln -sf /usr/bin/jmpost /usr/bin/inijmpost
     ln -sf /usr/bin/jmpost /usr/bin/virjmpost
diff -u ptex-bin-3.1.10+0.04b/debian/changelog ptex-bin-3.1.10+0.04b/debian/changelog
--- ptex-bin-3.1.10+0.04b/debian/changelog
+++ ptex-bin-3.1.10+0.04b/debian/changelog
@@ -1,3 +1,17 @@
+ptex-bin (3.1.10+0.04b-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add a lot of if checks for mktexlsr, update-texmf and update-texmf
+    in the maintainer scripts to ensure that they don't break during
+    upgrades (Closes: #503543).
+  * Create /var/lib/texmf/web2c/ptex directory if it doesn't exist in
+    ptex-bin.postinst. This will ensure working upgrades for etch->lenny
+    in cases where the old tetex packages are still installed. The new
+    fmtutil-sys from texlive is capable of creating this directory itself.
+  * Remove or'ed dependency on tetex packages.
+
+ -- Sven Hoexter <[EMAIL PROTECTED]>  Wed, 05 Nov 2008 20:04:13 +0100
+
 ptex-bin (3.1.10+0.04b-2) unstable; urgency=low
 
   * Bumped to Standards-Version: 3.7.3.
diff -u ptex-bin-3.1.10+0.04b/debian/jmpost.postrm ptex-bin-3.1.10+0.04b/debian/jmpost.postrm
--- ptex-bin-3.1.10+0.04b/debian/jmpost.postrm
+++ ptex-bin-3.1.10+0.04b/debian/jmpost.postrm
@@ -19,11 +19,11 @@
 case "$1" in
        purge|remove)
 
-       if mktexlsr --help >/dev/null 2>&1; then 
-         mktexlsr
-       fi
+	if [ -x "`which mktexlsr 2>/dev/null`" ]; then
+	    mktexlsr
+	fi
 
-        ;;
+	;;
 
        upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
 
diff -u ptex-bin-3.1.10+0.04b/debian/ptex-bin.postinst ptex-bin-3.1.10+0.04b/debian/ptex-bin.postinst
--- ptex-bin-3.1.10+0.04b/debian/ptex-bin.postinst
+++ ptex-bin-3.1.10+0.04b/debian/ptex-bin.postinst
@@ -37,7 +37,11 @@
 EOF
 fi
 
+
+if [ -x "`which update-texmf 2>/dev/null`" ]; then
     update-texmf
+fi
+
 
 # Generate /etc/texmf/fmt.d/30ptex.cnf
 if [ ! -f /etc/texmf/fmt.d/30ptex.cnf ]; then
@@ -52,7 +56,11 @@
 EOF
 fi
 
+if [ -x "`which update-fmtutil 2>/dev/null`" ]; then
     update-fmtutil
+fi
+
+if [ -x "`which mktexlsr 2>/dev/null`" ]; then
     mktexlsr
 
 # Run fmtutil and generate *.fmt
@@ -61,6 +69,14 @@
     pdftex_formats=$TEXMF/web2c/pdftex
     append_db=/usr/share/texmf/web2c/mktexupd
 
+    #Make sure that the ptex directory exists
+    #This is a workaround for etch->lenny upgrades with
+    #fmtutil-sys from the old tetex packages
+    if [ ! -d $ptex_formats ]; then
+	mkdir -p $ptex_formats
+    fi
+
+    
     TEMPFILE=`tempfile -p ptex`
     echo "Running fmtutil-sys. This may take some time. ..."
       fmtutil-sys --byfmt ptex > $TEMPFILE; $append_db $ptex_formats ptex.fmt
@@ -70,8 +86,8 @@
     echo "Output of fmtutil-sys is in $TEMPFILE"
     echo
 
-# 
-    mktexlsr    
+    mktexlsr
+fi
 
     cd /usr/bin && ln -sf ptex platex
     ln -sf /usr/bin/ptex /usr/bin/amsptex
diff -u ptex-bin-3.1.10+0.04b/debian/jbibtex-bin.postinst ptex-bin-3.1.10+0.04b/debian/jbibtex-bin.postinst
--- ptex-bin-3.1.10+0.04b/debian/jbibtex-bin.postinst
+++ ptex-bin-3.1.10+0.04b/debian/jbibtex-bin.postinst
@@ -36,9 +36,14 @@
 BSTINPUTS.jbibtex = .;$TEXMF/jbibtex/{bst,}//;$TEXMF/bibtex/{bst,}//
 EOF
 fi
-    update-texmf
 
-    mktexlsr
+    if [ -x "`which update-texmf 2>/dev/null`" ]; then
+       update-texmf
+    fi
+
+    if [ -x "`which mktexlsr 2>/dev/null`" ]; then
+	mktexlsr
+    fi
 			
     ;;
 
diff -u ptex-bin-3.1.10+0.04b/debian/ptex-bin.postrm ptex-bin-3.1.10+0.04b/debian/ptex-bin.postrm
--- ptex-bin-3.1.10+0.04b/debian/ptex-bin.postrm
+++ ptex-bin-3.1.10+0.04b/debian/ptex-bin.postrm
@@ -53,10 +53,17 @@
        dpkg-divert --package ptex-bin --remove --rename --divert \
          /usr/share/man/man1/tftopl.nonja.1.gz /usr/share/man/man1/tftopl.1.gz
        
-       mktexlsr
-
-       update-texmf
-       update-fmtutil
+       if [ -x "`which mktexlsr 2>/dev/null`" ]; then
+	   mktexlsr
+       fi
+
+       if [ -x "`which update-texmf 2>/dev/null`" ]; then
+	  update-texmf
+       fi
+
+       if [ -x "`which update-fmtutil 2>/dev/null`" ]; then
+	   update-fmtutil
+       fi
 
         ;;
 

Attachment: ptex-bin_3.1.10+0.04b-2.1.diff.gz
Description: Binary data



Reply via email to