debian/changelog | 2 - debian/xkb-data.postinst | 31 ---------------- debian/xkb-data.preinst | 91 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 32 deletions(-)
New commits: commit bd3b08405526031c82d49566b9989aed7547c6f7 Author: Mohammed Adnene Trojette <[EMAIL PROTECTED]> Date: Sun Jan 13 15:30:43 2008 +0100 * Remove conffiles left in /etc/X11/xkb/ in preinst. (Closes: #366180) diff --git a/debian/changelog b/debian/changelog index 2fdf6a7..23b552d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,7 +17,7 @@ xkeyboard-config (1.1~cvs.20080104.1-1) UNRELEASED; urgency=low made /usr/share/X11/xkb/rules/base.xml a symlink to /etc/X11/xkb/base.xml. (Closes: #410628, #410903, #438940) - * Remove files left in /etc/X11/xkb/. (Closes: #366180) + * Remove conffiles left in /etc/X11/xkb/ in preinst. (Closes: #366180) * New patch: add_void_definition_pl-324647.diff + don't use rules/latin's definitions for alt+{w,q,f}. (Closes: #324647) diff --git a/debian/xkb-data.postinst b/debian/xkb-data.postinst deleted file mode 100644 index adb634d..0000000 --- a/debian/xkb-data.postinst +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# postinst script for xkb-data -# - -set -e - -case "$1" in - configure) - if [ -d /etc/X11/xkb/ -a `find /etc/X11/xkb/ | wc -l` -ne 1 ] - then - find /etc/X11/xkb/* -not -name "base.xml*" | xargs --no-run-if-empty rm - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/xkb-data.preinst b/debian/xkb-data.preinst new file mode 100644 index 0000000..19dfe47 --- /dev/null +++ b/debian/xkb-data.preinst @@ -0,0 +1,91 @@ +#!/bin/sh +# preinst script for #PACKAGE# +# +# see: dh_installdeb(1) + +set -e + +# 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 + fi +} + +case "$1" in +install|upgrade) + if dpkg --compare-versions "$2" le "0.8-3"; then + rm_conffile xkb-data "/etc/X11/xkb/geometry/omnibook" + rm_conffile xkb-data "/etc/X11/xkb/compat/group_led" + rm_conffile xkb-data "/etc/X11/xkb/compat/leds" + rm_conffile xkb-data "/etc/X11/xkb/rules/xfree86-it.lst" + rm_conffile xkb-data "/etc/X11/xkb/symbols/ru_yawerty" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/ar" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/ben" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/cz_qwerty" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/dev" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/dvorak" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/el" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/en_US" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/fr-latin9" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/ge_la" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/ge_ru" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/guj" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/gur" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/il_phonetic" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/iu" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/kan" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/lo" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/mk" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/ml" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/mt_us" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/ogham" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/ori" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/pl2" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/sapmi" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/sk_qwerty" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/sr" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/syr" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/syr_phonetic" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/tel" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/th_pat" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/th_tis" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/tml" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/yu" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/us_intl" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/se_FI" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/se_NO" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/se_SE" + rm_conffile xkb-data "/etc/X11/xkb/symbols/pc/dz" + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]