# HG changeset patch
# User godisch
# Date 1058165803 -3600
# Node ID fb5e1ef118ebccc88c2fa0289f212d9b907bdaab
# Parent  187f5d684589455d91ca9364849c94cdba2b2927
[svn] simplified config file handling using ucf >= 0.17

diff -r 187f5d684589 -r fb5e1ef118eb debian/changelog
--- a/debian/changelog	Wed Jul 09 18:52:33 2003 +0100
+++ b/debian/changelog	Mon Jul 14 07:56:43 2003 +0100
@@ -1,9 +1,11 @@
 noffle (1.1.5-3) unstable; urgency=low
 
+  * Simplified ucf handling, reverted changes from 1.1.5-2 which are now
+    in ucf 0.17, see bug #199233, adjusted ucf dependency.
   * Converted debian/changelog to UTF-8.
   * Updated standards version.
 
- -- Martin A. Godisch <godisch@debian.org>  Wed, 09 Jul 2003 19:52:15 +0200
+ -- Martin A. Godisch <godisch@debian.org>  Mon, 14 Jul 2003 01:57:20 +0200
 
 noffle (1.1.5-2) unstable; urgency=low
 
diff -r 187f5d684589 -r fb5e1ef118eb debian/control
--- a/debian/control	Wed Jul 09 18:52:33 2003 +0100
+++ b/debian/control	Mon Jul 14 07:56:43 2003 +0100
@@ -7,7 +7,7 @@
 
 Package: noffle
 Architecture: any
-Depends: ${shlibs:Depends}, netbase | openbsd-inetd | inetd-superserver, exim | mail-transport-agent, ucf (>= 0.16)
+Depends: ${shlibs:Depends}, netbase | openbsd-inetd | inetd-superserver, exim | mail-transport-agent, ucf (>= 0.17)
 Recommends: debconf (>= 0.5) | debconf-2.0, sysklogd | system-log-daemon
 Conflicts: debconf (<< 0.5)
 Suggests: slrn | news-reader
diff -r 187f5d684589 -r fb5e1ef118eb debian/postinst
--- a/debian/postinst	Wed Jul 09 18:52:33 2003 +0100
+++ b/debian/postinst	Mon Jul 14 07:56:43 2003 +0100
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: postinst 601 2003-06-29 07:22:59Z godisch $
+# $Id: postinst 604 2003-07-14 06:56:43Z godisch $
 
 set -e
 
@@ -41,22 +41,14 @@
 		sed "s/^default-expire[[:space:]].*/default-expire $defexpire/" \
 		> /etc/news/noffle.conf.new
 	chgrp news /etc/news/noffle.conf.new
-	if cmp -s /etc/news/noffle.conf /etc/news/noffle.conf.new; then
-		UCF_FORCE_CONFFNEW=YES ucf /etc/news/noffle.conf.new /etc/news/noffle.conf < /dev/tty
-	else
-		ucf /etc/news/noffle.conf.new /etc/news/noffle.conf < /dev/tty
-	fi
+	ucf /etc/news/noffle.conf.new /etc/news/noffle.conf < /dev/tty
 	rm -f /etc/news/noffle.conf.new
 
 	umask 022
 	cat /usr/share/noffle/conf.debian | \
 		sed "s/^NOFFLE_FETCHMODE=.*/NOFFLE_FETCHMODE=$fetchmode/" \
 		> /etc/default/noffle.new
-	if cmp -s /etc/default/noffle /etc/default/noffle.new; then
-		UCF_FORCE_CONFFNEW=YES ucf /etc/default/noffle.new /etc/default/noffle < /dev/tty
-	else
-		ucf /etc/default/noffle.new /etc/default/noffle < /dev/tty
-	fi
+	ucf /etc/default/noffle.new /etc/default/noffle < /dev/tty
 	rm -f /etc/default/noffle.new
 
 	db_get noffle/port
@@ -69,16 +61,8 @@
 
 	db_stop
 else
-	if cmp -s /etc/news/noffle.conf /usr/share/noffle/noffle.conf; then
-		UCF_FORCE_CONFFNEW=YES ucf /usr/share/noffle/noffle.conf /etc/news/noffle.conf < /dev/tty
-	else
-		ucf /usr/share/noffle/noffle.conf /etc/news/noffle.conf < /dev/tty
-	fi
-	if cmp -s /etc/default/noffle /usr/share/noffle/conf.debian; then
-		UCF_FORCE_CONFFNEW=YES ucf /usr/share/noffle/conf.debian /etc/default/noffle < /dev/tty
-	else
-		ucf /usr/share/noffle/conf.debian /etc/default/noffle < /dev/tty
-	fi
+	ucf /usr/share/noffle/noffle.conf /etc/news/noffle.conf < /dev/tty
+	ucf /usr/share/noffle/conf.debian /etc/default/noffle < /dev/tty
 	port="`grep "/usr/bin/noffle -r" /etc/inetd.conf 2> /dev/null | sed 's/[[:space:]].*$//'`" || true
 	if [ "$port" ]; then
 		update-inetd --enable "$port"