Author: dnusinow
Date: 2005-06-07 19:15:42 -0500 (Tue, 07 Jun 2005)
New Revision: 151
Added:
trunk/debian/xlibmesa-dri.bug
Removed:
trunk/debian/xlibmesa-dri.bug.script
Modified:
trunk/debian/MANIFEST.all
trunk/debian/MANIFEST.alpha.in
trunk/debian/MANIFEST.amd64.in
trunk/debian/MANIFEST.arm.in
trunk/debian/MANIFEST.hppa.in
trunk/debian/MANIFEST.hurd-i386.in
trunk/debian/MANIFEST.i386.in
trunk/debian/MANIFEST.ia64.in
trunk/debian/MANIFEST.m68k.in
trunk/debian/MANIFEST.mips.in
trunk/debian/MANIFEST.mipsel.in
trunk/debian/MANIFEST.powerpc.in
trunk/debian/MANIFEST.s390.in
trunk/debian/changelog
trunk/debian/xfonts-base.install
trunk/debian/xlibmesa-dri-dbg.install.i386
trunk/debian/xlibmesa-dri-dbg.install.ia64
trunk/debian/xlibmesa-dri.install.i386
trunk/debian/xlibmesa-dri.install.ia64
trunk/debian/xlibs.install
trunk/debian/xlibs.postinst.in
trunk/debian/xlibs.postrm.in
trunk/debian/xlibs.preinst.in
Log:
Revert changes from Ubuntu packages to allow packages to build
- omnibook, ru_yawerty, XF86Config removed again from various files
- Remove i830 module stuff since it doesn't exist anymore
Renaming xlibmesa-dri.bug.script to xlibmesa-dri.bug
Modified: trunk/debian/MANIFEST.all
===================================================================
--- trunk/debian/MANIFEST.all 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/MANIFEST.all 2005-06-08 00:15:42 UTC (rev 151)
@@ -4017,7 +4017,6 @@
usr/X11R6/lib/X11/fonts/encodings/large/gb2312.1980-0.enc.gz
usr/X11R6/lib/X11/fonts/encodings/large/gbk-0.enc.gz
usr/X11R6/lib/X11/fonts/encodings/large/jisx0201.1976-0.enc.gz
-usr/X11R6/lib/X11/fonts/encodings/large/jisx0208.1983-0.enc.gz
usr/X11R6/lib/X11/fonts/encodings/large/jisx0208.1990-0.enc.gz
usr/X11R6/lib/X11/fonts/encodings/large/jisx0212.1990-0.enc.gz
usr/X11R6/lib/X11/fonts/encodings/large/ksc5601.1987-0.enc.gz
Modified: trunk/debian/MANIFEST.alpha.in
===================================================================
--- trunk/debian/MANIFEST.alpha.in 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/MANIFEST.alpha.in 2005-06-08 00:15:42 UTC (rev 151)
@@ -66,10 +66,10 @@
etc/X11/xdm/GiveConsole
etc/X11/xdm/TakeConsole
etc/X11/xdm/Xaccess
-etc/X11/xdm/Xreset
etc/X11/xdm/Xresources
etc/X11/xdm/Xservers
etc/X11/xdm/Xsession
+etc/X11/xdm/Xreset
etc/X11/xdm/Xsetup_0
etc/X11/xdm/Xstartup
etc/X11/xdm/Xwilling
@@ -121,7 +121,6 @@
etc/X11/xkb/geometry/microsoft
etc/X11/xkb/geometry/nec
etc/X11/xkb/geometry/northgate
-etc/X11/xkb/geometry/omnibook
etc/X11/xkb/geometry/pc
etc/X11/xkb/geometry/sgi/O2
etc/X11/xkb/geometry/sgi/indigo
@@ -388,7 +387,6 @@
etc/X11/xkb/symbols/ralt
etc/X11/xkb/symbols/ro
etc/X11/xkb/symbols/ru
-etc/X11/xkb/symbols/ru_yawerty
etc/X11/xkb/symbols/sapmi
etc/X11/xkb/symbols/se
etc/X11/xkb/symbols/se_FI
Modified: trunk/debian/MANIFEST.amd64.in
===================================================================
--- trunk/debian/MANIFEST.amd64.in 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/MANIFEST.amd64.in 2005-06-08 00:15:42 UTC (rev 151)
@@ -24,7 +24,6 @@
etc/X11/app-defaults/XClock
etc/X11/app-defaults/XClock-color
etc/X11/app-defaults/XConsole
-etc/X11/app-defaults/XF86Cfg
etc/X11/app-defaults/XFontSel
etc/X11/app-defaults/XLoad
etc/X11/app-defaults/XLogo
@@ -125,7 +124,6 @@
etc/X11/xkb/geometry/microsoft
etc/X11/xkb/geometry/nec
etc/X11/xkb/geometry/northgate
-etc/X11/xkb/geometry/omnibook
etc/X11/xkb/geometry/pc
etc/X11/xkb/geometry/sgi/O2
etc/X11/xkb/geometry/sgi/indigo
Modified: trunk/debian/MANIFEST.arm.in
===================================================================
--- trunk/debian/MANIFEST.arm.in 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/MANIFEST.arm.in 2005-06-08 00:15:42 UTC (rev 151)
@@ -121,7 +121,6 @@
etc/X11/xkb/geometry/microsoft
etc/X11/xkb/geometry/nec
etc/X11/xkb/geometry/northgate
-etc/X11/xkb/geometry/omnibook
etc/X11/xkb/geometry/pc
etc/X11/xkb/geometry/sgi/O2
etc/X11/xkb/geometry/sgi/indigo
@@ -388,7 +387,6 @@
etc/X11/xkb/symbols/ralt
etc/X11/xkb/symbols/ro
etc/X11/xkb/symbols/ru
-etc/X11/xkb/symbols/ru_yawerty
etc/X11/xkb/symbols/sapmi
etc/X11/xkb/symbols/se
etc/X11/xkb/symbols/se_FI
Modified: trunk/debian/MANIFEST.hppa.in
===================================================================
--- trunk/debian/MANIFEST.hppa.in 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/MANIFEST.hppa.in 2005-06-08 00:15:42 UTC (rev 151)
@@ -125,7 +125,6 @@
etc/X11/xkb/geometry/microsoft
etc/X11/xkb/geometry/nec
etc/X11/xkb/geometry/northgate
-etc/X11/xkb/geometry/omnibook
etc/X11/xkb/geometry/pc
etc/X11/xkb/geometry/sgi/O2
etc/X11/xkb/geometry/sgi/indigo
@@ -399,7 +398,6 @@
etc/X11/xkb/symbols/ro
etc/X11/xkb/symbols/ro2
etc/X11/xkb/symbols/ru
-etc/X11/xkb/symbols/ru_yawerty
etc/X11/xkb/symbols/sapmi
etc/X11/xkb/symbols/se
etc/X11/xkb/symbols/se_FI
Modified: trunk/debian/MANIFEST.hurd-i386.in
===================================================================
--- trunk/debian/MANIFEST.hurd-i386.in 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/MANIFEST.hurd-i386.in 2005-06-08 00:15:42 UTC (rev 151)
@@ -121,7 +121,6 @@
etc/X11/xkb/geometry/microsoft
etc/X11/xkb/geometry/nec
etc/X11/xkb/geometry/northgate
-etc/X11/xkb/geometry/omnibook
etc/X11/xkb/geometry/pc
etc/X11/xkb/geometry/sgi/O2
etc/X11/xkb/geometry/sgi/indigo
@@ -388,7 +387,6 @@
etc/X11/xkb/symbols/ralt
etc/X11/xkb/symbols/ro
etc/X11/xkb/symbols/ru
-etc/X11/xkb/symbols/ru_yawerty
etc/X11/xkb/symbols/sapmi
etc/X11/xkb/symbols/se
etc/X11/xkb/symbols/se_FI
Modified: trunk/debian/MANIFEST.i386.in
===================================================================
--- trunk/debian/MANIFEST.i386.in 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/MANIFEST.i386.in 2005-06-08 00:15:42 UTC (rev 151)
@@ -24,7 +24,6 @@
etc/X11/app-defaults/XClock
etc/X11/app-defaults/XClock-color
etc/X11/app-defaults/XConsole
-etc/X11/app-defaults/XF86Cfg
etc/X11/app-defaults/XFontSel
etc/X11/app-defaults/XLoad
etc/X11/app-defaults/XLogo
@@ -126,7 +125,6 @@
etc/X11/xkb/geometry/microsoft
etc/X11/xkb/geometry/nec
etc/X11/xkb/geometry/northgate
-etc/X11/xkb/geometry/omnibook
etc/X11/xkb/geometry/pc
etc/X11/xkb/geometry/sgi/O2
etc/X11/xkb/geometry/sgi/indigo
@@ -400,7 +398,6 @@
etc/X11/xkb/symbols/ro
etc/X11/xkb/symbols/ro2
etc/X11/xkb/symbols/ru
-etc/X11/xkb/symbols/ru_yawerty
etc/X11/xkb/symbols/sapmi
etc/X11/xkb/symbols/se
etc/X11/xkb/symbols/se_FI
Modified: trunk/debian/MANIFEST.ia64.in
===================================================================
--- trunk/debian/MANIFEST.ia64.in 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/MANIFEST.ia64.in 2005-06-08 00:15:42 UTC (rev 151)
@@ -24,7 +24,6 @@
etc/X11/app-defaults/XClock
etc/X11/app-defaults/XClock-color
etc/X11/app-defaults/XConsole
-etc/X11/app-defaults/XF86Cfg
etc/X11/app-defaults/XFontSel
etc/X11/app-defaults/XLoad
etc/X11/app-defaults/XLogo
@@ -126,7 +125,6 @@
etc/X11/xkb/geometry/microsoft
etc/X11/xkb/geometry/nec
etc/X11/xkb/geometry/northgate
-etc/X11/xkb/geometry/omnibook
etc/X11/xkb/geometry/pc
etc/X11/xkb/geometry/sgi/O2
etc/X11/xkb/geometry/sgi/indigo
@@ -400,7 +398,6 @@
etc/X11/xkb/symbols/ro
etc/X11/xkb/symbols/ro2
etc/X11/xkb/symbols/ru
-etc/X11/xkb/symbols/ru_yawerty
etc/X11/xkb/symbols/sapmi
etc/X11/xkb/symbols/se
etc/X11/xkb/symbols/se_FI
Modified: trunk/debian/MANIFEST.m68k.in
===================================================================
--- trunk/debian/MANIFEST.m68k.in 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/MANIFEST.m68k.in 2005-06-08 00:15:42 UTC (rev 151)
@@ -121,7 +121,6 @@
etc/X11/xkb/geometry/microsoft
etc/X11/xkb/geometry/nec
etc/X11/xkb/geometry/northgate
-etc/X11/xkb/geometry/omnibook
etc/X11/xkb/geometry/pc
etc/X11/xkb/geometry/sgi/O2
etc/X11/xkb/geometry/sgi/indigo
@@ -388,7 +387,6 @@
etc/X11/xkb/symbols/ralt
etc/X11/xkb/symbols/ro
etc/X11/xkb/symbols/ru
-etc/X11/xkb/symbols/ru_yawerty
etc/X11/xkb/symbols/sapmi
etc/X11/xkb/symbols/se
etc/X11/xkb/symbols/se_FI
Modified: trunk/debian/MANIFEST.mips.in
===================================================================
--- trunk/debian/MANIFEST.mips.in 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/MANIFEST.mips.in 2005-06-08 00:15:42 UTC (rev 151)
@@ -121,7 +121,6 @@
etc/X11/xkb/geometry/microsoft
etc/X11/xkb/geometry/nec
etc/X11/xkb/geometry/northgate
-etc/X11/xkb/geometry/omnibook
etc/X11/xkb/geometry/pc
etc/X11/xkb/geometry/sgi/O2
etc/X11/xkb/geometry/sgi/indigo
@@ -388,7 +387,6 @@
etc/X11/xkb/symbols/ralt
etc/X11/xkb/symbols/ro
etc/X11/xkb/symbols/ru
-etc/X11/xkb/symbols/ru_yawerty
etc/X11/xkb/symbols/sapmi
etc/X11/xkb/symbols/se
etc/X11/xkb/symbols/se_FI
Modified: trunk/debian/MANIFEST.mipsel.in
===================================================================
--- trunk/debian/MANIFEST.mipsel.in 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/MANIFEST.mipsel.in 2005-06-08 00:15:42 UTC (rev 151)
@@ -121,7 +121,6 @@
etc/X11/xkb/geometry/microsoft
etc/X11/xkb/geometry/nec
etc/X11/xkb/geometry/northgate
-etc/X11/xkb/geometry/omnibook
etc/X11/xkb/geometry/pc
etc/X11/xkb/geometry/sgi/O2
etc/X11/xkb/geometry/sgi/indigo
@@ -388,7 +387,6 @@
etc/X11/xkb/symbols/ralt
etc/X11/xkb/symbols/ro
etc/X11/xkb/symbols/ru
-etc/X11/xkb/symbols/ru_yawerty
etc/X11/xkb/symbols/sapmi
etc/X11/xkb/symbols/se
etc/X11/xkb/symbols/se_FI
Modified: trunk/debian/MANIFEST.powerpc.in
===================================================================
--- trunk/debian/MANIFEST.powerpc.in 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/MANIFEST.powerpc.in 2005-06-08 00:15:42 UTC (rev 151)
@@ -24,7 +24,6 @@
etc/X11/app-defaults/XClock
etc/X11/app-defaults/XClock-color
etc/X11/app-defaults/XConsole
-etc/X11/app-defaults/XF86Cfg
etc/X11/app-defaults/XFontSel
etc/X11/app-defaults/XLoad
etc/X11/app-defaults/XLogo
@@ -126,7 +125,6 @@
etc/X11/xkb/geometry/microsoft
etc/X11/xkb/geometry/nec
etc/X11/xkb/geometry/northgate
-etc/X11/xkb/geometry/omnibook
etc/X11/xkb/geometry/pc
etc/X11/xkb/geometry/sgi/O2
etc/X11/xkb/geometry/sgi/indigo
@@ -400,7 +398,6 @@
etc/X11/xkb/symbols/ro
etc/X11/xkb/symbols/ro2
etc/X11/xkb/symbols/ru
-etc/X11/xkb/symbols/ru_yawerty
etc/X11/xkb/symbols/sapmi
etc/X11/xkb/symbols/se
etc/X11/xkb/symbols/se_FI
Modified: trunk/debian/MANIFEST.s390.in
===================================================================
--- trunk/debian/MANIFEST.s390.in 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/MANIFEST.s390.in 2005-06-08 00:15:42 UTC (rev 151)
@@ -116,7 +116,6 @@
etc/X11/xkb/geometry/microsoft
etc/X11/xkb/geometry/nec
etc/X11/xkb/geometry/northgate
-etc/X11/xkb/geometry/omnibook
etc/X11/xkb/geometry/pc
etc/X11/xkb/geometry/sgi/O2
etc/X11/xkb/geometry/sgi/indigo
@@ -383,7 +382,6 @@
etc/X11/xkb/symbols/ralt
etc/X11/xkb/symbols/ro
etc/X11/xkb/symbols/ru
-etc/X11/xkb/symbols/ru_yawerty
etc/X11/xkb/symbols/sapmi
etc/X11/xkb/symbols/se
etc/X11/xkb/symbols/se_FI
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/changelog 2005-06-08 00:15:42 UTC (rev 151)
@@ -34,13 +34,8 @@
- Re-add jisx0208.1983-0.enc.gz to MANIFEST.all's list of font encodings
until I know more about why it was removed.
- - Re-add the following to MANIFEST.[arch] until I know why they were
- removed. A number of other items were removed, but they look Ok. A
- second audit of these would be appreciated.
+ - Re-add the following to MANIFEST.[arch]
- etc/X11/xdm/Xreset
- - etc/X11/app-defaults/XF86Cfg
- - etc/X11/xkb/geometry/omnibook
- - etc/X11/xkb/symbols/ru_yawerty
- Re-enable various modules for xlibmesa-dri-dbg.install
- i810 and tdfx for amd64 . Apparently these were supposed to be
@@ -52,9 +47,6 @@
- ffb and i830 for i386
- ffb, i810, and i830 for ia64
- - Re-enable omnibook and ru_yawerty for xlibs.install
- - Comment out remove_conffile in xlibs.postinst, postrm, and preinst
-
- Handle xlibs-static package split
- Add libxvmc-dev.install.hurd-i386 file which removes
usr/X11R6/lib/libI810XvMC.a. Removing
Modified: trunk/debian/xfonts-base.install
===================================================================
--- trunk/debian/xfonts-base.install 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/xfonts-base.install 2005-06-08 00:15:42 UTC (rev 151)
@@ -26,7 +26,6 @@
usr/X11R6/lib/X11/fonts/encodings/large/gb2312.1980-0.enc.gz
usr/X11R6/lib/X11/fonts/encodings/large/gbk-0.enc.gz
usr/X11R6/lib/X11/fonts/encodings/large/jisx0201.1976-0.enc.gz
-usr/X11R6/lib/X11/fonts/encodings/large/jisx0208.1983-0.enc.gz
usr/X11R6/lib/X11/fonts/encodings/large/jisx0208.1990-0.enc.gz
usr/X11R6/lib/X11/fonts/encodings/large/jisx0212.1990-0.enc.gz
usr/X11R6/lib/X11/fonts/encodings/large/ksc5601.1987-0.enc.gz
Modified: trunk/debian/xlibmesa-dri-dbg.install.i386
===================================================================
--- trunk/debian/xlibmesa-dri-dbg.install.i386 2005-06-07 01:37:48 UTC (rev
150)
+++ trunk/debian/xlibmesa-dri-dbg.install.i386 2005-06-08 00:15:42 UTC (rev
151)
@@ -1,7 +1,5 @@
-usr/X11R6/lib/modules/dri/ffb_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/gamma_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/i810_dri.so /usr/X11R6/lib/modules/dri/debug
-usr/X11R6/lib/modules/dri/i830_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/i915_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/mga_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/r128_dri.so /usr/X11R6/lib/modules/dri/debug
Modified: trunk/debian/xlibmesa-dri-dbg.install.ia64
===================================================================
--- trunk/debian/xlibmesa-dri-dbg.install.ia64 2005-06-07 01:37:48 UTC (rev
150)
+++ trunk/debian/xlibmesa-dri-dbg.install.ia64 2005-06-08 00:15:42 UTC (rev
151)
@@ -1,7 +1,5 @@
-usr/X11R6/lib/modules/dri/ffb_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/gamma_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/i810_dri.so /usr/X11R6/lib/modules/dri/debug
-usr/X11R6/lib/modules/dri/i830_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/mga_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/r128_dri.so /usr/X11R6/lib/modules/dri/debug
usr/X11R6/lib/modules/dri/r200_dri.so /usr/X11R6/lib/modules/dri/debug
Copied: trunk/debian/xlibmesa-dri.bug (from rev 149,
trunk/debian/xlibmesa-dri.bug.script)
Deleted: trunk/debian/xlibmesa-dri.bug.script
===================================================================
--- trunk/debian/xlibmesa-dri.bug.script 2005-06-07 01:37:48 UTC (rev
150)
+++ trunk/debian/xlibmesa-dri.bug.script 2005-06-08 00:15:42 UTC (rev
151)
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# $Id: xlibmesa-dri.bug.script 2182 2005-02-10 06:39:04Z branden $
-
-PATH="/sbin:/usr/bin/X11:$PATH"
-
-if which lspci >/dev/null 2>&1; then
- printf "VGA-compatible devices on PCI bus:\n" >&3
- LC_ALL=C lspci | grep 'VGA compatible controller:' >&3
- LC_ALL=C lspci -n | grep 'Class 0300:' >&3
-else
- printf "The lspci command was not found; not including PCI data.\n" >&3
-fi
-
-printf "\n" >&3
-
-XFREE86_LOGS=$(ls -dt /var/log/XFree86.*.log 2>/dev/null)
-
-if [ -n "$XFREE86_LOGS" ]; then
- printf "XFree86 X server log files on system:\n" >&3
- ls -dlrt /var/log/XFree86.*.log >&3 2>/dev/null
- printf "\n" >&3
- for LOG in $XFREE86_LOGS; do
- if [ -f "$LOG" ]; then
- printf "Contents of most recent XFree86 X server log file\n" >&3
- printf "%s:\n" "$LOG" >&3
- cat "$LOG" >&3
- # the log files are large; only show the most recent
- break
- fi
- done
-else
- printf "No XFree86 X server log files found.\n" >&3
-fi
-
-printf "\n" >&3
-
-if which glxinfo >/dev/null 2>&1; then
- printf "GL-library linkage of glxinfo executable:\n" >&3
- ldd $(which glxinfo) | grep libGL >&3 2>/dev/null
- printf "\n" >&3
- printf "glxinfo reports:\n" >&3
- LIBGL_DEBUG=verbose glxinfo >&3 2>&1
-else
- printf "The glxinfo command was not found; " >&3
- printf "not including GLX extension information.\n" >&3
-fi
-
-# vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/xlibmesa-dri.install.i386
===================================================================
--- trunk/debian/xlibmesa-dri.install.i386 2005-06-07 01:37:48 UTC (rev
150)
+++ trunk/debian/xlibmesa-dri.install.i386 2005-06-08 00:15:42 UTC (rev
151)
@@ -1,7 +1,5 @@
-usr/X11R6/lib/modules/dri/ffb_dri.so
usr/X11R6/lib/modules/dri/gamma_dri.so
usr/X11R6/lib/modules/dri/i810_dri.so
-usr/X11R6/lib/modules/dri/i830_dri.so
usr/X11R6/lib/modules/dri/i915_dri.so
usr/X11R6/lib/modules/dri/mga_dri.so
usr/X11R6/lib/modules/dri/r128_dri.so
Modified: trunk/debian/xlibmesa-dri.install.ia64
===================================================================
--- trunk/debian/xlibmesa-dri.install.ia64 2005-06-07 01:37:48 UTC (rev
150)
+++ trunk/debian/xlibmesa-dri.install.ia64 2005-06-08 00:15:42 UTC (rev
151)
@@ -1,7 +1,5 @@
-usr/X11R6/lib/modules/dri/ffb_dri.so
usr/X11R6/lib/modules/dri/gamma_dri.so
usr/X11R6/lib/modules/dri/i810_dri.so
-usr/X11R6/lib/modules/dri/i830_dri.so
usr/X11R6/lib/modules/dri/mga_dri.so
usr/X11R6/lib/modules/dri/r128_dri.so
usr/X11R6/lib/modules/dri/r200_dri.so
Modified: trunk/debian/xlibs.install
===================================================================
--- trunk/debian/xlibs.install 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/xlibs.install 2005-06-08 00:15:42 UTC (rev 151)
@@ -38,7 +38,6 @@
etc/X11/xkb/geometry/microsoft
etc/X11/xkb/geometry/nec
etc/X11/xkb/geometry/northgate
-etc/X11/xkb/geometry/omnibook
etc/X11/xkb/geometry/pc
etc/X11/xkb/geometry/sgi/O2
etc/X11/xkb/geometry/sgi/indigo
@@ -312,7 +311,6 @@
etc/X11/xkb/symbols/ro
etc/X11/xkb/symbols/ro2
etc/X11/xkb/symbols/ru
-etc/X11/xkb/symbols/ru_yawerty
etc/X11/xkb/symbols/sapmi
etc/X11/xkb/symbols/se
etc/X11/xkb/symbols/se_FI
Modified: trunk/debian/xlibs.postinst.in
===================================================================
--- trunk/debian/xlibs.postinst.in 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/xlibs.postinst.in 2005-06-08 00:15:42 UTC (rev 151)
@@ -15,7 +15,7 @@
#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/geometry/omnibook
+remove_conffile_commit /etc/X11/xkb/symbols/ru_yawerty
# vim:set ai et sts=2 sw=2 tw=80:
Modified: trunk/debian/xlibs.postrm.in
===================================================================
--- trunk/debian/xlibs.postrm.in 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/xlibs.postrm.in 2005-06-08 00:15:42 UTC (rev 151)
@@ -15,8 +15,8 @@
#INCLUDE_SHELL_LIB#
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/geometry/omnibook
+ remove_conffile_rollback /etc/X11/xkb/symbols/ru_yawerty
fi
#DEBHELPER#
Modified: trunk/debian/xlibs.preinst.in
===================================================================
--- trunk/debian/xlibs.preinst.in 2005-06-07 01:37:48 UTC (rev 150)
+++ trunk/debian/xlibs.preinst.in 2005-06-08 00:15:42 UTC (rev 151)
@@ -16,10 +16,10 @@
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/geometry/omnibook \
+ 99647d0d78564ac821c558d2bb7da714
+ remove_conffile_prepare /etc/X11/xkb/symbols/ru_yawerty \
+ b554dadb4877cfeb2cb38dd2531b3eb2
fi
fi
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
