diff -u tiger-3.2.2/debian/changelog tiger-3.2.2/debian/changelog --- tiger-3.2.2/debian/changelog +++ tiger-3.2.2/debian/changelog @@ -1,3 +1,17 @@ +tiger (1:3.2.2-9ubuntu1) karmic; urgency=low + + * Merge from debian/unstable, remaining changes: (LP: #378534) + - scripts/check_rootdir: Check for inode 2 on ext4 as well as ext2/3. + - debian/postrm: + + Clean directories correctly when purging. + - config.in: + + Auto-create the work directory if it's in /var/run, /tmp, or /var/tmp. + + Use temporary file instead of hardcoded rcfile for temporary work. + * Launchpad bugs fixed: + - Use --debconf-ok when calling ucf (LP: #378514) + + -- Andreas Moog Wed, 20 May 2009 02:30:27 +0200 + tiger (1:3.2.2-9) unstable; urgency=low * Use --debconf-ok when calling ucf (Closes: 517798, 521620) diff -u tiger-3.2.2/debian/postrm tiger-3.2.2/debian/postrm --- tiger-3.2.2/debian/postrm +++ tiger-3.2.2/debian/postrm @@ -9,11 +9,11 @@ case "$1" in purge) - for dir in /var/log/tiger/ /var/lib/tiger/work /var/run/tiger/work/ /var/run/tiger/ + for dir in /var/log/tiger/ /var/lib/tiger/work /var/lib/tiger/ /var/run/tiger/ do [ -d "$dir" ] && { - find "$dir" -type f -exec rm -f {} \; - rmdir "$dir" + find $dir -type d -o -exec rm -f {} \; + find $dir -type d -depth -exec rmdir {} \; } done # Do we have any tigerXX files under /var/log/? if so we should remove diff -u tiger-3.2.2/debian/control tiger-3.2.2/debian/control --- tiger-3.2.2/debian/control +++ tiger-3.2.2/debian/control @@ -1,7 +1,8 @@ Source: tiger Section: admin Priority: optional -Maintainer: Javier Fernandez-Sanguino Pen~a +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Javier Fernandez-Sanguino Pen~a Build-Depends: debhelper (>= 4.1.13), autoconf, po-debconf (>= 0.5.0) Standards-Version: 3.8.0 Homepage: http://savannah.nongnu.org/projects/tiger/ only in patch2: unchanged: --- tiger-3.2.2.orig/config.in +++ tiger-3.2.2/config.in @@ -133,8 +133,14 @@ # TODO: WORKDIR should be removed on exit if it is located in a temporary # directory if [ ! -d "$WORKDIR" ] ; then + case "$WORKDIR" in + /var/run/* | /tmp* | /var/tmp/* ) + mkdir -p "$WORKDIR" + ;; + *) echo "Configured working directory $WORKDIR does not exist" >&2 exit 1 + esac fi @@ -222,10 +228,11 @@ # [ -n "$RCFILE" -a -f $RCFILE ] && { + tmpf=$(tempfile) $GREP -v '^#' $RCFILE | - $SED -e 's/^\(.*\)=/export \1; \1=/' > $WORKDIR/rcfile.$$ - . $WORKDIR/rcfile.$$ - $RM -f $WORKDIR/rcfile.$$ + $SED -e 's/^\(.*\)=/export \1; \1=/' > $tmpf + . $tmpf + $RM -f $tmpf } HOSTNAME=`$GETHOSTNAME` only in patch2: unchanged: --- tiger-3.2.2.orig/scripts/check_rootdir +++ tiger-3.2.2/scripts/check_rootdir @@ -90,7 +90,7 @@ # Checking to see if the root directory is on the correct INODE number inode=`$LS -di / | $AWK '{print $1}'` fstype=`$GETFS | $GREP " / " | $AWK -F " " '{ print $5;}'` -[ $inode != 2 ] && [ "$fstype" = "ext2" -o "$fstype" = "ext3" ] && +[ $inode != 2 ] && [ "$fstype" = "ext2" -o "$fstype" = "ext3" -o "$fstype" = "ext4" ] && message FAIL rootdir001f "" "Root directory on incorrect inode"