[subversion-commit] SVN tex-common commit + diffs: r1638 - in tex-common/trunk: debian scripts

[Frank Küster]

Author: frank
Date: 2006-09-26 11:52:32 +0000 (Tue, 26 Sep 2006)
New Revision: 1638

Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/scripts/update-fontlang
Log:
update-fontlang:  If a conffile has a corresponding dpkg-new file,
that is, it is from a yet-unconfigured package, drop it any case.
Previously, the check was only done when the file had a magic comment,
but conffiles in sarge generally do not have this magic.  Therefore,
upgrades from sarge would have failed if the conffile change is needed for
proper configuration (closes: ???) [frank] 

(bugnumber not yet there, since I just cloned the bug)


Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2006-09-26 07:52:36 UTC (rev 1637)
+++ tex-common/trunk/debian/changelog	2006-09-26 11:52:32 UTC (rev 1638)
@@ -1,10 +1,16 @@
-tex-common (0.30~1) unstable; urgency=low
+tex-common (0.30~1) unstable; urgency=high
 
+  * update-fontlang:  If a conffile has a corresponding dpkg-new file,
+    that is, it is from a yet-unconfigured package, drop it any case.
+    Previously, the check was only done when the file had a magic comment,
+    but conffiles in sarge generally do not have this magic.  Therefore,
+    upgrades from sarge would have failed if the conffile change is needed for
+    proper configuration (closes: ???) [frank] 
   * Remove the medium-priority debconf note without replacement; anybody
     who really runs into the problem will be able to find the information
     in tetex-bin's README.Debian (closes: #388973) [frank]
 
- -- Frank Küster <frank at debian.org>  Mon, 25 Sep 2006 18:08:21 +0200
+ -- Frank Küster <frank at debian.org>  Tue, 26 Sep 2006 13:50:20 +0200
 
 tex-common (0.29) unstable; urgency=medium
 

Modified: tex-common/trunk/scripts/update-fontlang
===================================================================
--- tex-common/trunk/scripts/update-fontlang	2006-09-26 07:52:36 UTC (rev 1637)
+++ tex-common/trunk/scripts/update-fontlang	2006-09-26 11:52:32 UTC (rev 1638)
@@ -144,20 +144,25 @@
 {
     file="$1"
 
-    # Does the file have the magic comment?
-    if grep -E "$DebPkgProvidedMaps_magic_comment" "$file" >/dev/null; then
+    # Does the file have a dpkg-new sister?
+    if [ -f "${file}.dpkg-new" ]; then
+      do_not_include_file "$file"
+    else
+      # Does the file have the magic comment?
+      if grep -E "$DebPkgProvidedMaps_magic_comment" "$file" >/dev/null; then
         # Is the package "$file" comes from still installed?
         if [ -d "$MEMORY_DIR" ] \
             && find "$MEMORY_DIR" -type f -name '*.list' -print0 \
             | xargs -0r cat \
-            | grep -E "^$(basename "$file" ".$EXT")\$" >/dev/null \
-            && [ ! -f "${file}.dpkg-new" ]; then
+            | grep -E "^$(basename "$file" ".$EXT")\$" >/dev/null;
+	then
             include_file "$file"
         else
             do_not_include_file "$file"
         fi
-    else
+      else
         include_file "$file"
+      fi
     fi
 }