[Cdd-commits] r273 - in cdd/branches/cdd/0.3.x: debian templates

[Otavio Salvador]

Author: otavio
Date: Tue Jul 20 14:53:56 2004
New Revision: 273

Modified:
   cdd/branches/cdd/0.3.x/debian/changelog
   cdd/branches/cdd/0.3.x/templates/postinst
Log:
Merge changes did in 0.3.3.

Modified: cdd/branches/cdd/0.3.x/debian/changelog
==============================================================================
--- cdd/branches/cdd/0.3.x/debian/changelog	(original)
+++ cdd/branches/cdd/0.3.x/debian/changelog	Tue Jul 20 14:53:56 2004
@@ -1,3 +1,13 @@
+cdd (0.3.3) unstable; urgency=high
+
+  * Remove broken code from templates/postinst to clean up
+    ${HOME}/.menu directories.  This code does more harm than
+    it would help.
+    Closes: #259412
+  * Urgency set to high because it fixes a grave bug.
+
+ -- Andreas Tille <tille@debian.org>  Wed, 14 Jul 2004 21:34:55 +0200
+
 cdd (0.3.2) unstable; urgency=low
 
   * Remove ${HOME}/.menu/cdd-menu in postinst only if ${MENU}/.menu exists

Modified: cdd/branches/cdd/0.3.x/templates/postinst
==============================================================================
--- cdd/branches/cdd/0.3.x/templates/postinst	(original)
+++ cdd/branches/cdd/0.3.x/templates/postinst	Tue Jul 20 14:53:56 2004
@@ -28,21 +28,6 @@
 	;;
 esac
 
-# Version 0.3 changed ${HOME}/.menu which is not necessary any more and
-# thus files will be removed now
-# This code should be removed for the stable release because we can not
-# care for clean updates to old testing verisons for endless time ...
-for ROLE in `getCDDRoleList #CDD#`; do
-        for CDDUSER in `getUsersInRole #CDD# ${ROLE} 1`; do
-		USERHOME="`getUserHome ${CDDUSER}`"
-		if [ -d ${USERHOME}/.menu ] ; then
-		    OLDENTRY="${USERHOME}/.menu/cdd-menu"
-		    test -L ${OLDENTRY} && rm -f ${OLDENTRY} \
-			    && cddLog "Removing old menu entry for ${CDDUSER}"
-		fi
-        done
-done
-
 #DEBHELPER#
 
 db_stop