[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: ${xviddriver:Provides} broken?



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Sven,

On 02/23/11 17:06, Sven Joachim wrote:
> On 2011-02-23 16:39 +0100, Harald Dunkel wrote:
> 
> 
> Sorry, I got confused myself.  That should have read
> xserver-driver-video, not xserver-xorg-video.
> 

Sorry, but this doesn't seem right. xserver-xorg says it
depends upon

	xserver-xorg-video-all | xorg-driver-video

The free video drivers provide xorg-driver-video, too.

>>
>> :
>> VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
>> INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
>> VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
>> INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
>> :
>> :
>> # This makes sure that the xserver ABI is bumped to match the current one when the
>> # packages are built
>> .PHONY: serverabi
>> serverabi:
>> 	echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PKG_driver).substvars
>> 	echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PKG_driver).substvars
> 
> This stuff is rather obsolete with current xorg-server versions.
> 

OK, I kicked it out. xorg-driver-video is hardcoded in debian/control
now.

AFAICS dh_xfs_substvars is not integrated in cdbs, nor is it documented
at all, so I kept

VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
:
:
.PHONY: serverabi
serverabi:
	echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PKG_driver).substvars
	echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PKG_driver).substvars
	# the following is there for compatibility...
	echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PKG_driver).substvars


Do you think this is OK?

You can find my repository at http://afaics.de/debian/


Regards

Harri
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1lV+IACgkQUTlbRTxpHjdK4wCcDlkMC0QKXzvvdB5zWNxWMpFQ
eAYAoIIBSnHPmBLCk32J4BwjxwoMCDdo
=b7Rx
-----END PGP SIGNATURE-----


Reply to: