[Pkg-utopia-commits] r3707 - in /packages/unstable/networkmanager/debian: NetworkManager.conf changelog network-manager.install network-manager.postinst network-manager.preinst nm-system-settings.conf
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Thu Jul 29 23:58:26 UTC 2010
Author: biebl
Date: Thu Jul 29 23:58:25 2010
New Revision: 3707
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3707
Log:
Move configuration file /etc/NetworkManager/nm-system-settings.conf to
/etc/NetworkManager/NetworkManager.conf. Update maintainer scripts to move
the conffile without triggering a dpkg prompt.
Added:
packages/unstable/networkmanager/debian/NetworkManager.conf
- copied unchanged from r3706, packages/unstable/networkmanager/debian/nm-system-settings.conf
Removed:
packages/unstable/networkmanager/debian/nm-system-settings.conf
Modified:
packages/unstable/networkmanager/debian/changelog
packages/unstable/networkmanager/debian/network-manager.install
packages/unstable/networkmanager/debian/network-manager.postinst
packages/unstable/networkmanager/debian/network-manager.preinst
Modified: packages/unstable/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/changelog?rev=3707&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/changelog (original)
+++ packages/unstable/networkmanager/debian/changelog Thu Jul 29 23:58:25 2010
@@ -1,3 +1,11 @@
+network-manager (0.8.1-2) UNRELEASED; urgency=low
+
+ * Move configuration file /etc/NetworkManager/nm-system-settings.conf to
+ /etc/NetworkManager/NetworkManager.conf. Update maintainer scripts to move
+ the conffile without triggering a dpkg prompt.
+
+ -- Michael Biebl <biebl at debian.org> Fri, 30 Jul 2010 01:53:34 +0200
+
network-manager (0.8.1-1) unstable; urgency=low
* New upstream release. (Closes: #590139)
Modified: packages/unstable/networkmanager/debian/network-manager.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/network-manager.install?rev=3707&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/network-manager.install (original)
+++ packages/unstable/networkmanager/debian/network-manager.install Thu Jul 29 23:58:25 2010
@@ -17,5 +17,5 @@
debian/tmp/etc/dbus-1/system.d/nm-avahi-autoipd.conf
debian/tmp/etc/NetworkManager/dispatcher.d/
debian/tmp/etc/NetworkManager/system-connections/
-debian/nm-system-settings.conf etc/NetworkManager/
debian/tmp/lib/udev/rules.d/*.rules
+debian/NetworkManager.conf etc/NetworkManager/
Modified: packages/unstable/networkmanager/debian/network-manager.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/network-manager.postinst?rev=3707&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/network-manager.postinst (original)
+++ packages/unstable/networkmanager/debian/network-manager.postinst Thu Jul 29 23:58:25 2010
@@ -18,49 +18,63 @@
# If prerm fails during replacement due to conflict:
# <postinst> abort-remove in-favour <new-package> <version>
+# Move a conffile without triggering a dpkg question
+mv_conffile() {
+ local OLDCONFFILE="$1"
+ local NEWCONFFILE="$2"
+
+ [ -e "$OLDCONFFILE" ] || return 0
+
+ echo "Preserving user changes to $NEWCONFFILE ..."
+ mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
+ mv -f "$OLDCONFFILE" "$NEWCONFFILE"
+}
case "$1" in
configure)
-
- if ! getent group netdev > /dev/null; then
- addgroup --quiet --system netdev
- fi
-
- if [ -x "/etc/init.d/dbus" ]; then
- invoke-rc.d dbus force-reload || true
- fi
- # Stop the service on upgrades before it is started again.
- # dh_installinit -r will create the start code.
- if [ -n "$2" ]; then
- if [ -x "/etc/init.d/network-manager" ]; then
- invoke-rc.d network-manager stop || true
- fi
- fi
+ if ! getent group netdev > /dev/null; then
+ addgroup --quiet --system netdev
+ fi
- # Update init script priorities
- if dpkg --compare-versions "$2" lt "0.7.0.99-1"; then
- for i in 0 1 6 ; do
- if [ -e /etc/rc$i.d/K14network-manager ]; then
- mv /etc/rc$i.d/K14network-manager /etc/rc$i.d/K88network-manager
- fi
- done
- fi
+ if [ -x "/etc/init.d/dbus" ]; then
+ invoke-rc.d dbus force-reload || true
+ fi
- # Kill nm-system-settings service as in 0.8 it is no longer a separate process
- if dpkg --compare-versions "$2" lt "0.7.999-1"; then
- kill `pidof /usr/sbin/nm-system-settings` 2>/dev/null || true
- fi
+ # Stop the service on upgrades before it is started again.
+ # dh_installinit -r will create the start code.
+ if [ -n "$2" ]; then
+ if [ -x "/etc/init.d/network-manager" ]; then
+ invoke-rc.d network-manager stop || true
+ fi
+ fi
- ;;
+ # Update init script priorities
+ if dpkg --compare-versions "$2" lt "0.7.0.99-1"; then
+ for i in 0 1 6 ; do
+ if [ -e /etc/rc$i.d/K14network-manager ]; then
+ mv /etc/rc$i.d/K14network-manager /etc/rc$i.d/K88network-manager
+ fi
+ done
+ fi
+
+ # Kill nm-system-settings service as in 0.8 it is no longer a separate process
+ if dpkg --compare-versions "$2" lt "0.7.999-1"; then
+ kill `pidof /usr/sbin/nm-system-settings` 2>/dev/null || true
+ fi
+
+ if dpkg --compare-versions "$2" lt "0.8.1-2"; then
+ mv_conffile "/etc/NetworkManager/nm-system-setttings.conf" "/etc/NetworkManager/NetworkManager.conf"
+ fi
+ ;;
abort-upgrade|abort-deconfigure|abort-remove)
- ;;
+ ;;
*)
echo "$0 called with unknown argument \`$1'" 1>&2
- exit 1
- ;;
+ exit 1
+ ;;
esac
#DEBHELPER#
Modified: packages/unstable/networkmanager/debian/network-manager.preinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/network-manager.preinst?rev=3707&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/network-manager.preinst (original)
+++ packages/unstable/networkmanager/debian/network-manager.preinst Thu Jul 29 23:58:25 2010
@@ -18,26 +18,41 @@
# <old-preinst> abort-upgrade <new-version>
-# remove a no-longer used conffile
+# Remove a no-longer used conffile
rm_conffile()
{
PKGNAME="$1"
CONFFILE="$2"
- if [ -e "$CONFFILE" ]; then
- md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
- old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
- if [ "$md5sum" != "$old_md5sum" ]; then
- echo "Obsolete conffile $CONFFILE has been modified by you."
- echo "Saving as $CONFFILE.dpkg-bak ..."
- mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
- else
- echo "Removing obsolete conffile $CONFFILE ..."
- rm -f "$CONFFILE"
- fi
+ [ -e "$CONFFILE" ] || return 0
+
+ local md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ local old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | \
+ sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
+ if [ "$md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-bak ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
fi
}
+# Prepare to move a conffile without triggering a dpkg question
+prep_mv_conffile() {
+ local PKGNAME="$1"
+ local CONFFILE="$2"
+
+ [ -e "$CONFFILE" ] || return 0
+
+ local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
+ local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
+ sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
+ if [ "$md5sum" = "$old_md5sum" ]; then
+ rm -f "$CONFFILE"
+ fi
+}
case "$1" in
install|upgrade)
@@ -70,6 +85,9 @@
if dpkg --compare-versions "$2" lt "0.7.999-1"; then
rm_conffile network-manager /etc/dbus-1/system.d/nm-system-settings.conf
fi
+ if dpkg --compare-versions "$2" lt "0.8.1-2"; then
+ prep_mv_conffile network-manager /etc/NetworkManager/nm-system-settings.conf
+ fi
;;
abort-upgrade)
More information about the Pkg-utopia-commits
mailing list