diff -Nru xserver-xorg-video-vesa-2.3.2+git20120801.0249d01a/.lastcommit xserver-xorg-video-vesa-2.3.2+git20120912.7aafaf56/.lastcommit --- xserver-xorg-video-vesa-2.3.2+git20120801.0249d01a/.lastcommit 2012-08-01 23:27:37.000000000 +0000 +++ xserver-xorg-video-vesa-2.3.2+git20120912.7aafaf56/.lastcommit 2012-09-12 14:24:52.000000000 +0000 @@ -1 +1 @@ -commit 0249d01a2623c4f7769914fc0a7b50657a50560f +commit 7aafaf56fbca97f36c775462c1ceea3e03700c42 diff -Nru xserver-xorg-video-vesa-2.3.2+git20120801.0249d01a/ChangeLog xserver-xorg-video-vesa-2.3.2+git20120912.7aafaf56/ChangeLog --- xserver-xorg-video-vesa-2.3.2+git20120801.0249d01a/ChangeLog 2012-08-01 23:27:46.000000000 +0000 +++ xserver-xorg-video-vesa-2.3.2+git20120912.7aafaf56/ChangeLog 2012-09-12 14:25:01.000000000 +0000 @@ -1,9 +1,29 @@ -commit 9c54c605f3b5536518d26f31fd673d6e02a2a4a9 +commit 5047d6b2135afaf5ea5ab3088f2a22757dccd769 Author: Robert Hooker -Date: Wed Aug 1 19:27:37 2012 -0400 +Date: Wed Sep 12 10:24:52 2012 -0400 Add debian tree from origin/debian-unstable +commit 7aafaf56fbca97f36c775462c1ceea3e03700c42 +Author: Alexandr Shadchin +Date: Sat Aug 18 20:53:34 2012 +0600 + + Fix check function in VESASaveRestore + + Signed-off-by: Alexandr Shadchin + Reviewed-by: Peter Hutterer + Signed-off-by: Peter Hutterer + +commit 4cb7fa8191ca41491330e4adc8c8188648ed7e11 +Author: Alexandr Shadchin +Date: Sat Aug 18 20:53:33 2012 +0600 + + Remove unneeded AM_CONDITIONAL + + Signed-off-by: Alexandr Shadchin + Reviewed-by: Peter Hutterer + Signed-off-by: Peter Hutterer + commit 0249d01a2623c4f7769914fc0a7b50657a50560f Author: Dave Airlie Date: Wed Jul 18 20:02:49 2012 +1000 diff -Nru xserver-xorg-video-vesa-2.3.2+git20120801.0249d01a/configure xserver-xorg-video-vesa-2.3.2+git20120912.7aafaf56/configure --- xserver-xorg-video-vesa-2.3.2+git20120801.0249d01a/configure 2012-08-01 23:27:45.000000000 +0000 +++ xserver-xorg-video-vesa-2.3.2+git20120912.7aafaf56/configure 2012-09-12 14:24:59.000000000 +0000 @@ -618,12 +618,8 @@ LTLIBOBJS LIBOBJS DRIVER_NAME -XSERVER_LIBPCIACCESS_FALSE -XSERVER_LIBPCIACCESS_TRUE PCIACCESS_LIBS PCIACCESS_CFLAGS -HAVE_XEXTPROTO_71_FALSE -HAVE_XEXTPROTO_71_TRUE XEXT_LIBS XEXT_CFLAGS XORG_LIBS @@ -17944,18 +17940,14 @@ XEXT_LIBS=$pkg_cv_XEXT_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - HAVE_XEXTPROTO_71="yes"; + HAVE_XEXTPROTO_71="yes" +fi + +if test "x$HAVE_XEXTPROTO_71" = xyes; then + $as_echo "#define HAVE_XEXTPROTO_71 1" >>confdefs.h fi - if test "$HAVE_XEXTPROTO_71" = "yes" ; then - HAVE_XEXTPROTO_71_TRUE= - HAVE_XEXTPROTO_71_FALSE='#' -else - HAVE_XEXTPROTO_71_TRUE='#' - HAVE_XEXTPROTO_71_FALSE= -fi - save_CFLAGS="$CFLAGS" CFLAGS="$XORG_CFLAGS" @@ -18086,14 +18078,6 @@ fi fi - if test "x$XSERVER_LIBPCIACCESS" = xyes; then - XSERVER_LIBPCIACCESS_TRUE= - XSERVER_LIBPCIACCESS_FALSE='#' -else - XSERVER_LIBPCIACCESS_TRUE='#' - XSERVER_LIBPCIACCESS_FALSE= -fi - # Checks for libraries. @@ -18231,14 +18215,6 @@ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${HAVE_XEXTPROTO_71_TRUE}" && test -z "${HAVE_XEXTPROTO_71_FALSE}"; then - as_fn_error $? "conditional \"HAVE_XEXTPROTO_71\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${XSERVER_LIBPCIACCESS_TRUE}" && test -z "${XSERVER_LIBPCIACCESS_FALSE}"; then - as_fn_error $? "conditional \"XSERVER_LIBPCIACCESS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff -Nru xserver-xorg-video-vesa-2.3.2+git20120801.0249d01a/configure.ac xserver-xorg-video-vesa-2.3.2+git20120912.7aafaf56/configure.ac --- xserver-xorg-video-vesa-2.3.2+git20120801.0249d01a/configure.ac 2012-08-01 23:27:37.000000000 +0000 +++ xserver-xorg-video-vesa-2.3.2+git20120912.7aafaf56/configure.ac 2012-09-12 14:24:52.000000000 +0000 @@ -60,9 +60,11 @@ # Obtain compiler/linker options for the driver dependencies PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES) PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], - HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), - HAVE_XEXTPROTO_71="no") -AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) + HAVE_XEXTPROTO_71="yes", HAVE_XEXTPROTO_71="no") + +if test "x$HAVE_XEXTPROTO_71" = xyes; then + AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]) +fi save_CFLAGS="$CFLAGS" CFLAGS="$XORG_CFLAGS" @@ -90,7 +92,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.12.901]) fi -AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) # Checks for libraries. diff -Nru xserver-xorg-video-vesa-2.3.2+git20120801.0249d01a/debian/changelog xserver-xorg-video-vesa-2.3.2+git20120912.7aafaf56/debian/changelog --- xserver-xorg-video-vesa-2.3.2+git20120801.0249d01a/debian/changelog 2012-09-12 14:36:36.000000000 +0000 +++ xserver-xorg-video-vesa-2.3.2+git20120912.7aafaf56/debian/changelog 2012-09-12 14:36:36.000000000 +0000 @@ -1,10 +1,10 @@ -xserver-xorg-video-vesa (1:2.3.2+git20120801.0249d01a-0ubuntu0sarvatt~precise) precise; urgency=low +xserver-xorg-video-vesa (1:2.3.2+git20120912.7aafaf56-0ubuntu0sarvatt~precise) precise; urgency=low - * Checkout from git 20120801 (master branch) up to commit - 0249d01a2623c4f7769914fc0a7b50657a50560f + * Checkout from git 20120912 (master branch) up to commit + 7aafaf56fbca97f36c775462c1ceea3e03700c42 * Only added debian/ tree from origin/debian-unstable - -- Robert Hooker Wed, 01 Aug 2012 19:27:47 -0400 + -- Robert Hooker Wed, 12 Sep 2012 10:25:02 -0400 xserver-xorg-video-vesa (1:2.3.1-1) unstable; urgency=low diff -Nru xserver-xorg-video-vesa-2.3.2+git20120801.0249d01a/src/vesa.c xserver-xorg-video-vesa-2.3.2+git20120912.7aafaf56/src/vesa.c --- xserver-xorg-video-vesa-2.3.2+git20120801.0249d01a/src/vesa.c 2012-08-01 23:27:37.000000000 +0000 +++ xserver-xorg-video-vesa-2.3.2+git20120912.7aafaf56/src/vesa.c 2012-09-12 14:24:52.000000000 +0000 @@ -1626,7 +1626,7 @@ { VESAPtr pVesa; - if (MODE_QUERY < 0 || function > MODE_RESTORE) + if (function < MODE_QUERY || function > MODE_RESTORE) return (FALSE); pVesa = VESAGetRec(pScrn);