debian/changelog | 6 ++++-- debian/control | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-)
New commits: commit bea1bfc5c5c63dd39b64e9785a57b967f765fd33 Author: Cyril Brulebois <[email protected]> Date: Sun Apr 18 12:14:04 2010 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index cbdf139..e6e01b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-nv (1:2.1.17-2) UNRELEASED; urgency=low +xserver-xorg-video-nv (1:2.1.17-2) unstable; urgency=low * Merge upstream's master as of 17ab5dbea6. This includes the “Refuse to bind to a device which has kernel modesetting active.” commit, which @@ -10,7 +10,7 @@ xserver-xorg-video-nv (1:2.1.17-2) UNRELEASED; urgency=low * Use new xsfbs and ${xviddriver:Depends} variable (bumping the xserver-xorg-dev version in Build-Depends accordingly). - -- Cyril Brulebois <[email protected]> Sun, 18 Apr 2010 11:31:15 +0200 + -- Cyril Brulebois <[email protected]> Sun, 18 Apr 2010 12:13:58 +0200 xserver-xorg-video-nv (1:2.1.17-1) unstable; urgency=low commit 47718903b374e937f6da9497269069d3dc3097a7 Author: Cyril Brulebois <[email protected]> Date: Sun Apr 18 12:10:37 2010 +0200 Add libdrm-dev and x11proto-xf86dri-dev to Build-Depends to enable the appropriate codepath. diff --git a/debian/changelog b/debian/changelog index f09f53e..cbdf139 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ xserver-xorg-video-nv (1:2.1.17-2) UNRELEASED; urgency=low bind to a device which has kernel modesetting active.” commit, which makes sure nv doesn't break console output when nouveau's KMS is active. + * Add libdrm-dev and x11proto-xf86dri-dev to Build-Depends to enable the + appropriate codepath. * Add myself to Uploaders. * Use new xsfbs and ${xviddriver:Depends} variable (bumping the xserver-xorg-dev version in Build-Depends accordingly). diff --git a/debian/control b/debian/control index d7400ee..fe7d211 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,9 @@ Build-Depends: dpkg-dev (>= 1.14.17), automake, libtool, - xutils-dev + xutils-dev, + libdrm-dev (>= 2.4.3), + x11proto-xf86dri-dev, Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
