xorg: Changes to 'debian-unstable'
debian/changelog | 8 ++++++--
debian/control | 5 ++---
debian/xserver-xorg.postinst.in | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 68eec02013edf476e2a8fb5c8dca41c2026d97eb
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 9 17:32:20 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 1d34b1b..60c66c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.4+2) UNRELEASED; urgency=low
+xorg (1:7.4+2) unstable; urgency=low
[ David Nusinow ]
* Don't discuss removal of xserver-xorg in its description.
@@ -52,7 +52,7 @@ xorg (1:7.4+2) UNRELEASED; urgency=low
* Bengali added
* Slovak updated (closes: #523448).
- -- David Nusinow <dnusinow@debian.org> Sat, 18 Apr 2009 17:14:13 -0400
+ -- Julien Cristau <jcristau@debian.org> Tue, 09 Jun 2009 17:32:10 +0200
xorg (1:7.4+1) unstable; urgency=low
commit 8bf2f1ee374e4d4fe231633a55502914623a4dd6
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 9 17:31:35 2009 +0200
Redirect stdout when restarting hal, to avoid messing with debconf
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index b37cdb0..4ddc049 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -146,7 +146,7 @@ case "$1" in
update-rc.d xserver-xorg remove || true
fi
if dpkg --compare-versions "$2" lt "1:7.4"; then
- invoke-rc.d hal restart
+ invoke-rc.d hal restart >/dev/null
fi
;;
esac
commit 1f771fd351e078fe8e8ec278083c562442c3e189
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 9 17:19:30 2009 +0200
Stop depending on sparc-utils.
xserver-xorg.postinst doesn't run any detection programs anymore.
diff --git a/debian/changelog b/debian/changelog
index 2385f9d..1d34b1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,8 @@ xorg (1:7.4+2) UNRELEASED; urgency=low
* xserver-xorg.{preinst,postinst,postrm}: stop using /var/lib/x11.
* control: xserver-xorg doesn't provide infrastructure for managing
xorg.conf anymore, remove that from the description.
+ * Stop depending on sparc-utils. xserver-xorg.postinst doesn't run any
+ detection programs anymore.
[ Debconf translations ]
* Bengali added
diff --git a/debian/control b/debian/control
index cb71e6d..a80473b 100644
--- a/debian/control
+++ b/debian/control
@@ -118,7 +118,7 @@ Description: the X.Org X server -- input driver metapackage
Package: xorg
Architecture: any
-Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libgl1-mesa-dri, libglu1-mesa, xfonts-base (>= 1:1.0.0-1), xfonts-100dpi (>= 1:1.0.0-1), xfonts-75dpi (>= 1:1.0.0-1), xfonts-scalable (>= 1:1.0.0-1), x11-apps, x11-session-utils, x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, xauth, xinit, xfonts-utils, xkb-data, xorg-docs-core, xterm | x-terminal-emulator, sparc-utils [sparc]
+Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libgl1-mesa-dri, libglu1-mesa, xfonts-base (>= 1:1.0.0-1), xfonts-100dpi (>= 1:1.0.0-1), xfonts-75dpi (>= 1:1.0.0-1), xfonts-scalable (>= 1:1.0.0-1), x11-apps, x11-session-utils, x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, xauth, xinit, xfonts-utils, xkb-data, xorg-docs-core, xterm | x-terminal-emulator
Provides: x-window-system, x-window-system-core
Suggests: xorg-docs
Description: X.Org X Window System
commit d8421fcfe0bd6d9b04b72d728bd5f45f22a113e6
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 9 17:17:01 2009 +0200
Don't pretend that xserver-xorg manages xorg.conf
xserver-xorg doesn't provide infrastructure for managing xorg.conf
anymore, remove that from the description.
diff --git a/debian/changelog b/debian/changelog
index 96b436f..2385f9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,8 @@ xorg (1:7.4+2) UNRELEASED; urgency=low
don't need to keep a checksum of the config file to know whether the user
customized it.
* xserver-xorg.{preinst,postinst,postrm}: stop using /var/lib/x11.
+ * control: xserver-xorg doesn't provide infrastructure for managing
+ xorg.conf anymore, remove that from the description.
[ Debconf translations ]
* Bengali added
diff --git a/debian/control b/debian/control
index c8e4589..cb71e6d 100644
--- a/debian/control
+++ b/debian/control
@@ -96,8 +96,7 @@ Depends:
Recommends: libgl1-mesa-dri, udev
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
- X.Org X server, as well as providing a configuration infrastructure to manage
- xorg.conf. It does not provide the actual server itself.
+ X.Org X server. It does not provide the actual server itself.
Package: xserver-xorg-video-all
Architecture: any
Reply to: