[Debian-tex-commits] SVN tex-common commit + diffs: r2701 - tex-common/trunk/debian

[Norbert Preining]

Author: preining
Date: 2007-04-16 14:08:48 +0000 (Mon, 16 Apr 2007)
New Revision: 2701

Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/debian/postinst.in
   tex-common/trunk/debian/preinst.in
Log:
tex-common: make proper ucfr checking in maintainer scripts (Closes: #409897) [np]


Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2007-04-16 14:06:04 UTC (rev 2700)
+++ tex-common/trunk/debian/changelog	2007-04-16 14:08:48 UTC (rev 2701)
@@ -1,3 +1,9 @@
+tex-common (1.8) UNRELEASED; urgency=low
+
+  * make proper ucfr checking in maintainer scripts (Closes: #409897) [np]
+
+ -- Norbert Preining <preining at debian.org>  Mon, 16 Apr 2007 16:07:58 +0200
+
 tex-common (1.7) unstable; urgency=low
 
   * Undo the changes of the autoscripts snippets ordering, debhelper has

Modified: tex-common/trunk/debian/postinst.in
===================================================================
--- tex-common/trunk/debian/postinst.in	2007-04-16 14:06:04 UTC (rev 2700)
+++ tex-common/trunk/debian/postinst.in	2007-04-16 14:08:48 UTC (rev 2701)
@@ -61,7 +61,9 @@
     # handle ucf-managed configuration files
     for file in $UCF_FILES; do
       $UCF /usr/share/tex-common/`basename $file` /etc/texmf/$file
-      test -x "`which ucfr`" && ucfr tex-common /etc/texmf/$file || true
+      if test -x "`which ucfr`" ; then
+        ucfr tex-common /etc/texmf/$file
+      fi
     done
 
 # remove left over fmt/efmt/log files in /usr/share/texmf/web2c/.  If they are

Modified: tex-common/trunk/debian/preinst.in
===================================================================
--- tex-common/trunk/debian/preinst.in	2007-04-16 14:06:04 UTC (rev 2700)
+++ tex-common/trunk/debian/preinst.in	2007-04-16 14:08:48 UTC (rev 2701)
@@ -107,7 +107,9 @@
       # reinstalled by postinst (a copy is already saved).
       rm -f $tempfile1 $conffile
       ucf --purge $conffile
-      test -x "`which ucfr`" && ucfr --purge tex-common $conffile || true
+      if test -x "`which ucfr`" ; then
+        ucfr --purge tex-common $conffileA
+      fi
     fi
     rm -rf "$tempdir"
 
@@ -116,7 +118,9 @@
     # reinstalled by postinst 
     rm -f $conffile
     ucf --purge $conffile
-    test -x "`which ucfr`" && ucfr --purge tex-common $conffile || true
+    if test -x "`which ucfr`" ; then
+      ucfr --purge tex-common $conffile
+    fi
   fi
 
 }