From 2e3e7ab4667b68ed555e879dcedfea277ffa1ec3 Mon Sep 17 00:00:00 2001
From: "Graydon, Tracy" <tracy.graydon@intel.com>
Date: Fri, 21 Mar 2014 17:38:16 -0400
Subject: [PATCH] Tidy up Panda mappings

---
 git-obs-mapping.xml | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/git-obs-mapping.xml b/git-obs-mapping.xml
index 70177c0..2ab50c8 100644
--- a/git-obs-mapping.xml
+++ b/git-obs-mapping.xml
@@ -15,6 +15,8 @@
         <branch name="tizen" OBS_project="Tizen:Generic" OBS_staging_project="Tizen:Generic:build"/>
         <branch name="tizen_generic" OBS_project="Tizen:Generic" OBS_staging_project="Tizen:Generic:build"/>
         <branch name="tizen_generic_release" OBS_project="Tizen:Generic:Release" OBS_staging_project="Tizen:Generic:Release:build"/>
+        <branch name="tizen" OBS_project="Tizen:IVI:Panda" OBS_staging_project="Tizen:IVI:Panda:build"/>
+        <branch name="tizen_ivi_panda" OBS_project="Tizen:IVI:Panda" OBS_staging_project="Tizen:IVI:Panda:build"/>
         <branch name="devel/efl" OBS_project="devel:efl:Mobile" OBS_staging_project="devel:efl:Mobile:build"/>
         <branch name="devel/efl" OBS_project="devel:efl:IVI" OBS_staging_project="devel:efl:IVI:build"/>
         <branch name="devel/gst" OBS_project="devel:gst:Mobile" OBS_staging_project="devel:gst:Mobile:build"/>
@@ -25,7 +27,6 @@
         <branch name="tizen_2.1_compat" OBS_project="Tizen:Mobile" OBS_staging_project="Tizen:Mobile:build"/>
         <branch name="tizen_2.1" OBS_project="Tizen:2.1:Main" OBS_staging_project="Tizen:2.1:Main:build"/>
         <branch name="tizen_2.2" OBS_project="Tizen:2.2:Main" OBS_staging_project="Tizen:2.2:Main:build"/>
-        <branch name="tizen" OBS_project="Tizen:IVI:Panda" OBS_staging_project="Tizen:IVI:Panda:build"/>
     </path>
     <path name="/platform/adaptation/intel_mfld/">
         <branch name="tizen" OBS_project="Tizen:Mobile" OBS_staging_project="Tizen:Mobile:build"/>
@@ -92,8 +93,8 @@
         <branch name="tizen_ivi_genivi" OBS_project="Tizen:IVI:Genivi" OBS_staging_project="Tizen:IVI:Genivi:build"/>   
         <branch name="tizen_ivi_release" OBS_project="Tizen:IVI:Release" OBS_staging_project="Tizen:IVI:Release:build"/>
         <branch name="tizen_ivi_demo" OBS_project="Tizen:IVI:demo" OBS_staging_project="Tizen:IVI:demo:build"/>
-        <branch name="2.0-panda" OBS_project="Tizen:2.0:Panda" OBS_staging_project="Tizen:2.0:Panda:build"/>
         <branch name="tizen" OBS_project="Tizen:IVI:Panda" OBS_staging_project="Tizen:IVI:Panda:build"/>
+        <branch name="tizen_ivi_panda" OBS_project="Tizen:IVI:Panda" OBS_staging_project="Tizen:IVI:Panda:build"/>
         <branch name="devel/efl" OBS_project="devel:efl:IVI" OBS_staging_project="devel:efl:IVI:build"/>
         <branch name="devel/gst" OBS_project="devel:gst:IVI" OBS_staging_project="devel:gst:IVI:build"/>
         <branch name="devel/wayland" OBS_project="devel:wayland:IVI" OBS_staging_project="devel:wayland:IVI:build"/>
@@ -101,10 +102,12 @@
     <path name="/profile/panda/">
         <branch name="2.0-panda" OBS_project="Tizen:2.0:Panda" OBS_staging_project="Tizen:2.0:Panda:build"/>
         <branch name="tizen" OBS_project="Tizen:IVI:Panda" OBS_staging_project="Tizen:IVI:Panda:build"/>
+        <branch name="tizen_ivi_panda" OBS_project="Tizen:IVI:Panda" OBS_staging_project="Tizen:IVI:Panda:build"/>
     </path>
     <path name="/adaptation/panda/">
         <branch name="2.0-panda" OBS_project="Tizen:2.0:Panda" OBS_staging_project="Tizen:2.0:Panda:build"/>
         <branch name="tizen" OBS_project="Tizen:IVI:Panda" OBS_staging_project="Tizen:IVI:Panda:build"/>
+        <branch name="tizen_ivi_panda" OBS_project="Tizen:IVI:Panda" OBS_staging_project="Tizen:IVI:Panda:build"/>
     </path> 
     <path name="apps/home/">
         <branch name="tizen_2.1" OBS_project="Tizen:2.1:Main" OBS_staging_project="Tizen:2.1:Main:build"/>
@@ -121,6 +124,8 @@
         <branch name="tizen" OBS_project="Tizen:Generic" OBS_staging_project="Tizen:Generic:build"/>
         <branch name="tizen_generic" OBS_project="Tizen:Generic" OBS_staging_project="Tizen:Generic:build"/>
         <branch name="tizen_generic_release" OBS_project="Tizen:Generic:Release" OBS_staging_project="Tizen:Generic:Release:build"/>
+        <branch name="tizen" OBS_project="Tizen:IVI:Panda" OBS_staging_project="Tizen:IVI:Panda:build"/>
+        <branch name="tizen_ivi_panda" OBS_project="Tizen:IVI:Panda" OBS_staging_project="Tizen:IVI:Panda:build"/>
         <branch name="kdbus-integration" OBS_project="devel:kdbus:Mobile" OBS_staging_project="devel:kdbus:Mobile:build"/>
     </path>
     <path name="kernel/">
@@ -185,25 +190,6 @@
     <branch name="tizen_ivi_genivi" OBS_project="Tizen:IVI:Genivi" OBS_staging_project="Tizen:IVI:Genivi:build"/>
     <branch name="tizen_ivi_demo" OBS_project="Tizen:IVI:demo" OBS_staging_project="Tizen:IVI:demo:build"/>
   </project>
-  <!-- IVI Panda Projects in profile/ivi -->
-  <project name="profile/ivi/image-configurations-panda">
-    <branch name="2.0-panda" OBS_project="Tizen:2.0:Panda" OBS_staging_project="Tizen:2.0:Panda:build"/>
-  </project>
-  <project name="profile/ivi/package-groups-panda">
-    <branch name="2.0-panda" OBS_project="Tizen:2.0:Panda" OBS_staging_project="Tizen:2.0:Panda:build"/>
-  </project>
-  <project name="profile/ivi/panda-repos">
-    <branch name="2.0-panda" OBS_project="Tizen:2.0:Panda" OBS_staging_project="Tizen:2.0:Panda:build"/>
-    <branch name="tizen" OBS_project="Tizen:IVI:Panda" OBS_staging_project="Tizen:IVI:Panda:build"/>
-  </project>
-  <project name="profile/ivi/panda-preview-repos">
-    <branch name="2.0-panda" OBS_project="Tizen:2.0:Panda" OBS_staging_project="Tizen:2.0:Panda:build"/>
-    <branch name="tizen" OBS_project="Tizen:IVI:Panda" OBS_staging_project="Tizen:IVI:Panda:build"/>
-  </project>
-  <project name="profile/ivi/panda-release-repos">
-    <branch name="2.0-panda" OBS_project="Tizen:2.0:Panda" OBS_staging_project="Tizen:2.0:Panda:build"/>
-    <branch name="tizen" OBS_project="Tizen:IVI:Panda" OBS_staging_project="Tizen:IVI:Panda:build"/>
-  </project>
   <!-- framework/ projects -->
   <project name="framework/uifw/xorg/util/xorg-x11-util-macros">
     <branch name="tizen_2.0" OBS_project="Tizen:2.0:Panda" OBS_staging_project="Tizen:2.0:IVI:build"/>
-- 
2.7.4