Codebase list avahi / b93e9b4
Remove AVAHI_DNSCONFD_START option because we start avahi-dnsconfd by default anyway. As /etc/default/avahi-dnsconfd is now empty, remove it on upgrades. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/avahi@3609 ceb527fc-18e6-0310-9fe2-813c157c29e7 Michael Biebl 13 years ago
4 changed file(s) with 36 addition(s) and 12 deletion(s). Raw diff Collapse all Expand all
+0
-2
debian/avahi-dnsconfd.default less more
0 # 0 = don't start, 1 = start
1 AVAHI_DNSCONFD_START=1
2424
2525 . /lib/lsb/init-functions
2626
27 # don't start if /etc/default/avahi-dnsconfd says so.
28 AVAHI_DNSCONFD_START=1
29 test -f /etc/default/avahi-dnsconfd && . /etc/default/avahi-dnsconfd
30
31 if [ "$AVAHI_DNSCONFD_START" != "1" -a "$1" != "stop" ]; then
32 log_warning_msg "Not starting $DESC $NAME, disabled via /etc/default/$NAME"
33 exit 0
34 fi
35
3627 #
3728 # Function that starts the daemon/service.
3829 #
4637 fi
4738 cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1
4839 fi;
49
40
5041 $DAEMON -D
5142 }
5243
0 #!/bin/sh
1
2 set -e
3
4 # Remove a no-longer used conffile
5 rm_conffile() {
6 local PKGNAME="$1"
7 local CONFFILE="$2"
8
9 [ -e "$CONFFILE" ] || return 0
10
11 local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
12 local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
13 sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
14 if [ "$md5sum" != "$old_md5sum" ]; then
15 echo "Obsolete conffile $CONFFILE has been modified by you."
16 echo "Saving as $CONFFILE.dpkg-bak ..."
17 mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
18 else
19 echo "Removing obsolete conffile $CONFFILE ..."
20 rm -f "$CONFFILE"
21 fi
22 }
23
24 case "$1" in
25 install|upgrade)
26 if dpkg --compare-versions "$2" lt "0.6.26-1"; then
27 rm_conffile avahi-dnsconfd "/etc/default/avahi-dnsconfd"
28 fi
29 esac
30
31 #DEBHELPER#
2525 python dist-packages transition.
2626 * Bump Standards-Version to 3.9.0. Use architecture wild-card linux-any for
2727 the libcap-dev Build-Depends and avahi-autoipd.
28 * Remove AVAHI_DNSCONFD_START option because we start avahi-dnsconfd by
29 default anyway. As /etc/default/avahi-dnsconfd is now empty, remove it on
30 upgrades.
2831
2932 -- Michael Biebl <biebl@debian.org> Wed, 30 Jun 2010 02:47:56 +0200
3033