xorg-server: Changes to 'debian-unstable'
debian/changelog | 16 ++++++++++++++++
debian/control | 2 --
debian/xserver-xorg-core.bug.script | 19 +++++++++++++++++--
3 files changed, 33 insertions(+), 4 deletions(-)
New commits:
commit b01f0c794fb3f5e97518748f9f0f297e0eb67c57
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Feb 9 10:21:34 2011 +0100
bug script: Keep only one lspci call (with proper filtering), which makes PCI IDs come back.
diff --git a/debian/changelog b/debian/changelog
index 227dab6..d45f159 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ xorg-server (2:1.9.4-2) UNRELEASED; urgency=low
and some documentation.
- xorg: pulls xserver-xorg as well as various X11 clients and fonts.
* bug script: Report KMS configuration files and their contents.
+ * bug script: Keep only one lspci call (with proper filtering), which
+ makes PCI IDs come back.
-- Cyril Brulebois <kibi@debian.org> Wed, 09 Feb 2011 08:57:02 +0100
diff --git a/debian/xserver-xorg-core.bug.script b/debian/xserver-xorg-core.bug.script
index 2890ce6..32b5e6b 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -50,8 +50,7 @@ fi
if which lspci > /dev/null 2>&1; then
pecho "VGA-compatible devices on PCI bus:"
- LC_ALL=C lspci | grep 'VGA compatible controller:'
- LC_ALL=C lspci -n | grep 'Class 0300:'
+ LC_ALL=C lspci -nn | grep 'VGA compatible controller'
else
echo "The lspci command was not found; not including PCI data."
fi
commit ce4b49dc366733ae59df8d52a72e573061446835
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Feb 9 10:16:31 2011 +0100
bug script: Report KMS configuration files and their contents.
diff --git a/debian/changelog b/debian/changelog
index 3119181..227dab6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xorg-server (2:1.9.4-2) UNRELEASED; urgency=low
- xserver-xorg: pulls the server and drivers, contains the X wrapper
and some documentation.
- xorg: pulls xserver-xorg as well as various X11 clients and fonts.
+ * bug script: Report KMS configuration files and their contents.
-- Cyril Brulebois <kibi@debian.org> Wed, 09 Feb 2011 08:57:02 +0100
diff --git a/debian/xserver-xorg-core.bug.script b/debian/xserver-xorg-core.bug.script
index 9d0f54c..2890ce6 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -79,6 +79,22 @@ fi
echo
+KMS_CONFS_DIR=/etc/modprobe.d
+KMS_CONFS=$(ls $KMS_CONFS_DIR/*-kms.conf 2>/dev/null)
+
+if [ -n "$KMS_CONFS" ]; then
+ pecho "KMS configuration files:"
+ for CONF in $KMS_CONFS; do
+ echo "$CONF:"
+ # Indent, and get rid of empty lines:
+ sed 's/^/ /' < "$CONF"|egrep -v '^\s*$'
+ done
+else
+ echo "$KMS_CONFS_DIR contains no KMS configuration files."
+fi
+
+echo
+
KERNEL_VERSION=/proc/version
if [ -e "$KERNEL_VERSION" ]; then
commit ad2b8a8dc825e4c6a47aa96c6b99064090100c29
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Feb 9 09:09:08 2011 +0100
Good bye, dependency hell! (Closes: #362313).
diff --git a/debian/changelog b/debian/changelog
index bee9515..3119181 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xorg-server (2:1.9.4-2) UNRELEASED; urgency=low
+
+ * Put an end to the dependency hell! Now that we have proper
+ dependencies between drivers and the server, remove xserver-xorg from
+ xserver-xorg-core's Depends (Closes: #362313). In a nutshell, one may
+ want to choose between installing:
+ - xserver-xorg-core: the server itself, with no strings attached.
+ - xserver-xorg: pulls the server and drivers, contains the X wrapper
+ and some documentation.
+ - xorg: pulls xserver-xorg as well as various X11 clients and fonts.
+
+ -- Cyril Brulebois <kibi@debian.org> Wed, 09 Feb 2011 08:57:02 +0100
+
xorg-server (2:1.9.4-1) unstable; urgency=low
* The “squeeze is released, target sid!” upload.
diff --git a/debian/control b/debian/control
index 53d321d..c03335c 100644
--- a/debian/control
+++ b/debian/control
@@ -86,7 +86,6 @@ Package: xserver-xorg-core
Architecture: any
Depends:
xserver-common (>= ${source:Version}),
- xserver-xorg,
keyboard-configuration [linux-any kfreebsd-any],
udev (>= 149) [linux-any],
${shlibs:Depends},
@@ -136,7 +135,6 @@ Depends:
# merged: xserver-common (>= ${source:Version}),
xkb-data-udeb,
x11-xkb-utils-udeb,
-# useless: xserver-xorg,
# disabled: keyboard-configuration [linux-any kfreebsd-any],
udev-udeb (>= 149) [linux-any],
${shlibs:Depends},
Reply to: