cleanup config handling in xlibs
Changes:
* Fix a typo in debian/shell-lib.sh (seems we had non-working
remove_conffile_prepare and broken conffiles handling for like some
months now)
* Remove /etc/X11/xkb/rules/xfree86.lst and
/etc/X11/xkb/rules/xfree86-it.lst as we don't ship them anymore.
* Copy /etc/X11/xkb/rules/xfree86 to /etc/X11/xkb/rules/xorg (so it is
properly handled through conffiles mechanism) if it was locally
modified (Closes #318650).
diff -Nru debian.orig/shell-lib.sh debian/shell-lib.sh
--- debian.orig/shell-lib.sh 2005-08-06 06:17:05.000000000 +0800
+++ debian/shell-lib.sh 2005-08-06 06:16:25.000000000 +0800
@@ -461,7 +461,7 @@
exit $SHELL_LIB_USAGE_ERROR
fi
- conffile="$1"
+ _conffile="$1"
shift
# does the _conffile even exist?
diff -Nru debian.orig/xlibs.postinst.in debian/xlibs.postinst.in
--- debian.orig/xlibs.postinst.in 2005-08-06 06:17:14.000000000 +0800
+++ debian/xlibs.postinst.in 2005-08-06 06:16:18.000000000 +0800
@@ -17,5 +17,8 @@
remove_conffile_commit /etc/X11/xkb/geometry/omnibook
remove_conffile_commit /etc/X11/xkb/symbols/ru_yawerty
-
+remove_conffile_commit /etc/X11/xkb/rules/xfree86-it.lst
+remove_conffile_commit /etc/X11/xkb/rules/xfree86.lst
+remove_conffile_commit /etc/X11/xkb/rules/xfree86
+
# vim:set ai et sts=2 sw=2 tw=80:
diff -Nru debian.orig/xlibs.postrm.in debian/xlibs.postrm.in
--- debian.orig/xlibs.postrm.in 2005-08-06 06:17:14.000000000 +0800
+++ debian/xlibs.postrm.in 2005-08-06 06:16:18.000000000 +0800
@@ -17,6 +17,9 @@
if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then
remove_conffile_rollback /etc/X11/xkb/geometry/omnibook
remove_conffile_rollback /etc/X11/xkb/symbols/ru_yawerty
+ remove_conffile_rollback /etc/X11/xkb/rules/xfree86-it.lst
+ remove_conffile_rollback /etc/X11/xkb/rules/xfree86.lst
+ rm -f /etc/X11/xkb/rules/xorg
fi
#DEBHELPER#
diff -Nru debian.orig/xlibs.preinst.in debian/xlibs.preinst.in
--- debian.orig/xlibs.preinst.in 2005-08-06 06:17:14.000000000 +0800
+++ debian/xlibs.preinst.in 2005-08-06 06:18:25.000000000 +0800
@@ -20,6 +20,15 @@
99647d0d78564ac821c558d2bb7da714
remove_conffile_prepare /etc/X11/xkb/symbols/ru_yawerty \
b554dadb4877cfeb2cb38dd2531b3eb2
+ remove_conffile_prepare /etc/X11/xkb/rules/xfree86-it.lst \
+ 4261329d61ba59549df77ff3734d086c
+ remove_conffile_prepare /etc/X11/xkb/rules/xfree86.lst \
+ 72bb740887679a6c61530f49a52e0ec4
+ remove_conffile_prepare /etc/X11/xkb/rules/xfree86 \
+ 82a80c3162b2254d69d84cbe3dfa9de6
+ if [ -f /etc/X11/xkb/rules/xfree86 ]; then
+ cp /etc/X11/xkb/rules/xfree86 /etc/X11/xkb/rules/xorg
+ fi
fi
fi
Reply to: