On Sun, Feb  6, 2011 at 14:03:21 +0100, Robert Millan wrote:

> forcemerge 596595 596594
> thanks
> 
> Here's a new patch which doesn't add libdrm-dev to Build-Conflicts.
> 
> -- 
> Robert Millan

> diff -ur xserver-xorg-video-vesa-2.3.0.old/debian/control 
> xserver-xorg-video-vesa-2.3.0/debian/control
> --- xserver-xorg-video-vesa-2.3.0.old/debian/control  2011-02-06 
> 13:58:44.000000000 +0100
> +++ xserver-xorg-video-vesa-2.3.0/debian/control      2011-02-06 
> 14:00:50.000000000 +0100
> @@ -17,7 +17,7 @@
>   libtool,
>   xutils-dev (>= 1:7.5),
>   quilt,
> - libdrm-dev (>= 2.4.3) [!hurd-i386],
> + libdrm-dev (>= 2.4.3) [linux-any],

Won't be necessary anymore once we get
http://cgit.freedesktop.org/xorg/driver/xf86-video-vesa/commit/?id=b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f

>   x11proto-xf86dri-dev,
>  Standards-Version: 3.8.4
>  Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vesa
> @@ -40,3 +40,12 @@
>   <URL:http://www.X.org>
>   .
>   This package is built from the X.org xf86-video-vesa driver module.
> +
> +Package: xserver-xorg-video-vesa-udeb
> +XC-Package-Type: udeb  
> +Section: debian-installer
> +Architecture: any

Why not restrict this to kfreebsd?

> +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
> +Provides: ${xviddriver:Provides}
> +Description: X.Org X server -- vesa display driver
> + This is a udeb, or a microdeb, for the debian-installer.
> Només a xserver-xorg-video-vesa-2.3.0/debian: 
> xserver-xorg-video-vesa-udeb.install

Missing .install file.

Cheers,
Julien

Attachment: signature.asc
Description: Digital signature

Reply via email to