[Debburn-changes] r455 - cdrkit/trunk/debian

Eduard Bloch blade at alioth.debian.org
Thu Nov 23 23:34:20 CET 2006


Author: blade
Date: 2006-11-23 23:34:19 +0100 (Thu, 23 Nov 2006)
New Revision: 455

Modified:
   cdrkit/trunk/debian/cdda2wav.links
   cdrkit/trunk/debian/wodim.links
   cdrkit/trunk/debian/wodim.preinst
Log:
Roundup, forgotten netscsid manpage, conffile migration

Modified: cdrkit/trunk/debian/cdda2wav.links
===================================================================
--- cdrkit/trunk/debian/cdda2wav.links	2006-11-23 22:19:47 UTC (rev 454)
+++ cdrkit/trunk/debian/cdda2wav.links	2006-11-23 22:34:19 UTC (rev 455)
@@ -1,3 +1,4 @@
 usr/bin/icedax usr/bin/cdda2wav
 usr/share/man/man1/icedax.1.gz usr/share/man/man1/cdda2wav.1.gz
+usr/share/doc/icedax usr/share/doc/cdda2wav
 

Modified: cdrkit/trunk/debian/wodim.links
===================================================================
--- cdrkit/trunk/debian/wodim.links	2006-11-23 22:19:47 UTC (rev 454)
+++ cdrkit/trunk/debian/wodim.links	2006-11-23 22:34:19 UTC (rev 455)
@@ -0,0 +1 @@
+usr/share/man/man1/wodim.1.gz usr/share/man/man1/netscsid.1.gz

Modified: cdrkit/trunk/debian/wodim.preinst
===================================================================
--- cdrkit/trunk/debian/wodim.preinst	2006-11-23 22:19:47 UTC (rev 454)
+++ cdrkit/trunk/debian/wodim.preinst	2006-11-23 22:34:19 UTC (rev 455)
@@ -1,22 +1,24 @@
 #!/bin/sh
 
+# order in descending importance. The loop could be separated, but I have this
+# set of checksums now, too lazy for research to separate that again
 if [ "$1" = "upgrade" ] ||  [ "$1" = "install" ] ; then
    # first kill old conffiles, then possible dangling symlinks created by that action
-   for CONF in /etc/default/wodim /etc/default/cdrecord /etc/default/rscsi \
+   for CONF in /etc/default/wodim /etc/rscsi.conf /etc/default/cdrecord /etc/default/rscsi \
       /etc/cdrecord/cdrecord /etc/cdrecord/rscsi \
       /etc/wodim/wodim /etc/wodim/rscsi
    do
       SUM="$(md5sum $CONF 2>/dev/null | cut -f1 -d\  )"
       # missing, empty, unchanged files
       case "$SUM" in 
-         ""|d41d8cd98f00b204e9800998ecf8427e|e7e6151fe872d56351d04f4c2c3d9722|0bcdd41f5d7c6419d524b234701d18f0|1d2c06f0d52fae533ef0cd58b80d22e4|3016370f809f8bca713a2eee1ecbeb2d|68e2b3b297d6b5cb0c6beb9136f2d918|6e3ce0b42b8971f0b10958ab6982b441|8c3e4a320aafda37f162a12526c0d431|e05fdb0a48542ccbff5b28b100d083e3|eff315991af0911ae8c96b9500c1714f)
+         ""|00118d4a9c94c41d3ae415638cc055dd|d41d8cd98f00b204e9800998ecf8427e|e7e6151fe872d56351d04f4c2c3d9722|0bcdd41f5d7c6419d524b234701d18f0|1d2c06f0d52fae533ef0cd58b80d22e4|3016370f809f8bca713a2eee1ecbeb2d|68e2b3b297d6b5cb0c6beb9136f2d918|6e3ce0b42b8971f0b10958ab6982b441|8c3e4a320aafda37f162a12526c0d431|e05fdb0a48542ccbff5b28b100d083e3|eff315991af0911ae8c96b9500c1714f)
          rm -f $CONF
          ;;
          *)
          case $CONF in
-            *rscsi)
-            if ! test -e /etc/rscsi.conf ; then
-               cp $CONF /etc/rscsi.conf || true
+            *rscsi|*rscsi.conf)
+            if ! test -e /etc/netscsid.conf ; then
+               cp $CONF /etc/netscsid.conf || true
             fi
             ;;
             *)




More information about the Debburn-changes mailing list