From c9e4c416ce308d65bef3bd15631d730aaf8b23b8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 12 Feb 2015 16:35:43 +0100 Subject: [PATCH] xorg-server1.16: conflicts with xorg-server, rather than replaces. xbps-0.43.1 fails to detect the "replaces" properly when there's a revdep that depends on another vpkg version. For now just conflict with any xorg-server pkg. --- srcpkgs/xorg-server1.16/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xorg-server1.16/template b/srcpkgs/xorg-server1.16/template index 366790cbf90..3f63fa365ef 100644 --- a/srcpkgs/xorg-server1.16/template +++ b/srcpkgs/xorg-server1.16/template @@ -1,7 +1,7 @@ # Template build file for 'xorg-server1.16'. pkgname=xorg-server1.16 version=1.16.4 -revision=1 +revision=2 wrksrc="xorg-server-${version}" build_style=gnu-configure configure_args="--enable-ipv6 --enable-xcsecurity --enable-record @@ -39,7 +39,7 @@ makedepends=" # See hw/xfree86/common/xf86Module.h. Only care for the major version. depends="xkeyboard-config" provides="xorg-server-${version}_${revision} xserver-abi-extension-8_1 xserver-abi-input-21_1 xserver-abi-video-18_1" -replaces="xorg-server>=0" +conflicts="xorg-server>=0" # Package build options build_options="systemd"