Rename license folder: xorg-server-devel-git → xorg-server-devel

2 files changed, 12 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 146728576b0a..3f74eb4810b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by makepkg 4.2.0
+# Wed Jan 14 15:33:53 UTC 2015
 pkgbase = xorg-server-git
 	pkgver = 1.17.0.158.r14799.gfa12f2c
 	pkgrel = 3
@@ -88,7 +90,6 @@ pkgname = xorg-server-git
 	conflicts = xf86-video-modesetting
 	conflicts = xorg-server
 	replaces = glamor-egl
-	replaces = xf86-video-modesetting
 
 pkgname = xorg-server-xephyr-git
 	pkgdesc = A nested X server that runs as an X application - Git
@@ -98,7 +99,7 @@ pkgname = xorg-server-xephyr-git
 	depends = libgcrypt
 	depends = libxv
 	depends = pixman
-	depends = xorg-server-common
+	depends = xorg-server-common-git
 	depends = xcb-util-image
 	depends = xcb-util-renderutil
 	depends = xcb-util-wm
diff --git a/PKGBUILD b/PKGBUILD
index 80b6dab1b62c..c82b2169fef8 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -112,10 +112,13 @@ package_xorg-server-git() {
   depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common-git xf86-input-evdev libxshmfence libgl)
   # see src/xserver/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-git pkg
-  for VAR in VIDEODRV XINPUT EXTENSION; do
-    provides+=("X-ABI-${VAR}_VERSION=$(grep -Po "${VAR}_V.*\(\K[^)]*" xserver/hw/xfree86/common/xf86Module.h |& sed 's/, /./')")
-  done
-  provides+=('x-server' 'xorg-server')
+  _ABI_VIDEODRV="$(grep -Po "VIDEODRV_V.*\(\K[^)]*" xserver/hw/xfree86/common/xf86Module.h | sed "s/, /./")"
+  _ABI_XINPUT="$(grep -Po "XINPUT_V.*\(\K[^)]*" xserver/hw/xfree86/common/xf86Module.h | sed "s/, /./")"
+  _ABI_EXTENSION="$(grep -Po "EXTENSION_V.*\(\K[^)]*" xserver/hw/xfree86/common/xf86Module.h | sed "s/, /./")"
+  provides=("X-ABI-VIDEODRV_VERSION=$_ABI_VIDEODRV"
+            "X-ABI-XINPUT_VERSION=$_ABI_XINPUT"
+            "X-ABI-EXTENSION_VERSION=$_ABI_EXTENSION"
+            'x-server' 'xorg-server')
   groups=('xorg')
   conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting' 'xorg-server')
   replaces=('glamor-egl' 'xf86-video-modesetting')
@@ -251,6 +254,6 @@ package_xorg-server-devel-git() {
   rm -rf "${pkgdir}/usr/lib/xorg-server"
   rm -rf "${pkgdir}/var"
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel-git"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel-git/COPYING"
+  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
+  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
 }