Dear Rafael!

On Don, 08 Dez 2005, Rafael Laboissiere wrote:
> Thanks for your bug report on tipa.  Unfortunately, I am currently unable to
> invest time on checking your patch or doing any change to the package.
> Please, feel free to NMU.

I have remade a new package tipa_1.2-2.1 with only a slight change: The
map file is moved directly from /etc/texmf/map to
/usr/share/texmf/fonts/map. This is possible since tetex has already
made the move.

Otherwise no changes.

The package can be obtained from the same source
        deb http://www.tug.org/texlive/Debian/ updpkg/
        deb-src http://www.tug.org/texlive/Debian/ updpkg/
and it builds in pbuilder, upgrades from previous 1.2-2 version (and
remove/purges).  I attach the interdiff from 1.2-2.diff to 1.2-2.1.diff.

Please can you approve this new version so that we can NMU it?!

Best wishes and thanks a lot

Norbert

-------------------------------------------------------------------------------
Dr. Norbert Preining <preining AT logic DOT at>             Università di Siena
gpg DSA: 0x09C5B094      fp: 14DF 2E6C 0307 BE6D AD76  A9C0 D2BF 4AA3 09C5 B094
-------------------------------------------------------------------------------
CONG (n.)
Strange-shaped metal utensil found at the back of the saucepan
cupboard. Many authorities believe that congs provide conclusive proof
of the existence of a now extinct form of yellow vegetable which the
Victorians used to boil mercilessly.
                        --- Douglas Adams, The Meaning of Liff
diff -u tipa-1.2/debian/changelog tipa-1.2/debian/changelog
--- tipa-1.2/debian/changelog
+++ tipa-1.2/debian/changelog
@@ -1,3 +1,13 @@
+tipa (2:1.2-2.1) unstable; urgency=low
+
+  * NMU with maintainer approval to work with new tetex3 (updmap-sys) and
+    texlive.  It has been prepared by Norbert Preining <[EMAIL PROTECTED]>,
+    upload sponsored by Frank KÃŒster
+  * use dh_installtexfonts, move map file to TEXMFMAIN/fonts/map/dvips
+    (closes: #335990)
+
+ -- Norbert Preining <[EMAIL PROTECTED]>  Mon, 12 Dec 2005 16:23:46 +0100
+
 tipa (2:1.2-2) unstable; urgency=low
 
   * debian/control: tipa depends on tetex-bin. This will avoid the problem
reverted:
--- tipa-1.2/debian/postinst
+++ tipa-1.2.orig/debian/postinst
@@ -1,27 +0,0 @@
-#!/bin/sh -
-# postinst of package tipa
-# Rafael Laboissiere <[EMAIL PROTECTED]>
-
-set -e
-
-case "$1" in
-    configure)
-      if [ -x /usr/bin/texhash ] ; then \
-         /usr/bin/texhash ; \
-      fi
-      if [ -x /usr/sbin/update-updmap ] ; then \
-         /usr/sbin/update-updmap ; \
-      fi
-      if [ -x /usr/bin/updmap ] ; then \
-         /usr/bin/updmap ; \
-      fi
-        ;;
-    abort-upgrade | abort-deconfigure | abort-remove)
-       ;;
-    *)
-       echo "$0: incorrect arguments: $*" >&2
-       exit 1
-       ;;
-esac
-
-#DEBHELPER#
reverted:
--- tipa-1.2/debian/postrm
+++ tipa-1.2.orig/debian/postrm
@@ -1,36 +0,0 @@
-#!/bin/sh -
-# postrm of package tipa
-# Rafael Laboissiere <[EMAIL PROTECTED]>
-
-set -e
-
-case "$1" in
-    purge | remove)
-      if [ -x /usr/bin/texhash ] ; then \
-         /usr/bin/texhash ; \
-      fi
-      case "$1" in
-          remove)
-            mv /etc/texmf/updmap.d/10tipa.cfg /etc/texmf/updmap.d/10tipa.bak
-          ;;
-          purge)
-            rm -f /etc/texmf/updmap.d/10tipa.*
-          ;;
-      esac
-      if [ -x /usr/sbin/update-updmap ] ; then \
-         /usr/sbin/update-updmap ; \
-      fi
-      if [ -x /usr/bin/updmap ] ; then \
-         /usr/bin/updmap ; \
-      fi
-    ;;
-    upgrade | failed-upgrade | abort-upgrade | abort-install)
-    ;;
-    *)
-       echo "$0: incorrect arguments: $*" >&2
-       exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
diff -u tipa-1.2/debian/control tipa-1.2/debian/control
--- tipa-1.2/debian/control
+++ tipa-1.2/debian/control
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Rafael Laboissiere <[EMAIL PROTECTED]>
 Standards-Version: 3.5.7
-Build-Depends-Indep: debhelper (>= 3.4.1), tetex-bin, tetex-extra, gs-common, 
perl, sharutils
+Build-Depends-Indep: tex-common (>= 0.11), debhelper (>= 3.4.1), tetex-bin (>= 
3) | texlive-latex-recommended, tetex-extra | texlive-fonts-recommended, 
gs-common, perl, sharutils
 
 Package: tipa
 Architecture: all
-Depends: tetex-base, tetex-bin
+Depends: tetex-base (>= 3) | texlive-latex-base, tetex-bin | texlive-base-bin
 Conflicts: tipa-type1
 Replaces: tipa-type1
 Description: System for processing phonetic symbols in LaTeX
diff -u tipa-1.2/debian/rules tipa-1.2/debian/rules
--- tipa-1.2/debian/rules
+++ tipa-1.2/debian/rules
@@ -52,7 +52,7 @@
        dh_clean -k
        dh_installdirs
 
-       $(MAKE) install PREFIX=$(debtexmf) MAPDIR=$(debetc)/texmf/dvips
+       $(MAKE) install PREFIX=$(debtexmf) MAPDIR=$(debtexmf)/fonts/map/dvips
         # Fixes bug reported by lintian
        chmod +x $(debtexmf)/fonts/source/fkr/tipa/*.sh
        cp 00README changelog
@@ -67,7 +67,8 @@
          debian/xfonts-tipa.defoma-hints
        install --mode=644 debian/silipa.enc $(debxenc)
 
-       install --mode=644 debian/tipa.updmap $(debupdm)/10tipa.cfg
+       #install --mode=644 debian/tipa.updmap $(debupdm)/10tipa.cfg
+       dh_installtexfonts MixedMap=tipa.map
 
        dh_movefiles
        # dh_movefiles does not remove empty empty dirs. Grrr....
diff -u tipa-1.2/debian/conffiles tipa-1.2/debian/conffiles
--- tipa-1.2/debian/conffiles
+++ tipa-1.2/debian/conffiles
@@ -1,2 +1 @@
-/etc/texmf/dvips/tipa.map
 /etc/texmf/updmap.d/10tipa.cfg
reverted:
--- tipa-1.2/debian/tipa.updmap
+++ tipa-1.2.orig/debian/tipa.updmap
@@ -1 +0,0 @@
-MixedMap tipa.map
only in patch2:
unchanged:
--- tipa-1.2.orig/debian/preinst
+++ tipa-1.2/debian/preinst
@@ -0,0 +1,57 @@
+#!/bin/sh -e
+
+#
+# we have to move the map and dvips config file into /u/s/texmf
+# but want to preserve changes done by the user!
+#
+dpkg_md5sum(){
+  grep "$1[[:space:]]"  /var/lib/dpkg/status | cut -f 3 -d ' '
+}
+
+config_move ()
+{
+    oldfile=$1
+    newloc=$2
+    oldmd5sum=`dpkg_md5sum $oldfile`
+
+    if ! [ -r $oldfile ] ; then
+        return 0
+    fi
+    oldloc=`dirname $1`
+    newmd5sum=`md5sum $oldfile |  cut -d ' ' -f 1`
+    if [ "$newmd5sum" = "$oldmd5sum" ] ; then
+       echo "Removing obsolete, unchanged conffile $oldfile"
+       rm $oldfile
+    else
+       if [ "X$newloc" = "X" ] ; then
+           echo "Conffile $oldfile was changed, leaving it at the same place"
+       else
+           echo "Conffile $oldfile was changed, moving it to new location 
$newloc"
+           mkdir -p $newloc
+           mv $oldfile $newloc
+       fi
+    fi
+    test -d $oldloc && rmdir --ignore-fail-on-non-empty $oldloc || true
+}
+
+   
+
+case "$1" in
+    upgrade|install)
+       set -e
+       config_move /etc/texmf/dvips/tipa.map /etc/texmf/fonts/map/dvips
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+
+#DEBHELPER#
+
+exit 0

Reply via email to