From 13dfd2894ec4461bb8145c57265ae7eec324d78f Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Tue, 3 Jul 2007 10:42:54 +0000
Subject: xorg-app: renamed xset, xvinfo, x11perf as part of X11 cleanup

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2079 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/xorg-app/x11perf_1.4.1.bb         |  7 +++++++
 meta/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb |  5 -----
 meta/packages/xorg-app/xset_1.0.2.bb            | 15 +++++++++++++++
 meta/packages/xorg-app/xset_X11R7.1-1.0.2.bb    | 15 ---------------
 meta/packages/xorg-app/xvinfo_1.0.1.bb          |  7 +++++++
 meta/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb  |  6 ------
 6 files changed, 29 insertions(+), 26 deletions(-)
 create mode 100644 meta/packages/xorg-app/x11perf_1.4.1.bb
 delete mode 100644 meta/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb
 create mode 100644 meta/packages/xorg-app/xset_1.0.2.bb
 delete mode 100644 meta/packages/xorg-app/xset_X11R7.1-1.0.2.bb
 create mode 100644 meta/packages/xorg-app/xvinfo_1.0.1.bb
 delete mode 100644 meta/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb

(limited to 'meta/packages/xorg-app')

diff --git a/meta/packages/xorg-app/x11perf_1.4.1.bb b/meta/packages/xorg-app/x11perf_1.4.1.bb
new file mode 100644
index 000000000..66aeed2d9
--- /dev/null
+++ b/meta/packages/xorg-app/x11perf_1.4.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " virtual/libx11 libxmu libxrender libxft libxext"
+
+PE = "1"
diff --git a/meta/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb b/meta/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb
deleted file mode 100644
index 8581abd43..000000000
--- a/meta/packages/xorg-app/x11perf_X11R7.1-1.4.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libxmu libxrender libxft libxext"
diff --git a/meta/packages/xorg-app/xset_1.0.2.bb b/meta/packages/xorg-app/xset_1.0.2.bb
new file mode 100644
index 000000000..776d1fb99
--- /dev/null
+++ b/meta/packages/xorg-app/xset_1.0.2.bb
@@ -0,0 +1,15 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "user preference utility for X"
+LICENSE = "MIT"
+
+PE = "1"
+
+# Remove libraries that are not hard depends
+DEPENDS += " libxext virtual/libx11 libxxf86misc libxfontcache libxmu"
+
+SRC_URI += "file://disable-xkb.patch;patch=1"
+
+CFLAGS += "-D_GNU_SOURCE"
+EXTRA_OECONF = "--disable-xkb"
+
diff --git a/meta/packages/xorg-app/xset_X11R7.1-1.0.2.bb b/meta/packages/xorg-app/xset_X11R7.1-1.0.2.bb
deleted file mode 100644
index 00855f21f..000000000
--- a/meta/packages/xorg-app/xset_X11R7.1-1.0.2.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
-
-PR="r1"
-
-# Remove libraries that are not hard depends
-DEPENDS += " libxext virtual/libx11 libxxf86misc libxfontcache libxmu"
-
-SRC_URI += "file://disable-xkb.patch;patch=1"
-
-CFLAGS += "-D_GNU_SOURCE"
-EXTRA_OECONF = "--disable-xkb"
-
diff --git a/meta/packages/xorg-app/xvinfo_1.0.1.bb b/meta/packages/xorg-app/xvinfo_1.0.1.bb
new file mode 100644
index 000000000..cbe9251c9
--- /dev/null
+++ b/meta/packages/xorg-app/xvinfo_1.0.1.bb
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxv virtual/libx11"
+
+PE = "1"
diff --git a/meta/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb b/meta/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb
deleted file mode 100644
index e0fe5605b..000000000
--- a/meta/packages/xorg-app/xvinfo_X11R7.0-1.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require xorg-app-common.inc
-
-#DESCRIPTION = ""
-
-DEPENDS += " libxv virtual/libx11"
-
-- 
cgit v1.2.3