Add conflicts and provides

2 files changed, 32 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 20d393df6424..36a4b3f2e14c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -85,10 +85,12 @@ pkgname = xorg-server-dev
 	depends = libpciaccess
 	depends = libdrm
 	depends = libxshmfence
+	provides = xorg-server
 	provides = X-ABI-VIDEODRV_VERSION=24.0
 	provides = X-ABI-XINPUT_VERSION=24.1
 	provides = X-ABI-EXTENSION_VERSION=10.0
 	provides = x-server
+	conflicts = xorg-server
 	conflicts = nvidia-utils<=331.20
 	conflicts = glamor-egl
 	conflicts = xf86-video-modesetting
@@ -111,6 +113,8 @@ pkgname = xorg-server-xephyr-dev
 	depends = xcb-util-keysyms
 	depends = nettle
 	depends = libtirpc
+	provides = xorg-server-xephyr
+	conflicts = xorg-server-xephyr
 
 pkgname = xorg-server-xdmx-dev
 	pkgdesc = Distributed Multihead X Server and utilities
@@ -123,6 +127,8 @@ pkgname = xorg-server-xdmx-dev
 	depends = pixman
 	depends = xorg-server-common
 	depends = nettle
+	provides = xorg-server-xdmx
+	conflicts = xorg-server-xdmx
 
 pkgname = xorg-server-xvfb-dev
 	pkgdesc = Virtual framebuffer X server
@@ -133,6 +139,8 @@ pkgname = xorg-server-xvfb-dev
 	depends = xorg-xauth
 	depends = libgl
 	depends = nettle
+	provides = xorg-server-xvfb
+	conflicts = xorg-server-xvfb
 
 pkgname = xorg-server-xnest-dev
 	pkgdesc = A nested X server that runs as an X application
@@ -142,6 +150,8 @@ pkgname = xorg-server-xnest-dev
 	depends = xorg-server-common
 	depends = nettle
 	depends = libtirpc
+	provides = xorg-server-xnest
+	conflicts = xorg-server-xnest
 
 pkgname = xorg-server-xwayland-dev
 	pkgdesc = run X clients under wayland
@@ -154,12 +164,16 @@ pkgname = xorg-server-xwayland-dev
 	depends = xorg-server-common
 	depends = nettle
 	depends = libtirpc
+	provides = xorg-server-xwayland
+	conflicts = xorg-server-xwayland
 
 pkgname = xorg-server-common-dev
 	pkgdesc = Xorg server common files
 	depends = xkeyboard-config
 	depends = xorg-xkbcomp
 	depends = xorg-setxkbmap
+	provides = xorg-server-common
+	conflicts = xorg-server-common
 
 pkgname = xorg-server-devel-dev
 	pkgdesc = Development files for the X.Org X server
@@ -167,4 +181,6 @@ pkgname = xorg-server-devel-dev
 	depends = mesa
 	depends = libpciaccess
 	depends = xorg-util-macros
+	provides = xorg-server-devel
+	conflicts = xorg-server-devel
 
diff --git a/PKGBUILD b/PKGBUILD
index a4d5e11a6ade..fec49e482b8e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -107,6 +107,8 @@ _install() {
 package_xorg-server-common-dev() {
   pkgdesc="Xorg server common files"
   depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap)
+  provides=(xorg-server-common)
+  conflicts=(xorg-server-common)
 
   _install fakeinstall/usr/lib/xorg/protocol.txt
   _install fakeinstall/usr/share/man/man1/Xserver.1
@@ -124,8 +126,8 @@ package_xorg-server-dev() {
 
   # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
   # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-  provides=('X-ABI-VIDEODRV_VERSION=24.0' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server')
-  conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting')
+  provides=('xorg-server' 'X-ABI-VIDEODRV_VERSION=24.0' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server')
+  conflicts=('xorg-server' 'nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting')
   replaces=('glamor-egl' 'xf86-video-modesetting')
   install=xorg-server-dev.install
 
@@ -150,6 +152,8 @@ package_xorg-server-xephyr-dev() {
   depends=(libxfont2 libgl libepoxy libunwind systemd-libs libxv pixman xorg-server-common
            xcb-util-image xcb-util-renderutil xcb-util-wm xcb-util-keysyms
            nettle libtirpc)
+  provides=(xorg-server-xephyr)
+  conflicts=(xorg-server-xephyr)
 
   _install fakeinstall/usr/bin/Xephyr
   _install fakeinstall/usr/share/man/man1/Xephyr.1
@@ -161,6 +165,8 @@ package_xorg-server-xephyr-dev() {
 package_xorg-server-xvfb-dev() {
   pkgdesc="Virtual framebuffer X server"
   depends=(libxfont2 libunwind pixman xorg-server-common xorg-xauth libgl nettle)
+  provides=(xorg-server-xvfb)
+  conflicts=(xorg-server-xvfb)
 
   _install fakeinstall/usr/bin/Xvfb
   _install fakeinstall/usr/share/man/man1/Xvfb.1
@@ -175,6 +181,8 @@ package_xorg-server-xvfb-dev() {
 package_xorg-server-xnest-dev() {
   pkgdesc="A nested X server that runs as an X application"
   depends=(libxfont2 libxext pixman xorg-server-common nettle libtirpc)
+  provides=(xorg-server-xnest)
+  conflicts=(xorg-server-xnest)
 
   _install fakeinstall/usr/bin/Xnest
   _install fakeinstall/usr/share/man/man1/Xnest.1
@@ -187,6 +195,8 @@ package_xorg-server-xdmx-dev() {
   pkgdesc="Distributed Multihead X Server and utilities"
   depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes
            pixman xorg-server-common nettle)
+  provides=(xorg-server-xdmx)
+  conflicts=(xorg-server-xdmx)
 
   _install fakeinstall/usr/bin/{Xdmx,dmx*,vdltodmx,xdmxconfig}
   _install fakeinstall/usr/share/man/man1/{Xdmx,dmxtodmx,vdltodmx,xdmxconfig}.1
@@ -199,6 +209,8 @@ package_xorg-server-xwayland-dev() {
   pkgdesc="run X clients under wayland"
   depends=(libxfont2 libepoxy libunwind systemd-libs libgl pixman xorg-server-common
            nettle libtirpc)
+  provides=(xorg-server-xwayland)
+  conflicts=(xorg-server-xwayland)
 
   _install fakeinstall/usr/bin/Xwayland
 
@@ -211,6 +223,8 @@ package_xorg-server-devel-dev() {
   depends=('xorgproto' 'mesa' 'libpciaccess'
            # not technically required but almost every Xorg pkg needs it to build
            'xorg-util-macros')
+  provides=(xorg-server-devel)
+  conflicts=(xorg-server-devel)
 
   _install fakeinstall/usr/include/xorg/*
   _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc