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

[Frank Küster]

Author: frank
Date: 2006-01-09 17:11:10 +0000 (Mon, 09 Jan 2006)
New Revision: 447

Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/debian/common.functions.in
Log:
* Fix functions in common.functions.in, so that old conffiles of teTeX
  are properly handled, thanks to Ralf Stubner


Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2006-01-09 16:17:29 UTC (rev 446)
+++ tex-common/trunk/debian/changelog	2006-01-09 17:11:10 UTC (rev 447)
@@ -1,3 +1,10 @@
+tex-common (0.14.1) UNRELEASED; urgency=low
+
+  * Fix functions in common.functions.in, so that old conffiles of teTeX
+    are properly handled, thanks to Ralf Stubner
+
+ -- Frank Küster <frank at debian.org>  Mon,  9 Jan 2006 18:11:40 +0100
+
 tex-common (0.14) unstable; urgency=low
 
   * Bump standards version to 3.6.2 (no changes needed)

Modified: tex-common/trunk/debian/common.functions.in
===================================================================
--- tex-common/trunk/debian/common.functions.in	2006-01-09 16:17:29 UTC (rev 446)
+++ tex-common/trunk/debian/common.functions.in	2006-01-09 17:11:10 UTC (rev 447)
@@ -396,12 +396,10 @@
   debug "handled\n"
   oldmd5sum=`dpkg_md5sum $file`
   currmd5sum=`md5sum $file | cut -d ' ' -f 1`
-  if [ "$oldmd5sum" = "$currmd5sum" ]; then
+  if [ "$oldmd5sum" != "$currmd5sum" ]; then
     mv $file $oldstuff_dir/`basename $file`.$PREINST_MOVE_EXT
   else
-    newdir=`dirname /etc/texmf/$newname`
-    mkdir -p $newdir
-    mv $file /etc/texmf/$newname
+    rm $file
   fi
 }
 preinst_remove_or_move_ucf(){
@@ -412,12 +410,10 @@
   debug "handled\n"
   oldmd5sum=`ucf_md5sum $file`
   currmd5sum=`md5sum $file | cut -d ' ' -f 1`
-  if [ "$oldmd5sum" = "$currmd5sum" ]; then
+  if [ "$oldmd5sum" != "$currmd5sum" ]; then
     mv $file $oldstuff_dir/`basename $file`.$PREINST_MOVE_EXT
   else
-    newdir=`dirname /etc/texmf/$newname`
-    mkdir -p $newdir
-    mv $file /etc/texmf/$newname
+    rm $file
     if [ -x /usr/bin/ucf ]; then ucf --purge $file; fi
   fi
 }