X Strike Force X.Org X11 SVN commit: r2170 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-05-18 21:43:59 -0400 (Thu, 18 May 2006)
New Revision: 2170
Modified:
trunk/debian/xorg/debian/x11-common.config.in
trunk/debian/xorg/debian/x11-common.preinst.in
Log:
Fix several bugs in the new debconfage
Modified: trunk/debian/xorg/debian/x11-common.config.in
===================================================================
--- trunk/debian/xorg/debian/x11-common.config.in 2006-05-18 13:20:55 UTC (rev 2169)
+++ trunk/debian/xorg/debian/x11-common.config.in 2006-05-19 01:43:59 UTC (rev 2170)
@@ -157,7 +157,6 @@
set -e
if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt "1:7.0.11"; then
- run db_fset x11-common/upgrade_issues seen false
run db_input critical x11-common/upgrade_issues
run db_go
fi
Modified: trunk/debian/xorg/debian/x11-common.preinst.in
===================================================================
--- trunk/debian/xorg/debian/x11-common.preinst.in 2006-05-18 13:20:55 UTC (rev 2169)
+++ trunk/debian/xorg/debian/x11-common.preinst.in 2006-05-19 01:43:59 UTC (rev 2170)
@@ -46,13 +46,7 @@
# We need to remove /usr/X11R6/bin so we can replace it with a symlink
if [ -d "/usr/X11R6/bin" ] && [ ! -L /usr/X11R6/bin ]; then
- rmdir "/usr/X11R6/bin"
- if [ "$?" ne 0 ]; then
- run db_fset x11-common/x11r6_bin_not_empty seen false
- run db_input critical x11-common/x11r6_bin_not_empty
- run db_go
- exit 1
- fi
+ rmdir "/usr/X11R6/bin" || run db_fset x11-common/x11r6_bin_not_empty seen false && run db_input critical x11-common/x11r6_bin_not_empty && run db_go && exit 1
fi
# migration hilarity
Reply to: