xorg-server: Changes to 'debian-unstable'
aclocal.m4 | 2 +-
configure | 20 ++++++++++----------
debian/changelog | 10 ++++++++--
debian/patches/08_better_dpms_logging.diff | 20 +++++++++++++++-----
hw/xprint/Makefile.in | 2 ++
5 files changed, 36 insertions(+), 18 deletions(-)
New commits:
commit cef381c33457c486ddc0aef974614decf1a5c4b7
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Jan 7 20:55:00 2008 -0500
* Improve dpms logging patch to correctly label message type
diff --git a/debian/changelog b/debian/changelog
index 886f93a..85abf9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.4.1~git20080105-2) UNRELEASED; urgency=low
+
+ * Improve dpms logging patch to correctly label message type
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 07 Jan 2008 20:28:26 -0500
+
xorg-server (2:1.4.1~git20080105-1) unstable; urgency=low
* Don't reference non-existent bug-reporting.txt file in xvfb-run.1
diff --git a/debian/patches/08_better_dpms_logging.diff b/debian/patches/08_better_dpms_logging.diff
index b67b331..7b7c4cc 100644
--- a/debian/patches/08_better_dpms_logging.diff
+++ b/debian/patches/08_better_dpms_logging.diff
@@ -1,21 +1,31 @@
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 @@
+--- xorg-server.orig/hw/xfree86/common/xf86DPMS.c 2008-01-07 20:19:47.000000000 -0500
++++ xorg-server/hw/xfree86/common/xf86DPMS.c 2008-01-07 20:28:11.000000000 -0500
+@@ -61,6 +61,7 @@
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ DPMSPtr pDPMS;
+ pointer DPMSOpt;
++ MessageType enabled_from = X_INFO;
+
+ if (serverGeneration != DPMSGeneration) {
+ if ((DPMSIndex = AllocateScreenPrivateIndex()) < 0)
+@@ -82,8 +83,8 @@
+ = xf86SetBoolOption(pScrn->options, "dpms", FALSE))
&& !DPMSDisabledSwitch)
DPMSEnabled = TRUE;
++ enabled_from = X_CONFIG;
xf86MarkOptionUsed(DPMSOpt);
- xf86DrvMsg(pScreen->myNum, X_CONFIG, "DPMS enabled\n");
} else if (DPMSEnabledSwitch) {
if (!DPMSDisabledSwitch)
DPMSEnabled = TRUE;
-@@ -92,6 +91,8 @@
+@@ -92,6 +93,8 @@
else {
pDPMS->Enabled = defaultDPMSEnabled;
}
+ if (pDPMS->Enabled)
-+ xf86DrvMsg(pScreen->myNum, X_CONFIG, "DPMS enabled\n");
++ xf86DrvMsg(pScreen->myNum, enabled_from, "DPMS enabled\n");
pDPMS->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = DPMSClose;
DPMSCount++;
commit 0e0f1ce6f3497740de022d4561154e1f1b39790b
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Jan 6 17:43:53 2008 -0500
Update changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 0808b5e..886f93a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.4.1~git20080105-1) UNRELEASED; urgency=low
+xorg-server (2:1.4.1~git20080105-1) unstable; 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
@@ -6,7 +6,7 @@ xorg-server (2:1.4.1~git20080105-1) UNRELEASED; urgency=low
* Improve logging when DPMS is enabled implicitly
+ Adds 08_better_dpms_logging.diff
- -- David Nusinow <dnusinow@debian.org> Sun, 06 Jan 2008 16:10:41 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 06 Jan 2008 16:56:38 -0500
xorg-server (2:1.4.1~git20071212-2) unstable; urgency=low
commit 2be9c8c5033846178b7a59873c72c22cbc4ca667
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Jan 6 16:56:06 2008 -0500
Autoreconf
diff --git a/aclocal.m4 b/aclocal.m4
index b81e65b..84b1224 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -18,7 +18,7 @@ you should regenerate the build system entirely.], [63])])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
+# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
diff --git a/configure b/configure
index 3d22f07..da31f1c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xorg-server 1.4.
+# Generated by GNU Autoconf 2.61 for xorg-server 1.4.0.90.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xorg-server'
PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.4'
-PACKAGE_STRING='xorg-server 1.4'
+PACKAGE_VERSION='1.4.0.90'
+PACKAGE_STRING='xorg-server 1.4.0.90'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1874,7 +1874,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xorg-server 1.4 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.4.0.90 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1944,7 +1944,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 1.4:";;
+ short | recursive ) echo "Configuration of xorg-server 1.4.0.90:";;
esac
cat <<\_ACEOF
@@ -2292,7 +2292,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xorg-server configure 1.4
+xorg-server configure 1.4.0.90
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -2306,7 +2306,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xorg-server $as_me 1.4, which was
+It was created by xorg-server $as_me 1.4.0.90, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2997,7 +2997,7 @@ fi
# Define the identity of the package.
PACKAGE='xorg-server'
- VERSION='1.4'
+ VERSION='1.4.0.90'
cat >>confdefs.h <<_ACEOF
@@ -38054,7 +38054,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xorg-server $as_me 1.4, which was
+This file was extended by xorg-server $as_me 1.4.0.90, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -38107,7 +38107,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xorg-server config.status 1.4
+xorg-server config.status 1.4.0.90
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/hw/xprint/Makefile.in b/hw/xprint/Makefile.in
index 51f7532..a189513 100644
--- a/hw/xprint/Makefile.in
+++ b/hw/xprint/Makefile.in
@@ -415,6 +415,7 @@ Xprt_SOURCES = \
$(top_srcdir)/fb/fbcmap_mi.c
EXTRA_DIST = ValTree.c
+CLEANFILES = miinitext-wrapper.c dpmsstubs-wrapper.c
all: all-recursive
.SUFFIXES:
@@ -878,6 +879,7 @@ install-strip:
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
Reply to: