[pkg-wpa-devel] r984 - in /wpasupplicant/trunk/debian: changelog wpasupplicant.postinst wpasupplicant.postrm

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Fri Jan  4 06:38:17 2008
New Revision: 984

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=984
Log:
* Remove upgrade removal of conffiles from wpasupplicant versions that exist
  in oldstable and before. The preinst part of the upgrade handling was
  removed in pkg-wpa commit r852.

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/wpasupplicant.postinst
    wpasupplicant/trunk/debian/wpasupplicant.postrm

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=984&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Fri Jan  4 06:38:17 2008
@@ -61,8 +61,11 @@
   * Update copyright headers of ifupdown scripts, also add a few more code
     comments, a statement of purpose and package ownership as well as some
     other trivial cleanups.
-
- -- Kel Modderman <kel at otaku42.de>  Wed, 02 Jan 2008 14:34:41 +1000
+  * Remove upgrade removal of conffiles from wpasupplicant versions that exist
+    in oldstable and before. The preinst part of the upgrade handling was
+    removed in pkg-wpa commit r852.
+
+ -- Kel Modderman <kel at otaku42.de>  Fri, 04 Jan 2008 16:35:39 +1000
 
 wpasupplicant (0.6.1~git20071119-1) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/wpasupplicant.postinst
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.postinst?rev=984&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.postinst (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.postinst Fri Jan  4 06:38:17 2008
@@ -15,34 +15,8 @@
 # If prerm fails during replacement due to conflict:
 #       <postinst> abort-remove in-favour <new-package> <version>
 
-
-# Remove a no-longer used conffile
-rm_conffile()
-{
-    CONFFILE="$1"
-
-    if [ -e "$CONFFILE" ]; then
-	echo "Removing obsolete conffile $CONFFILE"
-	rm -f "$CONFFILE"
-    fi
-}
-
-
-# Remove init script
-rm_init_script()
-{
-    rm_conffile /etc/default/wpasupplicant
-    rm_conffile /etc/init.d/wpasupplicant
-    rm_conffile /etc/wpa_supplicant.conf
-    update-rc.d -f wpasupplicant remove
-}
-
-
 case "$1" in
     configure)
-	if dpkg --compare-versions "$2" lt "0.4.8-1"; then
-	    rm_init_script
-	fi
 	# Add the netdev group unless it's already there
 	if ! getent group netdev >/dev/null; then
 	    addgroup --quiet --system netdev || true

Modified: wpasupplicant/trunk/debian/wpasupplicant.postrm
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.postrm?rev=984&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.postrm (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.postrm Fri Jan  4 06:38:17 2008
@@ -26,31 +26,6 @@
 # If preinst fails during upgrade:
 #       <new-postrm> abort-upgrade <old-version>
 
-# Undo removal of a no-longer used conffile
-undo_rm_conffile()
-{
-    CONFFILE="$1"
-
-    if [ ! -e "$CONFFILE" ]; then
-	if [ -e "$CONFFILE".dpkg-bak ]; then
-	    echo "Restoring modified conffile $CONFFILE"
-	    mv -f "$CONFFILE".dpkg-bak "$CONFFILE"
-        fi
-    fi
-}
-
-
-# Undo removal of init script
-undo_rm_init_script()
-{
-    undo_rm_conffile /etc/default/wpasupplicant
-    undo_rm_conffile /etc/init.d/wpasupplicant
-    undo_rm_conffile /etc/wpa_supplicant.conf
-    undo_rm_conffile /etc/network/if-pre-up.d/wpasupplicant
-    undo_rm_conffile /etc/network/if-post-down.d/wpasupplicant
-}
-
-
 case "$1" in
     remove)
 	;;
@@ -65,9 +40,6 @@
 	;;
 
     abort-install|abort-upgrade)
-	if dpkg --compare-versions "$2" lt "0.4.8-1"; then
-	    undo_rm_init_script
-	fi
 	;;
 
     *)