Bug#558290: src:xserver-xorg-video-ati: debian/rules loses shlibs substvar for xserver-xorg-video-radeon

[Paul TBBle Hampson]

Package: src:xserver-xorg-video-ati
Version: 1:6.12.3-1
Severity: normal


The current xserver-xorg-video-ati debian/rules file has the following lines in its
binary-arch rule:

    dh_shlibdeps -- --warnings=6
    cp -f debian/xserver-xorg-video-ati.substvars debian/xserver-xorg-video-radeon.substvars # xsfbs serverabi hack

This replaces the shlibs for xserver-xorg-video-radeon with the shlibs for xserver-xorg-video-ati,
leaving xserver-xorg-video-radeon depending on insufficiently recent versions of some libraries, and
missing dependancies on others.

eg. on my box, the following is the xserver-xorg-video-ati shlibs for 6.12.3:
	shlibs:Depends=libc6 (>= 2.2.5), libpciaccess0 (>= 0)
while xserver-xorg-video-radeon gets:
	shlibs:Depends=libc6 (>= 2.7), libdrm2 (>= 2.3.1), libpciaccess0 (>= 0.10.2)

ie. xserver-xorg-video-radeon is missing its libdrm2 dependancy.

Simply exchanging the two lines in the rules file appears to work correctly, as the misc:Depends
substvar is empty in both cases, and the other substvars are what the cp line is attempting to
insert into the radeon substvars file.

A quick look at the xsfbs rules file suggests that calling the serverabi rule from it with
PACAKGE set to xserver-xorg-video-radeon might be a better fix though, but I haven't tried this,
and I'm not totally sure that's even possible in makefile syntax.

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (950, 'unstable'), (900, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-rc8 (SMP w/4 CPU cores)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash