xorg-server: Changes to 'debian-unstable'
ChangeLog | 22 ++++++++++++++++++++++
configure.ac | 4 ++--
debian/changelog | 6 ++++++
hw/dmx/glxProxy/Makefile.am | 2 ++
4 files changed, 32 insertions(+), 2 deletions(-)
New commits:
commit 8e3fdae1362b497ebafad22beb21a38251835828
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Dec 20 11:24:27 2011 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index e5a0887..ab079f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+commit 41524dd61020f2a446ec54643fa17aa791338cac
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri Dec 16 17:47:46 2011 -0800
+
+ configure.ac: 1.11.3
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit ee66474eb2009118a41539c6773e514a09d27e4d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Dec 9 07:45:02 2011 -0500
+
+ dmx: fix distcheck failure, missing compsize.h in Makefile.am
+
+ which was added in commit:
+ dmx: Build fix for -Werror=implicit-function-declaration
+
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 2c1d0a539c0fb1860ac89a00d1fb609f1959e1b6)
+
commit 0ca8869e4537412f25bfd5610aba5e604952608c
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Dec 9 12:58:30 2011 -0800
diff --git a/debian/changelog b/debian/changelog
index b7bff90..e9f7359 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.11.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 20 Dec 2011 11:24:15 +0100
+
xorg-server (2:1.11.2.902-1) unstable; urgency=low
[ Julien Cristau ]
commit 41524dd61020f2a446ec54643fa17aa791338cac
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Dec 16 17:47:46 2011 -0800
configure.ac: 1.11.3
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/configure.ac b/configure.ac
index 817c907..5792731 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.11.2.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2011-12-09"
+AC_INIT([xorg-server], 1.11.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2011-12-16"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit ee66474eb2009118a41539c6773e514a09d27e4d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Dec 9 07:45:02 2011 -0500
dmx: fix distcheck failure, missing compsize.h in Makefile.am
which was added in commit:
dmx: Build fix for -Werror=implicit-function-declaration
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 2c1d0a539c0fb1860ac89a00d1fb609f1959e1b6)
diff --git a/hw/dmx/glxProxy/Makefile.am b/hw/dmx/glxProxy/Makefile.am
index 8516048..4ee1036 100644
--- a/hw/dmx/glxProxy/Makefile.am
+++ b/hw/dmx/glxProxy/Makefile.am
@@ -1,10 +1,12 @@
noinst_LIBRARIES = libglxproxy.a
libglxproxy_a_SOURCES = compsize.c \
+ compsize.h \
g_disptab.c \
g_disptab.h \
global.c \
glxcmds.c \
+ glxcmds.h \
glxcmdsswap.c \
glxcontext.h \
glxdrawable.h \
Reply to: