debian/changelog | 4 +-- debian/control | 4 +-- debian/patches/001_ubuntu_bail_when_kms_active.patch | 20 +++++++++++++++---- 3 files changed, 20 insertions(+), 8 deletions(-)
New commits: commit 7ad4b758d218f9d69780c5e4724f8e7df6d05adf Author: Julien Cristau <[email protected]> Date: Sat May 15 13:14:41 2010 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 743235c..17f4bf3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xserver-xorg-video-vesa (1:2.3.0-3) UNRELEASED; urgency=low +xserver-xorg-video-vesa (1:2.3.0-3) unstable; urgency=low * Add patch by Christopher James Halse Rogers from Ubuntu to bail in Probe if kernel mode setting is enabled. - -- Julien Cristau <[email protected]> Sat, 15 May 2010 12:55:19 +0200 + -- Julien Cristau <[email protected]> Sat, 15 May 2010 13:14:24 +0200 xserver-xorg-video-vesa (1:2.3.0-2) unstable; urgency=low commit 8c3fb055a63c2eca23b3ba6b585484f010e2ee06 Author: Julien Cristau <[email protected]> Date: Sat May 15 13:12:59 2010 +0200 Modify kms patch to link with libdrm to get a correct dependency diff --git a/debian/patches/001_ubuntu_bail_when_kms_active.patch b/debian/patches/001_ubuntu_bail_when_kms_active.patch index 4d2880f..ae69f9d 100644 --- a/debian/patches/001_ubuntu_bail_when_kms_active.patch +++ b/debian/patches/001_ubuntu_bail_when_kms_active.patch @@ -15,8 +15,8 @@ Bug-Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/xserver-xorg-video-ve Index: xserver-xorg-video-vesa/configure.ac =================================================================== ---- xserver-xorg-video-vesa.orig/configure.ac 2010-03-24 19:33:01.000000000 +1100 -+++ xserver-xorg-video-vesa/configure.ac 2010-03-24 20:05:36.435067870 +1100 +--- xserver-xorg-video-vesa.orig/configure.ac ++++ xserver-xorg-video-vesa/configure.ac @@ -93,7 +93,14 @@ fi AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) @@ -43,8 +43,8 @@ Index: xserver-xorg-video-vesa/configure.ac Index: xserver-xorg-video-vesa/src/vesa.c =================================================================== ---- xserver-xorg-video-vesa.orig/src/vesa.c 2010-03-24 19:33:01.000000000 +1100 -+++ xserver-xorg-video-vesa/src/vesa.c 2010-03-24 20:04:53.113781642 +1100 +--- xserver-xorg-video-vesa.orig/src/vesa.c ++++ xserver-xorg-video-vesa/src/vesa.c @@ -65,6 +65,10 @@ #include <X11/extensions/dpms.h> #endif @@ -108,3 +108,15 @@ Index: xserver-xorg-video-vesa/src/vesa.c pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, NULL, NULL, NULL, NULL, NULL); if (pScrn != NULL) { +Index: xserver-xorg-video-vesa/src/Makefile.am +=================================================================== +--- xserver-xorg-video-vesa.orig/src/Makefile.am ++++ xserver-xorg-video-vesa/src/Makefile.am +@@ -27,6 +27,7 @@ + vesa_drv_la_LTLIBRARIES = vesa_drv.la + vesa_drv_la_LDFLAGS = -module -avoid-version + vesa_drv_ladir = @moduledir@/drivers ++vesa_drv_la_LIBADD = @LIBDRM_LIBS@ + + vesa_drv_la_SOURCES = \ + vesa.c \ commit 7758d58d81653acb2510568f27dc0de63e6b6f88 Author: Julien Cristau <[email protected]> Date: Sat May 15 13:06:37 2010 +0200 Version libdrm build-dep for drmCheckModesettingSupported diff --git a/debian/control b/debian/control index 976e734..d69bdbc 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,8 @@ Build-Depends: libtool, xutils-dev (>= 1:7.5), quilt, - libdrm-dev, - x11proto-xf86dri-dev + libdrm-dev (>= 2.4.3) [!hurd-i386], + x11proto-xf86dri-dev, Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vesa Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vesa.git -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
