xorg-server: Changes to 'debian-unstable'
debian/changelog | 4 +++-
debian/patches/08_better_dpms_logging.diff | 21 +++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 25 insertions(+), 1 deletion(-)
New commits:
commit a2886cda07cf656265f058d5305abfba998ef22d
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Jan 6 16:34:27 2008 -0500
* Improve logging when DPMS is enabled implicitly
+ Adds 08_better_dpms_logging.diff
diff --git a/debian/changelog b/debian/changelog
index 9af28af..0808b5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ xorg-server (2:1.4.1~git20080105-1) UNRELEASED; urgency=low
* Don't reference non-existent bug-reporting.txt file in xvfb-run.1
* New upstream git pull, again from the server-1.4-branch
+ Drop 08_xkb_infinite_loop.diff, it's upstream now
+ * Improve logging when DPMS is enabled implicitly
+ + Adds 08_better_dpms_logging.diff
- -- David Nusinow <dnusinow@debian.org> Sat, 05 Jan 2008 17:48:05 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 06 Jan 2008 16:10:41 -0500
xorg-server (2:1.4.1~git20071212-2) unstable; urgency=low
diff --git a/debian/patches/08_better_dpms_logging.diff b/debian/patches/08_better_dpms_logging.diff
new file mode 100644
index 0000000..b67b331
--- /dev/null
+++ b/debian/patches/08_better_dpms_logging.diff
@@ -0,0 +1,21 @@
+Index: xorg-server/hw/xfree86/common/xf86DPMS.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86DPMS.c 2008-01-06 15:59:07.000000000 -0500
++++ xorg-server/hw/xfree86/common/xf86DPMS.c 2008-01-06 16:09:03.000000000 -0500
+@@ -83,7 +83,6 @@
+ && !DPMSDisabledSwitch)
+ DPMSEnabled = TRUE;
+ xf86MarkOptionUsed(DPMSOpt);
+- xf86DrvMsg(pScreen->myNum, X_CONFIG, "DPMS enabled\n");
+ } else if (DPMSEnabledSwitch) {
+ if (!DPMSDisabledSwitch)
+ DPMSEnabled = TRUE;
+@@ -92,6 +91,8 @@
+ else {
+ pDPMS->Enabled = defaultDPMSEnabled;
+ }
++ if (pDPMS->Enabled)
++ xf86DrvMsg(pScreen->myNum, X_CONFIG, "DPMS enabled\n");
+ pDPMS->CloseScreen = pScreen->CloseScreen;
+ pScreen->CloseScreen = DPMSClose;
+ DPMSCount++;
diff --git a/debian/patches/series b/debian/patches/series
index f9cca17..097f64c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,7 @@
05_kill_type1.diff
06_use_proc_instead_of_sysfs_for_pci_domains.diff
07_autoconfig_screen_with_device_section.diff
+08_better_dpms_logging.diff
10_dont_look_in_home_for_config.diff -p0
13_debian_add_xkbpath_env_variable.diff
14_default_screen_section.diff
Reply to: