From a4141e1c11cf86321609e8dfb7c689df35cc2e86 Mon Sep 17 00:00:00 2001
From: Kevin Tian <kevin.tian@intel.com>
Date: Wed, 1 Sep 2010 09:17:37 +0800
Subject: [PATCH] xset: move DISTRO_PN_ALIAS to distro .inc file

also use space as the delimiter instead of semicolon. fix handbook accordingly

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
---
 handbook/extendpoky.xml                                | 8 ++++----
 handbook/ref-variables.xml                             | 1 -
 meta/conf/distro/include/private/distro_x11_apps_2.inc | 1 +
 meta/recipes-graphics/xorg-app/xset_1.1.0.bb           | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/handbook/extendpoky.xml b/handbook/extendpoky.xml
index 18edb1ac95..61d354f39e 100644
--- a/handbook/extendpoky.xml
+++ b/handbook/extendpoky.xml
@@ -914,12 +914,12 @@ DISTRO_PN_ALIAS
             <title>Specifying the DISTRO_PN_ALIAS variable </title>
 
             <programlisting>
-DISTRO_PN_ALIAS = "distro1=package_name_alias1; distro2=package_name_alias2 \
-                    distro3=package_name_alias3; \
-                    ..."
+DISTRO_PN_ALIAS_pn = "distro1=package_name_alias1 distro2=package_name_alias2 \
+                           distro3=package_name_alias3 \
+                           ..."
             </programlisting>
             <para>
-Look at the meta/packages/xorg-app/xset_1.0.4.bb recipe file for an example.
+Use space as the delimiter if there're multiple distro aliases
             </para>
             <tip>
                 <para>
diff --git a/handbook/ref-variables.xml b/handbook/ref-variables.xml
index c14a0a770e..8ac8f01e63 100644
--- a/handbook/ref-variables.xml
+++ b/handbook/ref-variables.xml
@@ -226,7 +226,6 @@
         <glossentry id='var-DISTRO_PN_ALIAS'><glossterm>DISTRO_PN_ALIAS</glossterm>
             <glossdef>
                 <para>Alias names of the recipe in various Linux distributions.  </para>
-                <para>See the "meta/package/xorg-app/xset_1.0.4.bb" file for an example</para>
                 <para>More information in 
                     <link
                         linkend='usingpoky-configuring-DISTRO_PN_ALIAS'>
diff --git a/meta/conf/distro/include/private/distro_x11_apps_2.inc b/meta/conf/distro/include/private/distro_x11_apps_2.inc
index 829d5c5343..ab5595811a 100644
--- a/meta/conf/distro/include/private/distro_x11_apps_2.inc
+++ b/meta/conf/distro/include/private/distro_x11_apps_2.inc
@@ -75,6 +75,7 @@ RECIPE_INTEL_SECTION_pn-xprop="graphic app"
 RECIPE_MAINTAINER_pn-xprop="Yu Ke <ke.yu@intel.com>"
 
 RECIPE_STATUS_pn-xset="green" # no update needed
+DISTRO_PN_ALIAS_pn-xset = "Fedora=xorg-x11-server-utils Ubuntu=x11-xserver-utils Debian=x11-xserver-utils Opensuse=xorg-x11"
 RECIPE_LATEST_VERSION_pn-xset="1.1.0"
 RECIPE_NO_OF_PATCHES_pn-xset="1"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xset="1 year"
diff --git a/meta/recipes-graphics/xorg-app/xset_1.1.0.bb b/meta/recipes-graphics/xorg-app/xset_1.1.0.bb
index 817b097213..2d80d3b38f 100644
--- a/meta/recipes-graphics/xorg-app/xset_1.1.0.bb
+++ b/meta/recipes-graphics/xorg-app/xset_1.1.0.bb
@@ -3,7 +3,6 @@ require xorg-app-common.inc
 DESCRIPTION = "Utility of setting various user preference options of the display"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d"
-DISTRO_PN_ALIAS = "Fedora=xorg-x11-server-utils;Ubuntu=x11-xserver-utils;Debian=x11-xserver-utils;Opensuse=xorg-x11"
 DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
 PR = "r0"
 PE = "1"