[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r988 - trunk/debian



Author: dnusinow
Date: 2005-12-30 19:46:30 -0500 (Fri, 30 Dec 2005)
New Revision: 988

Added:
   trunk/debian/xlibs-data.bug.script
   trunk/debian/xlibs-data.links
Removed:
   trunk/debian/xlibs.bug.script
   trunk/debian/xlibs.install
   trunk/debian/xlibs.links
   trunk/debian/xlibs.postinst.in
   trunk/debian/xlibs.postrm.in
   trunk/debian/xlibs.preinst.in
Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/xlibs-data.install
   trunk/debian/xlibs-data.postinst.in
   trunk/debian/xlibs-data.postrm.in
   trunk/debian/xlibs-data.preinst.in
Log:
* Continue xlibs package removal for the release team
  + Move all the stuff from xlibs to xlibs-data
  + Make xlibs-data Architecture: any rather than all
  + Re-word the changelog. It's not a metapackage but a transitional
    package
* Add bug closers and thank-yous from last commit


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-12-31 00:33:41 UTC (rev 987)
+++ trunk/debian/changelog	2005-12-31 00:46:30 UTC (rev 988)
@@ -1,14 +1,16 @@
 xorg-x11 (6.9.0.dfsg.1-1+SVN) UNRELEASED; urgency=low
 
-  * We no longer build or ship the xlibs metapackage at the request of the
-    release team
+  * We no longer build or ship the xlibs transitional package at the request
+    of the release team
+    + Move all the stuff from xlibs to xlibs-data
+    + Make xlibs-data Architecture: any rather than all
   * MANIFEST updates
-    + s390
-    + ppc
+    + s390. Thanks Bastian Blank. (closes: #345328)
+    + ppc. Thanks Paul TBBle Hampson. (closes: #343693)
     + sparc
     + ia64
 
- -- David Nusinow <dnusinow@debian.org>  Fri, 30 Dec 2005 19:32:43 -0500
+ -- David Nusinow <dnusinow@debian.org>  Fri, 30 Dec 2005 19:44:46 -0500
 
 xorg-x11 (6.9.0.dfsg.1-1) unstable; urgency=low
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2005-12-31 00:33:41 UTC (rev 987)
+++ trunk/debian/control	2005-12-31 00:46:30 UTC (rev 988)
@@ -2352,16 +2352,13 @@
 Package: xlibs-data
 Section: libs
 Priority: optional
-Architecture: all
+Architecture: any
 Conflicts: xlibs (<< 4.3.0)
 Replaces: xlibs (<< 4.3.0)
 Description: X Window System client data
- This package provides architecture-independent data for the X Window System,
- including the locale data and a set of bitmap and pixmap image files commonly
- used by X clients, including a set of cursor themes.
- .
- Architecture-independent X Keyboard Extension (XKB) data is found in the
- xlibs package.
+ This package provides data for the X Window System, including the locale
+ data, XKB data, and a set of bitmap and pixmap image files commonly used by X
+ clients, including a set of cursor themes.
 
 Package: xlibs-static-dev
 Section: libdevel

Copied: trunk/debian/xlibs-data.bug.script (from rev 970, trunk/debian/xlibs.bug.script)
===================================================================
--- trunk/debian/xlibs.bug.script	2005-12-27 07:32:07 UTC (rev 970)
+++ trunk/debian/xlibs-data.bug.script	2005-12-31 00:46:30 UTC (rev 988)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# $Id$
+
+XORG_LOGS=$(ls -dt /var/log/Xorg.*.log 2>/dev/null)
+
+if [ -n "$XORG_LOGS" ]; then
+    for LOG in $XORG_LOGS; do
+        if [ -f "$LOG" ]; then
+            printf "Keyboard-related contents of X.Org X server log file\n%s:\n" \
+              "$LOG" >&3
+            egrep -5i '(keyboard|xkb|kbd)' "$LOG" >&3
+            printf "\n" >&3
+        fi
+    done
+    printf "X.Org X server log files on system:\n" >&3
+    ls -dlrt /var/log/Xorg.*.log >&3 2>/dev/null
+else
+    printf "No X.Org X server log files found.\n" >&3
+fi
+
+printf "\n" >&3
+
+if which xkbcomp >/dev/null 2>&1; then
+    if [ -n "$DISPLAY" ]; then
+        printf "Compiled XKB description for X server \"%s\":\n" "$DISPLAY" >&3
+        if ! xkbcomp -o - "$DISPLAY" >&3; then
+            printf "xkbcomp command reported failure.\n" >&3
+        fi
+    else
+        printf "Cannot report compiled XKB description; \$DISPLAY null or undefined.\n"
+    fi
+else
+    printf "xkbcomp command not available.\n" >&3
+fi
+
+printf "\n" >&3
+
+# vim:set ai et sts=4 sw=4 tw=80:

Modified: trunk/debian/xlibs-data.install
===================================================================
--- trunk/debian/xlibs-data.install	2005-12-31 00:33:41 UTC (rev 987)
+++ trunk/debian/xlibs-data.install	2005-12-31 00:46:30 UTC (rev 988)
@@ -2,19 +2,232 @@
 etc/X11/cursors/handhelds.theme
 etc/X11/cursors/redglass.theme
 etc/X11/cursors/whiteglass.theme
+etc/X11/xkb/README
+etc/X11/xkb/README.config
+etc/X11/xkb/README.enhancing
+etc/X11/xkb/compat.dir
+etc/X11/xkb/compat/README
+etc/X11/xkb/compat/accessx
+etc/X11/xkb/compat/basic
+etc/X11/xkb/compat/complete
+etc/X11/xkb/compat/default
+etc/X11/xkb/compat/iso9995
+etc/X11/xkb/compat/japan
+etc/X11/xkb/compat/keypad
 etc/X11/xkb/compat/ledcaps
 etc/X11/xkb/compat/lednum
 etc/X11/xkb/compat/ledscroll
+etc/X11/xkb/compat/misc
+etc/X11/xkb/compat/mousekeys
+etc/X11/xkb/compat/norepeat
+etc/X11/xkb/compat/pc
+etc/X11/xkb/compat/pc98
+etc/X11/xkb/compat/xfree86
+etc/X11/xkb/compat/xtest
+etc/X11/xkb/geometry.dir
+etc/X11/xkb/geometry/README
+etc/X11/xkb/geometry/amiga
+etc/X11/xkb/geometry/ataritt
+etc/X11/xkb/geometry/chicony
+etc/X11/xkb/geometry/dell
+etc/X11/xkb/geometry/digital/lk
+etc/X11/xkb/geometry/digital/pc
+etc/X11/xkb/geometry/digital/unix
+etc/X11/xkb/geometry/everex
+etc/X11/xkb/geometry/fujitsu
+etc/X11/xkb/geometry/hp
+etc/X11/xkb/geometry/ibm/thinkpad
+etc/X11/xkb/geometry/keytronic
+etc/X11/xkb/geometry/kinesis
+etc/X11/xkb/geometry/macintosh
+etc/X11/xkb/geometry/microsoft
+etc/X11/xkb/geometry/nec
+etc/X11/xkb/geometry/northgate
+etc/X11/xkb/geometry/pc
+etc/X11/xkb/geometry/sgi/O2
+etc/X11/xkb/geometry/sgi/indigo
+etc/X11/xkb/geometry/sgi/indy
+etc/X11/xkb/geometry/sony
+etc/X11/xkb/geometry/sun
+etc/X11/xkb/geometry/winbook
+etc/X11/xkb/keycodes.dir
+etc/X11/xkb/keycodes/README
+etc/X11/xkb/keycodes/aliases
+etc/X11/xkb/keycodes/amiga
+etc/X11/xkb/keycodes/ataritt
+etc/X11/xkb/keycodes/digital/lk
+etc/X11/xkb/keycodes/digital/pc
+etc/X11/xkb/keycodes/fujitsu
+etc/X11/xkb/keycodes/hp
+etc/X11/xkb/keycodes/ibm
+etc/X11/xkb/keycodes/macintosh
+etc/X11/xkb/keycodes/powerpcps2
+etc/X11/xkb/keycodes/riscpc
+etc/X11/xkb/keycodes/sgi/indigo
+etc/X11/xkb/keycodes/sgi/indy
+etc/X11/xkb/keycodes/sgi/iris
+etc/X11/xkb/keycodes/sony
+etc/X11/xkb/keycodes/sun
+etc/X11/xkb/keycodes/xfree86
+etc/X11/xkb/keycodes/xfree98
+etc/X11/xkb/keymap.dir
+etc/X11/xkb/keymap/README
+etc/X11/xkb/keymap/amiga
+etc/X11/xkb/keymap/ataritt
+etc/X11/xkb/keymap/digital/us
+etc/X11/xkb/keymap/macintosh
+etc/X11/xkb/keymap/sgi/be
+etc/X11/xkb/keymap/sgi/bg
+etc/X11/xkb/keymap/sgi/ca
+etc/X11/xkb/keymap/sgi/cz
+etc/X11/xkb/keymap/sgi/cz_qwerty
+etc/X11/xkb/keymap/sgi/de
+etc/X11/xkb/keymap/sgi/de_CH
+etc/X11/xkb/keymap/sgi/dk
+etc/X11/xkb/keymap/sgi/dvorak
+etc/X11/xkb/keymap/sgi/en_US
+etc/X11/xkb/keymap/sgi/es
+etc/X11/xkb/keymap/sgi/fi
+etc/X11/xkb/keymap/sgi/fr
+etc/X11/xkb/keymap/sgi/fr_CH
+etc/X11/xkb/keymap/sgi/gb
+etc/X11/xkb/keymap/sgi/hu
+etc/X11/xkb/keymap/sgi/it
+etc/X11/xkb/keymap/sgi/jp
+etc/X11/xkb/keymap/sgi/no
+etc/X11/xkb/keymap/sgi/pl
+etc/X11/xkb/keymap/sgi/pt
+etc/X11/xkb/keymap/sgi/ru
+etc/X11/xkb/keymap/sgi/se
+etc/X11/xkb/keymap/sgi/sk
+etc/X11/xkb/keymap/sgi/sk_qwerty
+etc/X11/xkb/keymap/sgi/th
+etc/X11/xkb/keymap/sgi/us
+etc/X11/xkb/keymap/sony
+etc/X11/xkb/keymap/sun/de
+etc/X11/xkb/keymap/sun/es
+etc/X11/xkb/keymap/sun/fi
+etc/X11/xkb/keymap/sun/fr
+etc/X11/xkb/keymap/sun/no
+etc/X11/xkb/keymap/sun/pl
+etc/X11/xkb/keymap/sun/ru
+etc/X11/xkb/keymap/sun/se
+etc/X11/xkb/keymap/sun/uk
+etc/X11/xkb/keymap/sun/us
+etc/X11/xkb/keymap/xfree86
+etc/X11/xkb/keymap/xfree98
+etc/X11/xkb/rules/README
+etc/X11/xkb/rules/sgi
+etc/X11/xkb/rules/sgi.lst
+etc/X11/xkb/rules/sun
+etc/X11/xkb/rules/sun.lst
+etc/X11/xkb/rules/xorg
+etc/X11/xkb/rules/xorg-it.lst
+etc/X11/xkb/rules/xorg.lst
+etc/X11/xkb/rules/xorg.xml
+etc/X11/xkb/semantics/basic
+etc/X11/xkb/semantics/complete
+etc/X11/xkb/semantics/default
+etc/X11/xkb/semantics/xtest
+etc/X11/xkb/symbols.dir
+etc/X11/xkb/symbols/README
+etc/X11/xkb/symbols/al
+etc/X11/xkb/symbols/altwin
+etc/X11/xkb/symbols/am
+etc/X11/xkb/symbols/apple
 etc/X11/xkb/symbols/ar
+etc/X11/xkb/symbols/az
+etc/X11/xkb/symbols/be
 etc/X11/xkb/symbols/ben
+etc/X11/xkb/symbols/bg
+etc/X11/xkb/symbols/br
+etc/X11/xkb/symbols/bs
+etc/X11/xkb/symbols/by
+etc/X11/xkb/symbols/ca
+etc/X11/xkb/symbols/ca_enhanced
 etc/X11/xkb/symbols/capslock
+etc/X11/xkb/symbols/compose
+etc/X11/xkb/symbols/ctrl
+etc/X11/xkb/symbols/cz
 etc/X11/xkb/symbols/cz_qwerty
+etc/X11/xkb/symbols/czsk
+etc/X11/xkb/symbols/de
+etc/X11/xkb/symbols/de_CH
 etc/X11/xkb/symbols/dev
+etc/X11/xkb/symbols/digital/lk
+etc/X11/xkb/symbols/digital/pc
+etc/X11/xkb/symbols/digital/us
+etc/X11/xkb/symbols/digital/vt
+etc/X11/xkb/symbols/dk
 etc/X11/xkb/symbols/dvorak
+etc/X11/xkb/symbols/ee
 etc/X11/xkb/symbols/el
 etc/X11/xkb/symbols/en_US
+etc/X11/xkb/symbols/es
 etc/X11/xkb/symbols/eurosign
+etc/X11/xkb/symbols/fi
 etc/X11/xkb/symbols/fo
+etc/X11/xkb/symbols/fr
+etc/X11/xkb/symbols/fr_CH
+etc/X11/xkb/symbols/fujitsu/jp
+etc/X11/xkb/symbols/fujitsu/us
+etc/X11/xkb/symbols/gb
+etc/X11/xkb/symbols/ge_la
+etc/X11/xkb/symbols/ge_ru
+etc/X11/xkb/symbols/group
+etc/X11/xkb/symbols/guj
+etc/X11/xkb/symbols/gur
+etc/X11/xkb/symbols/hp/us
+etc/X11/xkb/symbols/hr
+etc/X11/xkb/symbols/hr_US
+etc/X11/xkb/symbols/hu
+etc/X11/xkb/symbols/hu_US
+etc/X11/xkb/symbols/hu_qwerty
+etc/X11/xkb/symbols/ie
+etc/X11/xkb/symbols/il
+etc/X11/xkb/symbols/il_phonetic
+etc/X11/xkb/symbols/inet
+etc/X11/xkb/symbols/ir
+etc/X11/xkb/symbols/is
+etc/X11/xkb/symbols/iso9995-3
+etc/X11/xkb/symbols/it
+etc/X11/xkb/symbols/iu
+etc/X11/xkb/symbols/jp
+etc/X11/xkb/symbols/kan
+etc/X11/xkb/symbols/keypad
+etc/X11/xkb/symbols/la
+etc/X11/xkb/symbols/level3
+etc/X11/xkb/symbols/lo
+etc/X11/xkb/symbols/lock
+etc/X11/xkb/symbols/lt
+etc/X11/xkb/symbols/lt_std
+etc/X11/xkb/symbols/lv
+etc/X11/xkb/symbols/macintosh/de
+etc/X11/xkb/symbols/macintosh/de_CH
+etc/X11/xkb/symbols/macintosh/dk
+etc/X11/xkb/symbols/macintosh/es
+etc/X11/xkb/symbols/macintosh/fi
+etc/X11/xkb/symbols/macintosh/fr
+etc/X11/xkb/symbols/macintosh/fr_CH
+etc/X11/xkb/symbols/macintosh/gb
+etc/X11/xkb/symbols/macintosh/it
+etc/X11/xkb/symbols/macintosh/nl
+etc/X11/xkb/symbols/macintosh/no
+etc/X11/xkb/symbols/macintosh/pt
+etc/X11/xkb/symbols/macintosh/se
+etc/X11/xkb/symbols/macintosh/us
+etc/X11/xkb/symbols/mk
+etc/X11/xkb/symbols/ml
+etc/X11/xkb/symbols/mm
+etc/X11/xkb/symbols/mt
+etc/X11/xkb/symbols/mt_us
+etc/X11/xkb/symbols/nec/jp
+etc/X11/xkb/symbols/nl
+etc/X11/xkb/symbols/no
+etc/X11/xkb/symbols/ogham
+etc/X11/xkb/symbols/ori
+etc/X11/xkb/symbols/pc/al
+etc/X11/xkb/symbols/pc/am
 etc/X11/xkb/symbols/pc/ara
 etc/X11/xkb/symbols/pc/ara
 etc/X11/xkb/symbols/pc/az
@@ -23,21 +236,121 @@
 etc/X11/xkb/symbols/pc/ba
 etc/X11/xkb/symbols/pc/bd
 etc/X11/xkb/symbols/pc/bd
+etc/X11/xkb/symbols/pc/be
+etc/X11/xkb/symbols/pc/bg
+etc/X11/xkb/symbols/pc/br
 etc/X11/xkb/symbols/pc/bt
 etc/X11/xkb/symbols/pc/bt
+etc/X11/xkb/symbols/pc/by
+etc/X11/xkb/symbols/pc/ca
+etc/X11/xkb/symbols/pc/ch
+etc/X11/xkb/symbols/pc/cz
+etc/X11/xkb/symbols/pc/de
+etc/X11/xkb/symbols/pc/dk
+etc/X11/xkb/symbols/pc/ee
+etc/X11/xkb/symbols/pc/es
+etc/X11/xkb/symbols/pc/fi
 etc/X11/xkb/symbols/pc/fo
 etc/X11/xkb/symbols/pc/fo
+etc/X11/xkb/symbols/pc/fr
+etc/X11/xkb/symbols/pc/gb
 etc/X11/xkb/symbols/pc/ge
 etc/X11/xkb/symbols/pc/gr
+etc/X11/xkb/symbols/pc/hr
+etc/X11/xkb/symbols/pc/hu
+etc/X11/xkb/symbols/pc/ie
+etc/X11/xkb/symbols/pc/il
 etc/X11/xkb/symbols/pc/in
+etc/X11/xkb/symbols/pc/ir
+etc/X11/xkb/symbols/pc/is
+etc/X11/xkb/symbols/pc/it
+etc/X11/xkb/symbols/pc/jp
 etc/X11/xkb/symbols/pc/kg
+etc/X11/xkb/symbols/pc/la
 etc/X11/xkb/symbols/pc/latam
+etc/X11/xkb/symbols/pc/latin
 etc/X11/xkb/symbols/pc/lk
+etc/X11/xkb/symbols/pc/lt
+etc/X11/xkb/symbols/pc/lv
 etc/X11/xkb/symbols/pc/mao
 etc/X11/xkb/symbols/pc/mkd
+etc/X11/xkb/symbols/pc/mm
+etc/X11/xkb/symbols/pc/mn
+etc/X11/xkb/symbols/pc/mt
+etc/X11/xkb/symbols/pc/nl
+etc/X11/xkb/symbols/pc/no
+etc/X11/xkb/symbols/pc/pc
 etc/X11/xkb/symbols/pc/pk
+etc/X11/xkb/symbols/pc/pl
+etc/X11/xkb/symbols/pc/pt
+etc/X11/xkb/symbols/pc/ro
+etc/X11/xkb/symbols/pc/ru
+etc/X11/xkb/symbols/pc/se
+etc/X11/xkb/symbols/pc/si
+etc/X11/xkb/symbols/pc/sk
 etc/X11/xkb/symbols/pc/srp
 etc/X11/xkb/symbols/pc/sy
+etc/X11/xkb/symbols/pc/th
+etc/X11/xkb/symbols/pc/tj
+etc/X11/xkb/symbols/pc/tr
+etc/X11/xkb/symbols/pc/ua
+etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/uz
+etc/X11/xkb/symbols/pc/vn
+etc/X11/xkb/symbols/pc104
+etc/X11/xkb/symbols/pl
+etc/X11/xkb/symbols/pl2
+etc/X11/xkb/symbols/pt
+etc/X11/xkb/symbols/ralt
+etc/X11/xkb/symbols/ro
+etc/X11/xkb/symbols/ro2
+etc/X11/xkb/symbols/ru
+etc/X11/xkb/symbols/sapmi
+etc/X11/xkb/symbols/se
+etc/X11/xkb/symbols/se_FI
+etc/X11/xkb/symbols/se_NO
+etc/X11/xkb/symbols/se_SE
+etc/X11/xkb/symbols/sgi/jp
+etc/X11/xkb/symbols/si
+etc/X11/xkb/symbols/sk
+etc/X11/xkb/symbols/sk_qwerty
+etc/X11/xkb/symbols/sony/us
+etc/X11/xkb/symbols/sr
+etc/X11/xkb/symbols/srvr_ctrl
+etc/X11/xkb/symbols/sun/se
+etc/X11/xkb/symbols/sun/us
+etc/X11/xkb/symbols/sun/usb
+etc/X11/xkb/symbols/syr
+etc/X11/xkb/symbols/syr_phonetic
+etc/X11/xkb/symbols/tel
+etc/X11/xkb/symbols/th
+etc/X11/xkb/symbols/th_pat
+etc/X11/xkb/symbols/th_tis
+etc/X11/xkb/symbols/tj
+etc/X11/xkb/symbols/tml
+etc/X11/xkb/symbols/tr
+etc/X11/xkb/symbols/tr_f
+etc/X11/xkb/symbols/ua
+etc/X11/xkb/symbols/us
+etc/X11/xkb/symbols/us_group2
+etc/X11/xkb/symbols/us_group3
+etc/X11/xkb/symbols/us_intl
+etc/X11/xkb/symbols/uz
+etc/X11/xkb/symbols/vn
+etc/X11/xkb/symbols/xfree68/amiga
+etc/X11/xkb/symbols/xfree68/ataritt
+etc/X11/xkb/symbols/yu
+etc/X11/xkb/types.dir
+etc/X11/xkb/types/README
+etc/X11/xkb/types/basic
+etc/X11/xkb/types/caps
+etc/X11/xkb/types/complete
+etc/X11/xkb/types/default
+etc/X11/xkb/types/extra
+etc/X11/xkb/types/iso9995
+etc/X11/xkb/types/mousekeys
+etc/X11/xkb/types/numpad
+etc/X11/xkb/types/pc
 usr/X11R6/include/X11/bitmaps/1x1
 usr/X11R6/include/X11/bitmaps/2x2
 usr/X11R6/include/X11/bitmaps/Dashes

Copied: trunk/debian/xlibs-data.links (from rev 970, trunk/debian/xlibs.links)

Modified: trunk/debian/xlibs-data.postinst.in
===================================================================
--- trunk/debian/xlibs-data.postinst.in	2005-12-31 00:33:41 UTC (rev 987)
+++ trunk/debian/xlibs-data.postinst.in	2005-12-31 00:46:30 UTC (rev 988)
@@ -5,7 +5,7 @@
 # /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
 # Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
 
-# $Id: xlibs-data.postinst.in 1044 2004-02-16 17:40:33Z branden $
+# $Id$
 
 set -e
 
@@ -30,6 +30,13 @@
                                 20
 done
 
+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
+replace_conffile_with_symlink_commit /etc/X11/xkb/rules/xfree86
+replace_conffile_with_symlink_commit /etc/X11/xkb/rules/xfree86.lst 
+replace_conffile_with_symlink_commit /etc/X11/xkb/rules/xfree86.xml
+
 #DEBHELPER#
 
 exit 0

Modified: trunk/debian/xlibs-data.postrm.in
===================================================================
--- trunk/debian/xlibs-data.postrm.in	2005-12-31 00:33:41 UTC (rev 987)
+++ trunk/debian/xlibs-data.postrm.in	2005-12-31 00:46:30 UTC (rev 988)
@@ -5,7 +5,7 @@
 # /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
 # Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
 
-# $Id: xlibs-data.postrm.in 1044 2004-02-16 17:40:33Z branden $
+# $Id$
 
 set -e
 
@@ -21,6 +21,17 @@
     observe "rolling back removal of obsolete symbolic link $LINK"
     mv "$LINK.dpkg-tmp" "$LINK"
   fi
+  if dpkg --compare-versions "$2" lt "6.8.1-0.3"; 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
+    replace_conffile_with_symlink_rollback /etc/X11/xkb/rules/xfree86 \
+    	/etc/X11/xkb/rules/xorg
+    replace_conffile_with_symlink_rollback /etc/X11/xkb/rules/xfree86.lst \
+    	/etc/X11/xkb/rules/xorg.lst
+    replace_conffile_with_symlink_rollback /etc/X11/xkb/rules/xfree86.xml \
+    	/etc/X11/xkb/rules/xorg.xml
+  fi
 fi
 
 #DEBHELPER#

Modified: trunk/debian/xlibs-data.preinst.in
===================================================================
--- trunk/debian/xlibs-data.preinst.in	2005-12-31 00:33:41 UTC (rev 987)
+++ trunk/debian/xlibs-data.preinst.in	2005-12-31 00:46:30 UTC (rev 988)
@@ -5,7 +5,7 @@
 # /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
 # Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
 
-# $Id: xlibs-data.preinst.in 1044 2004-02-16 17:40:33Z branden $
+# $Id$
 
 set -e
 
@@ -21,6 +21,20 @@
     observe "preparing obsolete symbolic link $LINK for removal"
     mv "$LINK" "$LINK.dpkg-tmp"
   fi
+  if dpkg --compare-versions "$2" lt "6.8.1-0.3"; then
+    remove_conffile_prepare /etc/X11/xkb/geometry/omnibook \
+      99647d0d78564ac821c558d2bb7da714
+    remove_conffile_prepare /etc/X11/xkb/symbols/ru_yawerty \
+      b554dadb4877cfeb2cb38dd2531b3eb2
+    remove_conffile_prepare /etc/X11/xkb/rules/xfree86-it.lst \
+      4261329d61ba59549df77ff3734d086c
+    replace_conffile_with_symlink_prepare /etc/X11/xkb/rules/xfree86 \
+      /etc/X11/xkb/rules/xorg 82a80c3162b2254d69d84cbe3dfa9de6
+    replace_conffile_with_symlink_prepare /etc/X11/xkb/rules/xfree86.lst \
+      /etc/X11/xkb/rules/xorg.lst 72bb740887679a6c61530f49a52e0ec4
+    replace_conffile_with_symlink_prepare /etc/X11/xkb/rules/xfree86.xml \
+      /etc/X11/xkb/rules/xorg.xml d2cba1c74edbd1a3bce26e23fafcec9d
+  fi
 fi
 
 #DEBHELPER#

Deleted: trunk/debian/xlibs.bug.script
===================================================================
--- trunk/debian/xlibs.bug.script	2005-12-31 00:33:41 UTC (rev 987)
+++ trunk/debian/xlibs.bug.script	2005-12-31 00:46:30 UTC (rev 988)
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# $Id: xlibs.bug 1557 2004-06-22 18:16:23Z branden $
-
-XORG_LOGS=$(ls -dt /var/log/Xorg.*.log 2>/dev/null)
-
-if [ -n "$XORG_LOGS" ]; then
-    for LOG in $XORG_LOGS; do
-        if [ -f "$LOG" ]; then
-            printf "Keyboard-related contents of X.Org X server log file\n%s:\n" \
-              "$LOG" >&3
-            egrep -5i '(keyboard|xkb|kbd)' "$LOG" >&3
-            printf "\n" >&3
-        fi
-    done
-    printf "X.Org X server log files on system:\n" >&3
-    ls -dlrt /var/log/Xorg.*.log >&3 2>/dev/null
-else
-    printf "No X.Org X server log files found.\n" >&3
-fi
-
-printf "\n" >&3
-
-if which xkbcomp >/dev/null 2>&1; then
-    if [ -n "$DISPLAY" ]; then
-        printf "Compiled XKB description for X server \"%s\":\n" "$DISPLAY" >&3
-        if ! xkbcomp -o - "$DISPLAY" >&3; then
-            printf "xkbcomp command reported failure.\n" >&3
-        fi
-    else
-        printf "Cannot report compiled XKB description; \$DISPLAY null or undefined.\n"
-    fi
-else
-    printf "xkbcomp command not available.\n" >&3
-fi
-
-printf "\n" >&3
-
-# vim:set ai et sts=4 sw=4 tw=80:

Deleted: trunk/debian/xlibs.install
===================================================================
--- trunk/debian/xlibs.install	2005-12-31 00:33:41 UTC (rev 987)
+++ trunk/debian/xlibs.install	2005-12-31 00:46:30 UTC (rev 988)
@@ -1,313 +0,0 @@
-etc/X11/xkb/README
-etc/X11/xkb/README.config
-etc/X11/xkb/README.enhancing
-etc/X11/xkb/compat.dir
-etc/X11/xkb/compat/README
-etc/X11/xkb/compat/accessx
-etc/X11/xkb/compat/basic
-etc/X11/xkb/compat/complete
-etc/X11/xkb/compat/default
-etc/X11/xkb/compat/iso9995
-etc/X11/xkb/compat/japan
-etc/X11/xkb/compat/keypad
-etc/X11/xkb/compat/misc
-etc/X11/xkb/compat/mousekeys
-etc/X11/xkb/compat/norepeat
-etc/X11/xkb/compat/pc
-etc/X11/xkb/compat/pc98
-etc/X11/xkb/compat/xfree86
-etc/X11/xkb/compat/xtest
-etc/X11/xkb/geometry.dir
-etc/X11/xkb/geometry/README
-etc/X11/xkb/geometry/amiga
-etc/X11/xkb/geometry/ataritt
-etc/X11/xkb/geometry/chicony
-etc/X11/xkb/geometry/dell
-etc/X11/xkb/geometry/digital/lk
-etc/X11/xkb/geometry/digital/pc
-etc/X11/xkb/geometry/digital/unix
-etc/X11/xkb/geometry/everex
-etc/X11/xkb/geometry/fujitsu
-etc/X11/xkb/geometry/hp
-etc/X11/xkb/geometry/ibm/thinkpad
-etc/X11/xkb/geometry/keytronic
-etc/X11/xkb/geometry/kinesis
-etc/X11/xkb/geometry/macintosh
-etc/X11/xkb/geometry/microsoft
-etc/X11/xkb/geometry/nec
-etc/X11/xkb/geometry/northgate
-etc/X11/xkb/geometry/pc
-etc/X11/xkb/geometry/sgi/O2
-etc/X11/xkb/geometry/sgi/indigo
-etc/X11/xkb/geometry/sgi/indy
-etc/X11/xkb/geometry/sony
-etc/X11/xkb/geometry/sun
-etc/X11/xkb/geometry/winbook
-etc/X11/xkb/keycodes.dir
-etc/X11/xkb/keycodes/README
-etc/X11/xkb/keycodes/aliases
-etc/X11/xkb/keycodes/amiga
-etc/X11/xkb/keycodes/ataritt
-etc/X11/xkb/keycodes/digital/lk
-etc/X11/xkb/keycodes/digital/pc
-etc/X11/xkb/keycodes/fujitsu
-etc/X11/xkb/keycodes/hp
-etc/X11/xkb/keycodes/ibm
-etc/X11/xkb/keycodes/macintosh
-etc/X11/xkb/keycodes/powerpcps2
-etc/X11/xkb/keycodes/riscpc
-etc/X11/xkb/keycodes/sgi/indigo
-etc/X11/xkb/keycodes/sgi/indy
-etc/X11/xkb/keycodes/sgi/iris
-etc/X11/xkb/keycodes/sony
-etc/X11/xkb/keycodes/sun
-etc/X11/xkb/keycodes/xfree86
-etc/X11/xkb/keycodes/xfree98
-etc/X11/xkb/keymap.dir
-etc/X11/xkb/keymap/README
-etc/X11/xkb/keymap/amiga
-etc/X11/xkb/keymap/ataritt
-etc/X11/xkb/keymap/digital/us
-etc/X11/xkb/keymap/macintosh
-etc/X11/xkb/keymap/sgi/be
-etc/X11/xkb/keymap/sgi/bg
-etc/X11/xkb/keymap/sgi/ca
-etc/X11/xkb/keymap/sgi/cz
-etc/X11/xkb/keymap/sgi/cz_qwerty
-etc/X11/xkb/keymap/sgi/de
-etc/X11/xkb/keymap/sgi/de_CH
-etc/X11/xkb/keymap/sgi/dk
-etc/X11/xkb/keymap/sgi/dvorak
-etc/X11/xkb/keymap/sgi/en_US
-etc/X11/xkb/keymap/sgi/es
-etc/X11/xkb/keymap/sgi/fi
-etc/X11/xkb/keymap/sgi/fr
-etc/X11/xkb/keymap/sgi/fr_CH
-etc/X11/xkb/keymap/sgi/gb
-etc/X11/xkb/keymap/sgi/hu
-etc/X11/xkb/keymap/sgi/it
-etc/X11/xkb/keymap/sgi/jp
-etc/X11/xkb/keymap/sgi/no
-etc/X11/xkb/keymap/sgi/pl
-etc/X11/xkb/keymap/sgi/pt
-etc/X11/xkb/keymap/sgi/ru
-etc/X11/xkb/keymap/sgi/se
-etc/X11/xkb/keymap/sgi/sk
-etc/X11/xkb/keymap/sgi/sk_qwerty
-etc/X11/xkb/keymap/sgi/th
-etc/X11/xkb/keymap/sgi/us
-etc/X11/xkb/keymap/sony
-etc/X11/xkb/keymap/sun/de
-etc/X11/xkb/keymap/sun/es
-etc/X11/xkb/keymap/sun/fi
-etc/X11/xkb/keymap/sun/fr
-etc/X11/xkb/keymap/sun/no
-etc/X11/xkb/keymap/sun/pl
-etc/X11/xkb/keymap/sun/ru
-etc/X11/xkb/keymap/sun/se
-etc/X11/xkb/keymap/sun/uk
-etc/X11/xkb/keymap/sun/us
-etc/X11/xkb/keymap/xfree86
-etc/X11/xkb/keymap/xfree98
-etc/X11/xkb/rules/README
-etc/X11/xkb/rules/sgi
-etc/X11/xkb/rules/sgi.lst
-etc/X11/xkb/rules/sun
-etc/X11/xkb/rules/sun.lst
-etc/X11/xkb/rules/xorg
-etc/X11/xkb/rules/xorg-it.lst
-etc/X11/xkb/rules/xorg.lst
-etc/X11/xkb/rules/xorg.xml
-etc/X11/xkb/semantics/basic
-etc/X11/xkb/semantics/complete
-etc/X11/xkb/semantics/default
-etc/X11/xkb/semantics/xtest
-etc/X11/xkb/symbols.dir
-etc/X11/xkb/symbols/README
-etc/X11/xkb/symbols/al
-etc/X11/xkb/symbols/altwin
-etc/X11/xkb/symbols/am
-etc/X11/xkb/symbols/apple
-etc/X11/xkb/symbols/az
-etc/X11/xkb/symbols/be
-etc/X11/xkb/symbols/bg
-etc/X11/xkb/symbols/br
-etc/X11/xkb/symbols/bs
-etc/X11/xkb/symbols/by
-etc/X11/xkb/symbols/ca
-etc/X11/xkb/symbols/ca_enhanced
-etc/X11/xkb/symbols/compose
-etc/X11/xkb/symbols/ctrl
-etc/X11/xkb/symbols/cz
-etc/X11/xkb/symbols/czsk
-etc/X11/xkb/symbols/de
-etc/X11/xkb/symbols/de_CH
-etc/X11/xkb/symbols/digital/lk
-etc/X11/xkb/symbols/digital/pc
-etc/X11/xkb/symbols/digital/us
-etc/X11/xkb/symbols/digital/vt
-etc/X11/xkb/symbols/dk
-etc/X11/xkb/symbols/ee
-etc/X11/xkb/symbols/es
-etc/X11/xkb/symbols/fi
-etc/X11/xkb/symbols/fr
-etc/X11/xkb/symbols/fr_CH
-etc/X11/xkb/symbols/fujitsu/jp
-etc/X11/xkb/symbols/fujitsu/us
-etc/X11/xkb/symbols/gb
-etc/X11/xkb/symbols/ge_la
-etc/X11/xkb/symbols/ge_ru
-etc/X11/xkb/symbols/group
-etc/X11/xkb/symbols/guj
-etc/X11/xkb/symbols/gur
-etc/X11/xkb/symbols/hp/us
-etc/X11/xkb/symbols/hr
-etc/X11/xkb/symbols/hr_US
-etc/X11/xkb/symbols/hu
-etc/X11/xkb/symbols/hu_US
-etc/X11/xkb/symbols/hu_qwerty
-etc/X11/xkb/symbols/ie
-etc/X11/xkb/symbols/il
-etc/X11/xkb/symbols/il_phonetic
-etc/X11/xkb/symbols/inet
-etc/X11/xkb/symbols/ir
-etc/X11/xkb/symbols/is
-etc/X11/xkb/symbols/iso9995-3
-etc/X11/xkb/symbols/it
-etc/X11/xkb/symbols/iu
-etc/X11/xkb/symbols/jp
-etc/X11/xkb/symbols/kan
-etc/X11/xkb/symbols/keypad
-etc/X11/xkb/symbols/la
-etc/X11/xkb/symbols/level3
-etc/X11/xkb/symbols/lo
-etc/X11/xkb/symbols/lock
-etc/X11/xkb/symbols/lt
-etc/X11/xkb/symbols/lt_std
-etc/X11/xkb/symbols/lv
-etc/X11/xkb/symbols/macintosh/de
-etc/X11/xkb/symbols/macintosh/de_CH
-etc/X11/xkb/symbols/macintosh/dk
-etc/X11/xkb/symbols/macintosh/es
-etc/X11/xkb/symbols/macintosh/fi
-etc/X11/xkb/symbols/macintosh/fr
-etc/X11/xkb/symbols/macintosh/fr_CH
-etc/X11/xkb/symbols/macintosh/gb
-etc/X11/xkb/symbols/macintosh/it
-etc/X11/xkb/symbols/macintosh/nl
-etc/X11/xkb/symbols/macintosh/no
-etc/X11/xkb/symbols/macintosh/pt
-etc/X11/xkb/symbols/macintosh/se
-etc/X11/xkb/symbols/macintosh/us
-etc/X11/xkb/symbols/mk
-etc/X11/xkb/symbols/ml
-etc/X11/xkb/symbols/mm
-etc/X11/xkb/symbols/mt
-etc/X11/xkb/symbols/mt_us
-etc/X11/xkb/symbols/nec/jp
-etc/X11/xkb/symbols/nl
-etc/X11/xkb/symbols/no
-etc/X11/xkb/symbols/ogham
-etc/X11/xkb/symbols/ori
-etc/X11/xkb/symbols/pc/al
-etc/X11/xkb/symbols/pc/am
-etc/X11/xkb/symbols/pc/be
-etc/X11/xkb/symbols/pc/bg
-etc/X11/xkb/symbols/pc/br
-etc/X11/xkb/symbols/pc/by
-etc/X11/xkb/symbols/pc/ca
-etc/X11/xkb/symbols/pc/ch
-etc/X11/xkb/symbols/pc/cz
-etc/X11/xkb/symbols/pc/de
-etc/X11/xkb/symbols/pc/dk
-etc/X11/xkb/symbols/pc/ee
-etc/X11/xkb/symbols/pc/es
-etc/X11/xkb/symbols/pc/fi
-etc/X11/xkb/symbols/pc/fr
-etc/X11/xkb/symbols/pc/gb
-etc/X11/xkb/symbols/pc/hr
-etc/X11/xkb/symbols/pc/hu
-etc/X11/xkb/symbols/pc/ie
-etc/X11/xkb/symbols/pc/il
-etc/X11/xkb/symbols/pc/ir
-etc/X11/xkb/symbols/pc/is
-etc/X11/xkb/symbols/pc/it
-etc/X11/xkb/symbols/pc/jp
-etc/X11/xkb/symbols/pc/la
-etc/X11/xkb/symbols/pc/latin
-etc/X11/xkb/symbols/pc/lt
-etc/X11/xkb/symbols/pc/lv
-etc/X11/xkb/symbols/pc/mm
-etc/X11/xkb/symbols/pc/mn
-etc/X11/xkb/symbols/pc/mt
-etc/X11/xkb/symbols/pc/nl
-etc/X11/xkb/symbols/pc/no
-etc/X11/xkb/symbols/pc/pc
-etc/X11/xkb/symbols/pc/pl
-etc/X11/xkb/symbols/pc/pt
-etc/X11/xkb/symbols/pc/ro
-etc/X11/xkb/symbols/pc/ru
-etc/X11/xkb/symbols/pc/se
-etc/X11/xkb/symbols/pc/si
-etc/X11/xkb/symbols/pc/sk
-etc/X11/xkb/symbols/pc/th
-etc/X11/xkb/symbols/pc/tj
-etc/X11/xkb/symbols/pc/tr
-etc/X11/xkb/symbols/pc/ua
-etc/X11/xkb/symbols/pc/us
-etc/X11/xkb/symbols/pc/uz
-etc/X11/xkb/symbols/pc/vn
-etc/X11/xkb/symbols/pc104
-etc/X11/xkb/symbols/pl
-etc/X11/xkb/symbols/pl2
-etc/X11/xkb/symbols/pt
-etc/X11/xkb/symbols/ralt
-etc/X11/xkb/symbols/ro
-etc/X11/xkb/symbols/ro2
-etc/X11/xkb/symbols/ru
-etc/X11/xkb/symbols/sapmi
-etc/X11/xkb/symbols/se
-etc/X11/xkb/symbols/se_FI
-etc/X11/xkb/symbols/se_NO
-etc/X11/xkb/symbols/se_SE
-etc/X11/xkb/symbols/sgi/jp
-etc/X11/xkb/symbols/si
-etc/X11/xkb/symbols/sk
-etc/X11/xkb/symbols/sk_qwerty
-etc/X11/xkb/symbols/sony/us
-etc/X11/xkb/symbols/sr
-etc/X11/xkb/symbols/srvr_ctrl
-etc/X11/xkb/symbols/sun/se
-etc/X11/xkb/symbols/sun/us
-etc/X11/xkb/symbols/sun/usb
-etc/X11/xkb/symbols/syr
-etc/X11/xkb/symbols/syr_phonetic
-etc/X11/xkb/symbols/tel
-etc/X11/xkb/symbols/th
-etc/X11/xkb/symbols/th_pat
-etc/X11/xkb/symbols/th_tis
-etc/X11/xkb/symbols/tj
-etc/X11/xkb/symbols/tml
-etc/X11/xkb/symbols/tr
-etc/X11/xkb/symbols/tr_f
-etc/X11/xkb/symbols/ua
-etc/X11/xkb/symbols/us
-etc/X11/xkb/symbols/us_group2
-etc/X11/xkb/symbols/us_group3
-etc/X11/xkb/symbols/us_intl
-etc/X11/xkb/symbols/uz
-etc/X11/xkb/symbols/vn
-etc/X11/xkb/symbols/xfree68/amiga
-etc/X11/xkb/symbols/xfree68/ataritt
-etc/X11/xkb/symbols/yu
-etc/X11/xkb/types.dir
-etc/X11/xkb/types/README
-etc/X11/xkb/types/basic
-etc/X11/xkb/types/caps
-etc/X11/xkb/types/complete
-etc/X11/xkb/types/default
-etc/X11/xkb/types/extra
-etc/X11/xkb/types/iso9995
-etc/X11/xkb/types/mousekeys
-etc/X11/xkb/types/numpad
-etc/X11/xkb/types/pc

Deleted: trunk/debian/xlibs.links
===================================================================
--- trunk/debian/xlibs.links	2005-12-31 00:33:41 UTC (rev 987)
+++ trunk/debian/xlibs.links	2005-12-31 00:46:30 UTC (rev 988)
@@ -1,4 +0,0 @@
-etc/X11/xkb/symbols/dvorak etc/X11/xkb/symbols/macintosh/dvorak
-etc/X11/xkb/rules/xorg.xml etc/X11/xkb/rules/xfree86.xml
-etc/X11/xkb/rules/xorg.lst etc/X11/xkb/rules/xfree86.lst
-etc/X11/xkb/rules/xorg etc/X11/xkb/rules/xfree86

Deleted: trunk/debian/xlibs.postinst.in
===================================================================
--- trunk/debian/xlibs.postinst.in	2005-12-31 00:33:41 UTC (rev 987)
+++ trunk/debian/xlibs.postinst.in	2005-12-31 00:46:30 UTC (rev 988)
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# Debian xlibs package post-installation script
-# Copyright 1998-2001, 2003 Branden Robinson.
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-# $Id$
-
-set -e
-
-THIS_PACKAGE=xlibs
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-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
-replace_conffile_with_symlink_commit /etc/X11/xkb/rules/xfree86
-replace_conffile_with_symlink_commit /etc/X11/xkb/rules/xfree86.lst 
-replace_conffile_with_symlink_commit /etc/X11/xkb/rules/xfree86.xml
-                   
-# vim:set ai et sts=2 sw=2 tw=80:

Deleted: trunk/debian/xlibs.postrm.in
===================================================================
--- trunk/debian/xlibs.postrm.in	2005-12-31 00:33:41 UTC (rev 987)
+++ trunk/debian/xlibs.postrm.in	2005-12-31 00:46:30 UTC (rev 988)
@@ -1,35 +0,0 @@
-#!/bin/sh
-# Debian xlibs package post-removal script
-# Copyright 1998-2001, 2003 Branden Robinson.
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-# $Id$
-
-set -e
-
-THIS_PACKAGE=xlibs
-THIS_SCRIPT=postrm
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then
-  if dpkg --compare-versions "$2" lt "6.8.1-0.3"; 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
-    replace_conffile_with_symlink_rollback /etc/X11/xkb/rules/xfree86 \
-    	/etc/X11/xkb/rules/xorg
-    replace_conffile_with_symlink_rollback /etc/X11/xkb/rules/xfree86.lst \
-    	/etc/X11/xkb/rules/xorg.lst
-    replace_conffile_with_symlink_rollback /etc/X11/xkb/rules/xfree86.xml \
-    	/etc/X11/xkb/rules/xorg.xml
-  fi
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=80:

Deleted: trunk/debian/xlibs.preinst.in
===================================================================
--- trunk/debian/xlibs.preinst.in	2005-12-31 00:33:41 UTC (rev 987)
+++ trunk/debian/xlibs.preinst.in	2005-12-31 00:46:30 UTC (rev 988)
@@ -1,38 +0,0 @@
-#!/bin/sh
-# Debian xlibs package pre-installation script
-# Copyright 1998-2001, 2003 Branden Robinson.
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-# $Id$
-
-set -e
-
-THIS_PACKAGE=xlibs
-THIS_SCRIPT=preinst
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
-  if dpkg --compare-versions "$2" lt "6.8.1-0.3"; then
-    remove_conffile_prepare /etc/X11/xkb/geometry/omnibook \
-      99647d0d78564ac821c558d2bb7da714
-    remove_conffile_prepare /etc/X11/xkb/symbols/ru_yawerty \
-      b554dadb4877cfeb2cb38dd2531b3eb2
-    remove_conffile_prepare /etc/X11/xkb/rules/xfree86-it.lst \
-      4261329d61ba59549df77ff3734d086c
-    replace_conffile_with_symlink_prepare /etc/X11/xkb/rules/xfree86 \
-      /etc/X11/xkb/rules/xorg 82a80c3162b2254d69d84cbe3dfa9de6
-    replace_conffile_with_symlink_prepare /etc/X11/xkb/rules/xfree86.lst \
-      /etc/X11/xkb/rules/xorg.lst 72bb740887679a6c61530f49a52e0ec4
-    replace_conffile_with_symlink_prepare /etc/X11/xkb/rules/xfree86.xml \
-      /etc/X11/xkb/rules/xorg.xml d2cba1c74edbd1a3bce26e23fafcec9d
-  fi
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=0:



Reply to: