Author: dnusinow
Date: 2006-04-29 18:06:16 -0400 (Sat, 29 Apr 2006)
New Revision: 2001
Added:
trunk/debian/xorg/debian/xfree86-common.postinst.in
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/control
Log:
Rodney Gordon II, Adam Borowski. Thanks to Steven Brown for a fix.
* Add xfree86-common transitional package. This package is meant to remove
files that were moved to x11-common, like Xsession. Thanks Frank Kuster.
Thanks to Daniel Stone for the fix. (closes: #354146)
* Remove xfree86-common stuff from /etc/X11/Xsession.d when the new
xfree86-common package is purged. Thanks Joe Drew. (closes: #318294)
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-04-29 19:48:09 UTC (rev 2000)
+++ trunk/debian/xorg/debian/changelog 2006-04-29 22:06:16 UTC (rev 2001)
@@ -4,10 +4,15 @@
backing up :-) Thanks Frans Pop and Flavio Stanchin. (closes: 365278)
* Prevent the xserver-xorg config from failing during migration of
zaxismapping and emulate3buttons questions when they don't exist. Thanks
- Rodney Gordon II, Adam Borowski. Thanks to Steven Brown for a fix.
+ Rodney Gordon II, Adam Borowski. Thanks to Steven Brown for a fix.
(closes: #365282)
+ * Add xfree86-common transitional package. This package is meant to remove
+ files that were moved to x11-common, like Xsession. Thanks Frank Kuster.
+ Thanks to Daniel Stone for the fix. (closes: #354146)
+ * Remove xfree86-common stuff from /etc/X11/Xsession.d when the new
+ xfree86-common package is purged. Thanks Joe Drew. (closes: #318294)
- -- David Nusinow <[EMAIL PROTECTED]> Sat, 29 Apr 2006 15:44:42 -0400
+ -- David Nusinow <[EMAIL PROTECTED]> Sat, 29 Apr 2006 17:05:48 -0400
xorg (1:7.0.15) unstable; urgency=low
Modified: trunk/debian/xorg/debian/control
===================================================================
--- trunk/debian/xorg/debian/control 2006-04-29 19:48:09 UTC (rev 2000)
+++ trunk/debian/xorg/debian/control 2006-04-29 22:06:16 UTC (rev 2001)
@@ -9,9 +9,9 @@
Package: x11-common
Architecture: any
Depends: ${misc:Depends}, debianutils (>= 1.13), lsb-base (>= 1.3-9ubuntu2)
-Pre-Depends: debconf | debconf-2.0
-Conflicts: xfree86-common, xorg-common, xserver-common, x-common, xserver-xorg
(<< 1:7.0.12), xserver-xfree86 (<= 6.9.0.dfsg.1-6), libxft-dev (<= 2.1.8.2-5),
aee (<= 2.2.15b-1), ascd (<= 0.13.2-3), bibview (<= 2.2-8), fvwm1 (<=
1.24r-46), grace (<= 1:5.1.18-1), groff (<= 1.18.1.1-7), hfsutils-tcltk (<=
3.2.6-7), login.app (<= 1.2.1-18), oneko (<= 1.2.sakura.6-1), procmeter (<=
2.5.1-11), propsel (<= 971130-5.3), regexplorer (<= 0.1.6-12), tkseti (<=
3.06-1), wdm (<= 1.28-1), wily (<= 0.13.41-6), wmnetselect (<= 0.85-5.5),
wmsensors (<= 1.0.4-3.4), wmtv (<= 0.6.5-15), xbanner (<= 1.31-23), xcolors (<=
1.5a-2), xcolorsel (<= 1.1a-11), xezmlm (<= 1.0.3-11), xfs-xtt (<=
1:1.4.1.xf430-6), xgdipc (<= 1.2-0.3), xgmod (<= 3.1-9), xgraph (<= 12.1-3),
xlogmaster (<= 1.6.0-8), xmailbox (<= 2.5-9), xmem (<= 1.20-19), xnecview (<=
1.34-2), xodo (<= 1.2-9.2), xturqstat (<= 2.2.2sarge1), xwit (<= 3.4-6),
lbxproxy (<= 6.9.0.dfsg.1-6), proxymngr (<= 6.9.0.dfsg.1-6), twm (<=
6.9.0.dfsg.1-6), xbase-clients (<= 6.9.0.dfsg.1-6), xdm (<= 6.9.0.dfsg.1-6),
xfs (<= 6.9.0.dfsg.1-6), xfwp (<= 6.9.0.dfsg.1-6), xutils (<= 6.9.0.dfsg.1-6),
xvfb (<= 6.9.0.dfsg.1-6), qcam (<= 0.91-11.1), twlog (<= 1.3-4), xdmx (<=
6.9.0.dfsg.1-6), bugsx (<= 1.08-8), buici-clock (<= 0.4.5+b1), ctwm (<= 3.7-2),
emelfm (<= 0.9.2-7), fte-xwindow (<= 0.50.0-1.3), fvwm95 (<= 2.0.43ba-23+b1),
gerstensaft (<= 0.2-5.1), gipsc (<= 0.4.3-2), gradio (<= 1.0.1-6),
hanterm-classic (<= 3.1.6.0-4), hanterm-xf (<= 1:3.3.1p18-9.2), ibp (<=
0.21-4), isdnutils-xtools (<= 1:3.8.2005-12-06-4), ivtools-bin (<= 1.1.3-5),
kdrill (<= 6.4-2.1), kinput2-canna (<= 3.1-7), kinput2-canna-wnn (<= 3.1-7),
kinput2-wnn (<= 3.1-7), kterm (<= 6.2.0-45), lm-batmon (<= 0.96-3), lwm (<=
1.2.1-1), mctools-lite (<= 970129-16), mgp (<= 1.11b-6), olvwm (<=
4.4.3.2p1.4-21), olwm (<= 3.2p1.4-21), pixmap (<= 2.6pl4-14.1), plotmtv (<=
1.4.4t-8.1), ppxp-x11 (<= 0.2001080415-14), seyon (<= 2.20c-20), skkinput (<=
1:2.06.4-4), tkdesk (<= 2.0-5), videogen (<= 0.32-1), vtwm (<= 5.4.7-2), w9wm
(<= 0.4.2-4), wmavgload (<= 0.7.0-6.1), wmcpu (<= 1.3-4.1), wmdate (<=
0.5-7.1), wmnet (<= 1.05-12), wmscope (<= 3.0-9.1), xautolock (<= 1:2.1-6),
xbatt (<= 1.2.1-4), xbattbar (<= 1.4.2-3.1), xcal (<= 4.1-18.2), xcalendar-i18n
(<= 4.0.0.i18p1-13.1), xcb (<= 2.4-4), xclip (<= 0.08-5), xclips (<= 6.21-6),
xdkcal (<= 0.9d-2.1), xdu (<= 3.0-14), xengine (<= 1.11-9), xfaces (<= 3.3-25),
xfishtank (<= 2.2-23.1), xfm (<= 1.4.3-8), xinput (<= 1.2-5.2), xipmsg (<=
0.8088-1.1), xlbiff (<= 4.1-1.1), xli (<= 1.17.0-21), xlockmore (<= 1:5.21-1),
xlockmore-gl (<= 1:5.21-1), xmeter (<= 1.15-6), xmix (<= 2.1-5), xmon (<=
1.5.6-1.3), xpostit (<= 3.3.1-8.2), xprint (<= 1:0.1.0.alpha1-13), xrn (<=
9.02-7.1), xsysinfo (<= 1.7-2), xtel (<= 3.3.0-5.2), xtoolwait (<= 1.3-6),
xtrlock (<= 2.0-11), xview-clients (<= 3.2p1.4-21), xviewg (<= 3.2p1.4-21),
xviewg-dev (<= 3.2p1.4-21), xvkbd (<= 2.6-2.1), xxkb (<= 1.10-2.1), xzoom (<=
0.3-17), pgaccess (<= 1:0.98.8.20030520-2), xearth (<= 1.1-10.2), libmotif-dev
(<= 2.2.3-1.3), motif-clients (<= 2.2.3-1.3), xslideshow (<= 3.1-8.1), xtrkcad
(<= 3.1.4-1), pmud (<= 0.10-9), xnest (<= 6.9.0.dfsg.1-6), xterm (<< 208-1),
xmh (<= 6.8.2.dfsg.1-4), beaver (<= 0.2.5-2), lsb-core (<= 3.1-4), yank
(<=0.2.1-7.2)
-Replaces: xfree86-common, xorg-common, xserver-common, x-common
+Pre-Depends: debconf | debconf-2.0, xfree86-common (>= 1:7.0.0)
+Conflicts: xfree86-common (<< 1:7.0.0), xorg-common, xserver-common, x-common,
xserver-xorg (<< 1:7.0.12), xserver-xfree86 (<= 6.9.0.dfsg.1-6), libxft-dev (<=
2.1.8.2-5), aee (<= 2.2.15b-1), ascd (<= 0.13.2-3), bibview (<= 2.2-8), fvwm1
(<= 1.24r-46), grace (<= 1:5.1.18-1), groff (<= 1.18.1.1-7), hfsutils-tcltk (<=
3.2.6-7), login.app (<= 1.2.1-18), oneko (<= 1.2.sakura.6-1), procmeter (<=
2.5.1-11), propsel (<= 971130-5.3), regexplorer (<= 0.1.6-12), tkseti (<=
3.06-1), wdm (<= 1.28-1), wily (<= 0.13.41-6), wmnetselect (<= 0.85-5.5),
wmsensors (<= 1.0.4-3.4), wmtv (<= 0.6.5-15), xbanner (<= 1.31-23), xcolors (<=
1.5a-2), xcolorsel (<= 1.1a-11), xezmlm (<= 1.0.3-11), xfs-xtt (<=
1:1.4.1.xf430-6), xgdipc (<= 1.2-0.3), xgmod (<= 3.1-9), xgraph (<= 12.1-3),
xlogmaster (<= 1.6.0-8), xmailbox (<= 2.5-9), xmem (<= 1.20-19), xnecview (<=
1.34-2), xodo (<= 1.2-9.2), xturqstat (<= 2.2.2sarge1), xwit (<= 3.4-6),
lbxproxy (<= 6.9.0.dfsg.1-6), proxymngr (<= 6.9.0.dfsg.1-6), twm (<=
6.9.0.dfsg.1-6), xbase-clients (<= 6.9.0.dfsg.1-6), xdm (<= 6.9.0.dfsg.1-6),
xfs (<= 6.9.0.dfsg.1-6), xfwp (<= 6.9.0.dfsg.1-6), xutils (<= 6.9.0.dfsg.1-6),
xvfb (<= 6.9.0.dfsg.1-6), qcam (<= 0.91-11.1), twlog (<= 1.3-4), xdmx (<=
6.9.0.dfsg.1-6), bugsx (<= 1.08-8), buici-clock (<= 0.4.5+b1), ctwm (<= 3.7-2),
emelfm (<= 0.9.2-7), fte-xwindow (<= 0.50.0-1.3), fvwm95 (<= 2.0.43ba-23+b1),
gerstensaft (<= 0.2-5.1), gipsc (<= 0.4.3-2), gradio (<= 1.0.1-6),
hanterm-classic (<= 3.1.6.0-4), hanterm-xf (<= 1:3.3.1p18-9.2), ibp (<=
0.21-4), isdnutils-xtools (<= 1:3.8.2005-12-06-4), ivtools-bin (<= 1.1.3-5),
kdrill (<= 6.4-2.1), kinput2-canna (<= 3.1-7), kinput2-canna-wnn (<= 3.1-7),
kinput2-wnn (<= 3.1-7), kterm (<= 6.2.0-45), lm-batmon (<= 0.96-3), lwm (<=
1.2.1-1), mctools-lite (<= 970129-16), mgp (<= 1.11b-6), olvwm (<=
4.4.3.2p1.4-21), olwm (<= 3.2p1.4-21), pixmap (<= 2.6pl4-14.1), plotmtv (<=
1.4.4t-8.1), ppxp-x11 (<= 0.2001080415-14), seyon (<= 2.20c-20), skkinput (<=
1:2.06.4-4), tkdesk (<= 2.0-5), videogen (<= 0.32-1), vtwm (<= 5.4.7-2), w9wm
(<= 0.4.2-4), wmavgload (<= 0.7.0-6.1), wmcpu (<= 1.3-4.1), wmdate (<=
0.5-7.1), wmnet (<= 1.05-12), wmscope (<= 3.0-9.1), xautolock (<= 1:2.1-6),
xbatt (<= 1.2.1-4), xbattbar (<= 1.4.2-3.1), xcal (<= 4.1-18.2), xcalendar-i18n
(<= 4.0.0.i18p1-13.1), xcb (<= 2.4-4), xclip (<= 0.08-5), xclips (<= 6.21-6),
xdkcal (<= 0.9d-2.1), xdu (<= 3.0-14), xengine (<= 1.11-9), xfaces (<= 3.3-25),
xfishtank (<= 2.2-23.1), xfm (<= 1.4.3-8), xinput (<= 1.2-5.2), xipmsg (<=
0.8088-1.1), xlbiff (<= 4.1-1.1), xli (<= 1.17.0-21), xlockmore (<= 1:5.21-1),
xlockmore-gl (<= 1:5.21-1), xmeter (<= 1.15-6), xmix (<= 2.1-5), xmon (<=
1.5.6-1.3), xpostit (<= 3.3.1-8.2), xprint (<= 1:0.1.0.alpha1-13), xrn (<=
9.02-7.1), xsysinfo (<= 1.7-2), xtel (<= 3.3.0-5.2), xtoolwait (<= 1.3-6),
xtrlock (<= 2.0-11), xview-clients (<= 3.2p1.4-21), xviewg (<= 3.2p1.4-21),
xviewg-dev (<= 3.2p1.4-21), xvkbd (<= 2.6-2.1), xxkb (<= 1.10-2.1), xzoom (<=
0.3-17), pgaccess (<= 1:0.98.8.20030520-2), xearth (<= 1.1-10.2), libmotif-dev
(<= 2.2.3-1.3), motif-clients (<= 2.2.3-1.3), xslideshow (<= 3.1-8.1), xtrkcad
(<= 3.1.4-1), pmud (<= 0.10-9), xnest (<= 6.9.0.dfsg.1-6), xterm (<< 208-1),
xmh (<= 6.8.2.dfsg.1-4), beaver (<= 0.2.5-2), lsb-core (<= 3.1-4), yank
(<=0.2.1-7.2)
+Replaces: xfree86-common (<< 1:7.0.0), xorg-common, xserver-common, x-common
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
installation of the X Window System in any configuration; it does not
@@ -168,3 +168,10 @@
Debian etch. It may be safely removed from your system. It depends on the
xorg package which is the new metapackage for installing the X Window
System in Debian.
+
+Package: xfree86-common
+Section: x11
+Architecture: all
+Description: transitional package for Debian etch
+ This package is provided to smooth upgrades from Debian 3.1 ("sarge") to
+ Debian etch. It may be safely removed from your system.
Added: trunk/debian/xorg/debian/xfree86-common.postinst.in
===================================================================
--- trunk/debian/xorg/debian/xfree86-common.postinst.in 2006-04-29 19:48:09 UTC
(rev 2000)
+++ trunk/debian/xorg/debian/xfree86-common.postinst.in 2006-04-29 22:06:16 UTC
(rev 2001)
@@ -0,0 +1,76 @@
+#!/bin/sh
+# Debian xfree86-common 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.
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+THIS_PACKAGE=xfree86-common
+THIS_SCRIPT=postinst
+CONFIG_DIR=/etc/X11
+XWRAPPER_CONFIG="$CONFIG_DIR/Xwrapper.config"
+CONFIG_AUX_DIR=/var/lib/x11
+XWRAPPER_CONFIG_CHECKSUM_BASE="${XWRAPPER_CONFIG##*/}.md5sum"
+XWRAPPER_CONFIG_CHECKSUM="$CONFIG_AUX_DIR/$XWRAPPER_CONFIG_CHECKSUM_BASE"
+XWRAPPER_CONFIG_ROSTER_BASE="${XWRAPPER_CONFIG##*/}.roster"
+XWRAPPER_CONFIG_ROSTER="$CONFIG_AUX_DIR/$XWRAPPER_CONFIG_ROSTER_BASE"
+
+#INCLUDE_SHELL_LIB#
+
+# de-register this package as a handler of the X server wrapper config file
+if [ -e "$XWRAPPER_CONFIG_ROSTER" ]; then
+ # check existing roster file for our package name
+ if fgrep -qx "$THIS_PACKAGE" "$XWRAPPER_CONFIG_ROSTER" 2>/dev/null; then
+ # construct temporary roster file with our package name removed, ignoring
+ # failure
+ fgrep -vx "$THIS_PACKAGE" "$XWRAPPER_CONFIG_ROSTER" > \
+ "$XWRAPPER_CONFIG_ROSTER.dpkg-tmp" 2>/dev/null || true
+ # is there anything left?
+ if [ -s "$XWRAPPER_CONFIG_ROSTER.dpkg-tmp" ]; then
+ # yes, replace the roster file
+ mv "$XWRAPPER_CONFIG_ROSTER.dpkg-tmp" "$XWRAPPER_CONFIG_ROSTER"
+ else
+ # no; remove both the roster and our temporary copy
+ rm -f "$XWRAPPER_CONFIG_ROSTER" "$XWRAPPER_CONFIG_ROSTER.dpkg-tmp"
+ # remove X server wrapper config file if it was still managed by the
+ # package
+ if [ -e "$XWRAPPER_CONFIG_CHECKSUM" ]; then
+ # does it exist?
+ if [ -e "$XWRAPPER_CONFIG" ]; then
+ # does the current MD5 checksum match the stored checksum?
+ if [ "$(md5sum "$XWRAPPER_CONFIG")" \
+ = "$(cat "$XWRAPPER_CONFIG_CHECKSUM")" ]; then
+ # yes; remove the config file
+ rm -f "$XWRAPPER_CONFIG"
+ fi
+ fi
+ # remove the checksum file; any remaining X server wrapper config file
+ # still on the system at this point is no longer being managed (local
+ # user customization)
+ rm -f "$XWRAPPER_CONFIG_CHECKSUM"
+ fi
+ fi
+ fi
+fi
+
+# Just move the Xsession file if it's still around
+if [ -f /etc/X11/Xsession ]; then
+ mv /etc/X11/Xsession /etc/X11/Xsession.xfree86
+fi
+
+if [ $1 = "purge" ]; then
+ # Remove the old xfree86-common stuff in Xsession.d
+ for FILE in 20xfree86-common_process-args 30xfree86-common_xresources
50xfree86-common_determine-startup 90xfree86-common_ssh-agent
99xfree86-common_start; do
+ rm /etc/X11/Xsession.d/$FILE
+ done
+fi
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=80:
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
