[subversion-commit] SVN tex-common commit + diffs: r1356 - tex-common/trunk/debian

[Frank Küster]

Author: frank
Date: 2006-05-15 13:12:33 +0000 (Mon, 15 May 2006)
New Revision: 1356

Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/debian/config.in
   tex-common/trunk/debian/postinst.functions
Log:
* Fix our check for a working configuration in texmf.d (closes:
  #366907), thanks Ralf [frank]
* Make sure the font cache directory is always world-writeable - we
  previously missed the case where apt-utils are installed in a buildd
  chroot (again closes: #354113) [frank]
- also fix syntax errors

Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2006-05-15 13:11:51 UTC (rev 1355)
+++ tex-common/trunk/debian/changelog	2006-05-15 13:12:33 UTC (rev 1356)
@@ -4,8 +4,13 @@
     questions are not shown again when the old one has already been seen,
     and unregister the old question (closes: #366812) [frank]
   * Fix bashism in config (closes: #366789) [frank]
+  * Fix our check for a working configuration in texmf.d (closes:
+    #366907), thanks Ralf [frank]
+  * Make sure the font cache directory is always world-writeable - we
+    previously missed the case where apt-utils are installed in a buildd
+    chroot (again closes: #354113) [frank]
 
- -- Frank Küster <frank at debian.org>  Thu, 11 May 2006 13:19:12 +0200
+ -- Frank Küster <frank at debian.org>  Mon, 15 May 2006 15:05:38 +0200
 
 tex-common (0.22) unstable; urgency=low
 

Modified: tex-common/trunk/debian/config.in
===================================================================
--- tex-common/trunk/debian/config.in	2006-05-15 13:11:51 UTC (rev 1355)
+++ tex-common/trunk/debian/config.in	2006-05-15 13:12:33 UTC (rev 1356)
@@ -72,10 +72,10 @@
   db_fget tex-common/managecache seen || true
   SEEN="$RET"
 
-  if [ $SEEN = true ] ; then
+  if [ "$SEEN" = true ] ; then
     # this question was already shown
     # if the permissions are still <:=$FONTCACHE_PERMS:> we set managecache to true
-    if [ $PERMS = $FONTCACHE_PERMS ] ; then
+    if [ "$PERMS" = $FONTCACHE_PERMS ] ; then
       db_set tex-common/managecache true || true
       db_set tex-common/groupname_single "$GROUP" || true
       db_set tex-common/groupname_multi "$GROUP" || true
@@ -84,16 +84,16 @@
     fi
   else
     # this question has not been seen, so if the permissions are 
-    # - either empty, because the file is not yet present
-    # - or the new permissions <:=$FONTCACHE_PERMS:> as we want to ship them
+    # - either the new permissions <:=$FONTCACHE_PERMS:> as we'd like to set them
     # - or the permissions as shipped by old tetex versions
     # then set the managecache to true, otherwise to false
     # we will later change it to <:=$FONTCACHE_PERMS:> in the true case
     #
-    # If the permissions are as shipped in the deb, don't set to true
-    # (after noninteractive install in pbuilder etc., dir needs to be world-writable).
+    # If the permissions are empty (preconfigure phase) or as shipped
+    # in the deb, don't set to true (after noninteractive install in
+    # pbuilder etc., dir needs to be world-writable).
 
-    if [ -z "$PERMS" ] || [ "$PERMS" = $FONTCACHE_PERMS ] || [ "$PERMS" = 1777 ]; then
+    if [ "$PERMS" = $FONTCACHE_PERMS ] || [ "$PERMS" = 1777 ]; then
       db_set tex-common/managecache true || true
     else
       db_set tex-common/managecache false || true

Modified: tex-common/trunk/debian/postinst.functions
===================================================================
--- tex-common/trunk/debian/postinst.functions	2006-05-15 13:11:51 UTC (rev 1355)
+++ tex-common/trunk/debian/postinst.functions	2006-05-15 13:12:33 UTC (rev 1356)
@@ -28,7 +28,6 @@
   file=$1
   variable=$2
   pattern="$3"
-  checkfailed=false
   removepattern='( |=)'
   line=""
   line=`egrep "^$variable" $file` || true