8 files changed, 14 insertions, 29 deletions

diff --git a/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.4.bb b/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.4.bb
index bf3ecbaccf..d3fbd13d1d 100644
--- a/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.4.bb
+++ b/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.4.bb
@@ -1,8 +1,8 @@
-require xorg-app-common.inc
+require recipes-graphics/xorg-app/xorg-app-common.inc
 DESCRIPTION = "Tool for manipulating ICE protocol authorization records"
 LIC_FILES_CHKSUM = "file://COPYING;md5=13f70acf3c27f5f834bbc954df775f8e"
 DEPENDS += "libice"
-PR = "${INC_PR}.0"
+PR = "r6"
 
 SRC_URI[md5sum] = "bb2e4d2611047f7c5a1a82ec956a9de4"
 SRC_URI[sha256sum] = "0ee6fd4554f0131b1ed526ee00b9cf643e7dc97eb70fb51448848ef2f349938d"
diff --git a/meta-oe/recipes-graphics/xorg-app/rgb_1.0.4.bb b/meta-oe/recipes-graphics/xorg-app/rgb_1.0.4.bb
index 59dca2ac7d..d51e1e82d8 100644
--- a/meta-oe/recipes-graphics/xorg-app/rgb_1.0.4.bb
+++ b/meta-oe/recipes-graphics/xorg-app/rgb_1.0.4.bb
@@ -1,8 +1,8 @@
-require xorg-app-common.inc
+require recipes-graphics/xorg-app/xorg-app-common.inc
 DEPENDS += " xproto util-macros"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a"
 PE = "1"
-PR = "${INC_PR}.0"
+PR = "r6"
 
 SRC_URI[md5sum] = "35c6cccbf25a872bdd62bfcb1a73d951"
 SRC_URI[sha256sum] = "80887da011ad086fff88bfd16c6d9d5ac7da45ef1bc9d0c192a6f370423370f1"
diff --git a/meta-oe/recipes-graphics/xorg-app/sessreg_1.0.6.bb b/meta-oe/recipes-graphics/xorg-app/sessreg_1.0.6.bb
index c919462195..05d701dcf1 100644
--- a/meta-oe/recipes-graphics/xorg-app/sessreg_1.0.6.bb
+++ b/meta-oe/recipes-graphics/xorg-app/sessreg_1.0.6.bb
@@ -1,10 +1,10 @@
-require xorg-app-common.inc
+require recipes-graphics/xorg-app/xorg-app-common.inc
 
 DESCRIPTION = "a simple program for managing utmp/wtmp entries"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=07e6423e8815e6b372cd45da76faacd0"
 
-PR = "${INC_PR}.0"
+PR = "r6"
 
 SRC_URI[archive.md5sum] = "8c8fcda19f4cffe573d43ec9b8255f8e"
 SRC_URI[archive.sha256sum] = "73f31670842b7d969504a61f3c694bf1911f844831c390396971ae2b74de7190"
diff --git a/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.2.0.bb b/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.2.0.bb
index 592a95d2f8..22df1f1797 100644
--- a/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.2.0.bb
+++ b/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.2.0.bb
@@ -1,8 +1,8 @@
-require xorg-app-common.inc
+require recipes-graphics/xorg-app/xorg-app-common.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=5feafdbe6dfe9e2bd32325be0cfc86f8"
 DEPENDS += " libxkbfile"
 PE = "1"
-PR = "${INC_PR}.0"
+PR = "r6"
 
 SRC_URI[archive.md5sum] = "2f6df89201eb9a2cbfb905d6b82a191e"
 SRC_URI[archive.sha256sum] = "999591bf1ba8ca2a7d480b2c01702396e6c349d499fb583c0de136ec00dbae39"
diff --git a/meta-oe/recipes-graphics/xorg-app/xinput_1.5.3.bb b/meta-oe/recipes-graphics/xorg-app/xinput_1.5.3.bb
index c1acc983d6..3480185d3d 100644
--- a/meta-oe/recipes-graphics/xorg-app/xinput_1.5.3.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xinput_1.5.3.bb
@@ -1,8 +1,8 @@
-require xorg-app-common.inc
+require recipes-graphics/xorg-app/xorg-app-common.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=22c34ea36136407a77702a8b784f9bd0"
 DESCRIPTION = "a utility to configure and test XInput devices"
 DEPENDS += " libxi"
-PR = "${INC_PR}.0"
+PR = "r6"
 
 SRC_URI[md5sum] = "1e2f0ad4f3fa833b65c568907f171d28"
 SRC_URI[sha256sum] = "6aade131cecddaeefc39ddce1dd5e8473f6039c2e4efbfd9fbb5ee2a75885c76"
diff --git a/meta-oe/recipes-graphics/xorg-app/xorg-app-common.inc b/meta-oe/recipes-graphics/xorg-app/xorg-app-common.inc
deleted file mode 100644
index 8358af4d5b..0000000000
--- a/meta-oe/recipes-graphics/xorg-app/xorg-app-common.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "X application"
-HOMEPAGE = "http://www.x.org/"
-SECTION = "x11/apps"
-LICENSE = "MIT-X"
-DEPENDS = "util-macros-native virtual/libx11"
-
-INC_PR = "r5"
-
-SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2"
-
-S = "${WORKDIR}/${BPN}-${PV}"
-
-inherit autotools pkgconfig
-
-FILES_${PN} += "  /usr/lib/X11/${BPN} /usr/share/X11/app-defaults/"
diff --git a/meta-oe/recipes-graphics/xorg-app/xrdb_1.0.9.bb b/meta-oe/recipes-graphics/xorg-app/xrdb_1.0.9.bb
index 96d15c86e6..82b530e691 100644
--- a/meta-oe/recipes-graphics/xorg-app/xrdb_1.0.9.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xrdb_1.0.9.bb
@@ -1,10 +1,10 @@
-require xorg-app-common.inc
+require recipes-graphics/xorg-app/xorg-app-common.inc
 DESCRIPTION = "X server resource database utility"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d1167c4f586bd41f0c62166db4384a69"
 
 DEPENDS += "libxmu"
-PR = "${INC_PR}.0"
+PR = "r6"
 
 SRC_URI[archive.md5sum] = "ed2e48cf33584455d74615ad4bbe4246"
 SRC_URI[archive.sha256sum] = "642401e12996efe3e5e5307a245e24c282b94a44c1f147e177c8484b862aeab7"
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_266.bb b/meta-oe/recipes-graphics/xorg-app/xterm_266.bb
index d826c27cb0..35f540300a 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_266.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_266.bb
@@ -1,7 +1,7 @@
-require xorg-app-common.inc
+require recipes-graphics/xorg-app/xorg-app-common.inc
 DESCRIPTION = "xterm is the standard terminal emulator for the X Window System."
 DEPENDS = "libxaw xproto xextproto libxext libxau libxpm ncurses"
-PR = "${INC_PR}.0"
+PR = "r6"
 
 LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=33;md5=4791b08be94de2e6315ddd158659997d"