xorg: Changes to 'debian-unstable'
debian/changelog | 9 ++++++++-
debian/control | 2 ++
debian/x11-common.dirs | 1 -
debian/x11-common.init | 4 +++-
debian/x11-common.links | 1 -
5 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit a59524bee42a838b3fae45e1d9c170693e2575f6
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue Apr 24 18:42:40 2007 +0300
x11common.{dirs,links}: Don't ship or link to /usr/X11R6/lib/X11/fonts.
diff --git a/debian/changelog b/debian/changelog
index 92e0ac6..5b29936 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,8 +39,10 @@ xorg (1:7.2-3) UNRELEASED; urgency=low
* xserver-xorg-video-all: Replaces/Conflicts xserver-xorg-driver-all
* x11-common.init: Only source /etc/default/rcS if it exists,
allowing x11-common to be installed by debootstrap.
+ * x11common.{dirs,links}: Don't ship or link to
+ /usr/X11R6/lib/X11/fonts
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 18:23:46 +0300
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 18:40:53 +0300
xorg (1:7.2-2) experimental; urgency=low
diff --git a/debian/x11-common.dirs b/debian/x11-common.dirs
index 410bf05..5ac730e 100644
--- a/debian/x11-common.dirs
+++ b/debian/x11-common.dirs
@@ -3,4 +3,3 @@ etc/X11/Xsession.d
usr/include/X11
usr/lib/X11
usr/share/X11
-usr/X11R6/lib/X11/fonts
diff --git a/debian/x11-common.links b/debian/x11-common.links
index 19c00d7..e707811 100644
--- a/debian/x11-common.links
+++ b/debian/x11-common.links
@@ -1,4 +1,3 @@
usr/bin usr/bin/X11
-usr/X11R6/lib/X11/fonts usr/lib/X11/fonts
etc/X11/rgb.txt usr/share/X11/rgb.txt
usr/bin usr/X11R6/bin
commit 48786544fc9ed19856ee292d5ff9a941d1795891
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue Apr 24 18:25:27 2007 +0300
x11-common.init: Only source /etc/default/rcS if it exists, allowing x11-common to be installed by debootstrap.
diff --git a/debian/changelog b/debian/changelog
index 265846e..92e0ac6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,8 +37,10 @@ xorg (1:7.2-3) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* xserver-xorg-video-all: Replaces/Conflicts xserver-xorg-driver-all
+ * x11-common.init: Only source /etc/default/rcS if it exists,
+ allowing x11-common to be installed by debootstrap.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 18:06:27 +0300
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 18:23:46 +0300
xorg (1:7.2-2) experimental; urgency=low
diff --git a/debian/x11-common.init b/debian/x11-common.init
index 9622009..1ec7c2d 100644
--- a/debian/x11-common.init
+++ b/debian/x11-common.init
@@ -17,7 +17,9 @@ SOCKET_DIR=/tmp/.X11-unix
ICE_DIR=/tmp/.ICE-unix
. /lib/lsb/init-functions
-. /etc/default/rcS
+if [ -f /etc/default/rcS ]; then
+ . /etc/default/rcS
+fi
do_restorecon () {
# Restore file security context (SELinux).
commit fe8ef272b282e4f808f97fb3428e0634373575fa
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue Apr 24 18:09:50 2007 +0300
xserver-xorg-video-all: Replaces/Conflicts xserver-xorg-driver-all.
diff --git a/debian/changelog b/debian/changelog
index 9ef8c2a..265846e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,7 +35,10 @@ xorg (1:7.2-3) UNRELEASED; urgency=low
[ Julien Cristau ]
* xorg recommends libgl1-mesa-dri instead of depending on it.
- -- David Nusinow <dnusinow@debian.org> Tue, 24 Apr 2007 00:13:52 -0400
+ [ Timo Aaltonen ]
+ * xserver-xorg-video-all: Replaces/Conflicts xserver-xorg-driver-all
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 18:06:27 +0300
xorg (1:7.2-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 311748b..6331ca2 100644
--- a/debian/control
+++ b/debian/control
@@ -102,6 +102,8 @@ Description: transitional package for moving from XFree86 to X.Org
Package: xserver-xorg-video-all
Architecture: any
Depends: ${F:XServer-Xorg-Video-Depends}
+Replaces: xserver-xorg-driver-all
+Conflicts: xserver-xorg-driver-all
Description: the X.Org X server -- output driver metapackage
This package depends on the full suite of output drivers for the X.Org X server
(Xorg). It does not provide any drivers itself, and may be removed if you wish
Reply to: