X Strike Force X.Org X11 SVN commit: r1798 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-04-15 12:15:38 -0400 (Sat, 15 Apr 2006)
New Revision: 1798
Removed:
trunk/debian/xorg/debian/xserver-xorg.links
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/control
Log:
build properly. Thanks Eugene Konev for the fix. Thanks Paul Wise and LIU
* Remove the /usr/X11R6/bin/X symlink from xserver-xorg. Also bump the
x11-common conflicts with xserver-xorg to this version. Thanks Joey Hess
and Steve Langasek. (closes: #362713)
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-04-15 16:08:39 UTC (rev 1797)
+++ trunk/debian/xorg/debian/changelog 2006-04-15 16:15:38 UTC (rev 1798)
@@ -9,10 +9,13 @@
on upgrade. Tell people in the error message that they can move the items
there back after the installation has finished.
* Make xserver-xorg-(input|video)-all arch: any rather than all, to let them
- build properly. Thanks Eugene Konev for the fix. Thanks Paul Wise and LIU
+ build properly. Thanks Eugene Konev for the fix. Thanks Paul Wise and LIU
Xin. (closes: #362719, #362720, #362694)
+ * Remove the /usr/X11R6/bin/X symlink from xserver-xorg. Also bump the
+ x11-common conflicts with xserver-xorg to this version. Thanks Joey Hess
+ and Steve Langasek. (closes: #362713)
- -- David Nusinow <dnusinow@debian.org> Sat, 15 Apr 2006 12:07:38 -0400
+ -- David Nusinow <dnusinow@debian.org> Sat, 15 Apr 2006 12:15:06 -0400
xorg (1:7.0.11) unstable; urgency=low
Modified: trunk/debian/xorg/debian/control
===================================================================
--- trunk/debian/xorg/debian/control 2006-04-15 16:08:39 UTC (rev 1797)
+++ trunk/debian/xorg/debian/control 2006-04-15 16:15:38 UTC (rev 1798)
@@ -9,7 +9,7 @@
Package: x11-common
Architecture: any
Depends: ${misc:Depends}, debianutils (>= 1.13), lsb-base (>= 1.3-9ubuntu2), laptop-detect
-Conflicts: xfree86-common, xorg-common, xserver-common, x-common, xserver-xorg (<< 1:7.0.10), 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-5), 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-11), 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),
+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-5), 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-11), 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),
Replaces: xfree86-common, xorg-common, xserver-common, x-common
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
Deleted: trunk/debian/xorg/debian/xserver-xorg.links
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.links 2006-04-15 16:08:39 UTC (rev 1797)
+++ trunk/debian/xorg/debian/xserver-xorg.links 2006-04-15 16:15:38 UTC (rev 1798)
@@ -1 +0,0 @@
-usr/bin/X usr/X11R6/bin/X
Reply to: