Commit afbd7281da06ff94304569232939f8fe2ea456e6

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents 98eaf436 7c11f63f

Merge "Changed installation directory from /opt/apps to /usr/apps" into tizen

com.samsung.dali-demo.xml
@@ -6,59 +6,59 @@ @@ -6,59 +6,59 @@
6 <author email="jonghyun.ho@samsung.com" href="www.samsung.com">Jonghyun Ho</author> 6 <author email="jonghyun.ho@samsung.com" href="www.samsung.com">Jonghyun Ho</author>
7 <description>DALi demo Application</description> 7 <description>DALi demo Application</description>
8 8
9 - <ui-application appid="com.samsung.dali-demo" exec="/opt/apps/com.samsung.dali-demo/bin/dali-demo" nodisplay="false" multiple="false" type="c++app" taskmanage="true"> 9 + <ui-application appid="com.samsung.dali-demo" exec="/usr/apps/com.samsung.dali-demo/bin/dali-demo" nodisplay="false" multiple="false" type="c++app" taskmanage="true">
10 <icon>/usr/share/icons/com.samsung.dali-demo.png</icon> 10 <icon>/usr/share/icons/com.samsung.dali-demo.png</icon>
11 <label>DALi demo</label> 11 <label>DALi demo</label>
12 </ui-application> 12 </ui-application>
13 - <ui-application appid="hello-world.example" exec="/opt/apps/com.samsung.dali-demo/bin/hello-world.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 13 + <ui-application appid="hello-world.example" exec="/usr/apps/com.samsung.dali-demo/bin/hello-world.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
14 <label>Hello World</label> 14 <label>Hello World</label>
15 </ui-application> 15 </ui-application>
16 - <ui-application appid="page-turn-view.example" exec="/opt/apps/com.samsung.dali-demo/bin/page-turn-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 16 + <ui-application appid="page-turn-view.example" exec="/usr/apps/com.samsung.dali-demo/bin/page-turn-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
17 <label>PageTurnView Example</label> 17 <label>PageTurnView Example</label>
18 </ui-application> 18 </ui-application>
19 - <ui-application appid="blocks.example" exec="/opt/apps/com.samsung.dali-demo/bin/blocks.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 19 + <ui-application appid="blocks.example" exec="/usr/apps/com.samsung.dali-demo/bin/blocks.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
20 <label>Blocks</label> 20 <label>Blocks</label>
21 </ui-application> 21 </ui-application>
22 - <ui-application appid="bubble-effect.example" exec="/opt/apps/com.samsung.dali-demo/bin/bubble-effect.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 22 + <ui-application appid="bubble-effect.example" exec="/usr/apps/com.samsung.dali-demo/bin/bubble-effect.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
23 <label>Bubble Effect</label> 23 <label>Bubble Effect</label>
24 </ui-application> 24 </ui-application>
25 - <ui-application appid="cluster.example" exec="/opt/apps/com.samsung.dali-demo/bin/cluster.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 25 + <ui-application appid="cluster.example" exec="/usr/apps/com.samsung.dali-demo/bin/cluster.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
26 <label>Cluster example</label> 26 <label>Cluster example</label>
27 </ui-application> 27 </ui-application>
28 - <ui-application appid="cube-transition-effect.example" exec="/opt/apps/com.samsung.dali-demo/bin/cube-transition-effect.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 28 + <ui-application appid="cube-transition-effect.example" exec="/usr/apps/com.samsung.dali-demo/bin/cube-transition-effect.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
29 <label>Cube transition effect</label> 29 <label>Cube transition effect</label>
30 </ui-application> 30 </ui-application>
31 - <ui-application appid="dissolve-effect.example" exec="/opt/apps/com.samsung.dali-demo/bin/dissolve-effect.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 31 + <ui-application appid="dissolve-effect.example" exec="/usr/apps/com.samsung.dali-demo/bin/dissolve-effect.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
32 <label>Dissolve effect</label> 32 <label>Dissolve effect</label>
33 </ui-application> 33 </ui-application>
34 - <ui-application appid="item-view.example" exec="/opt/apps/com.samsung.dali-demo/bin/item-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 34 + <ui-application appid="item-view.example" exec="/usr/apps/com.samsung.dali-demo/bin/item-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
35 <label>Item View</label> 35 <label>Item View</label>
36 </ui-application> 36 </ui-application>
37 - <ui-application appid="magnifier.example" exec="/opt/apps/com.samsung.dali-demo/bin/magnifier.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 37 + <ui-application appid="magnifier.example" exec="/usr/apps/com.samsung.dali-demo/bin/magnifier.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
38 <label>Magnifier</label> 38 <label>Magnifier</label>
39 </ui-application> 39 </ui-application>
40 - <ui-application appid="motion-blur.example" exec="/opt/apps/com.samsung.dali-demo/bin/motion-blur.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 40 + <ui-application appid="motion-blur.example" exec="/usr/apps/com.samsung.dali-demo/bin/motion-blur.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
41 <label>Motion Blur</label> 41 <label>Motion Blur</label>
42 </ui-application> 42 </ui-application>
43 - <ui-application appid="motion-stretch.example" exec="/opt/apps/com.samsung.dali-demo/bin/motion-stretch.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 43 + <ui-application appid="motion-stretch.example" exec="/usr/apps/com.samsung.dali-demo/bin/motion-stretch.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
44 <label>Motion Stretch</label> 44 <label>Motion Stretch</label>
45 </ui-application> 45 </ui-application>
46 - <ui-application appid="radial-menu.example" exec="/opt/apps/com.samsung.dali-demo/bin/radial-menu.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 46 + <ui-application appid="radial-menu.example" exec="/usr/apps/com.samsung.dali-demo/bin/radial-menu.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
47 <label>Radial Menu</label> 47 <label>Radial Menu</label>
48 </ui-application> 48 </ui-application>
49 - <ui-application appid="scroll-view.example" exec="/opt/apps/com.samsung.dali-demo/bin/scroll-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 49 + <ui-application appid="scroll-view.example" exec="/usr/apps/com.samsung.dali-demo/bin/scroll-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
50 <label>Scroll View</label> 50 <label>Scroll View</label>
51 </ui-application> 51 </ui-application>
52 - <ui-application appid="shadow-bone-lighting.example" exec="/opt/apps/com.samsung.dali-demo/bin/shadow-bone-lighting.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 52 + <ui-application appid="shadow-bone-lighting.example" exec="/usr/apps/com.samsung.dali-demo/bin/shadow-bone-lighting.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
53 <label>Shadows and Lights</label> 53 <label>Shadows and Lights</label>
54 </ui-application> 54 </ui-application>
55 - <ui-application appid="dali-builder" exec="/opt/apps/com.samsung.dali-demo/bin/dali-builder" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 55 + <ui-application appid="dali-builder" exec="/usr/apps/com.samsung.dali-demo/bin/dali-builder" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
56 <label>Builder</label> 56 <label>Builder</label>
57 </ui-application> 57 </ui-application>
58 - <ui-application appid="builder.example" exec="/opt/apps/com.samsung.dali-demo/bin/builder.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 58 + <ui-application appid="builder.example" exec="/usr/apps/com.samsung.dali-demo/bin/builder.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
59 <label>Script Based UI</label> 59 <label>Script Based UI</label>
60 </ui-application> 60 </ui-application>
61 - <ui-application appid="image-scaling-irregular-grid.example" exec="/opt/apps/com.samsung.dali-demo/bin/image-scaling-irregular-grid.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 61 + <ui-application appid="image-scaling-irregular-grid.example" exec="/usr/apps/com.samsung.dali-demo/bin/image-scaling-irregular-grid.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
62 <label>Image Scaling Modes</label> 62 <label>Image Scaling Modes</label>
63 </ui-application> 63 </ui-application>
64 </manifest> 64 </manifest>
packaging/com.samsung.dali-demo.spec
@@ -34,7 +34,7 @@ of the capability of the toolkit. @@ -34,7 +34,7 @@ of the capability of the toolkit.
34 ############################## 34 ##############################
35 %prep 35 %prep
36 %setup -q 36 %setup -q
37 -%define dali_app_ro_dir /opt/apps/com.samsung.dali-demo/ 37 +%define dali_app_ro_dir /usr/apps/com.samsung.dali-demo/
38 %define dali_app_exe_dir %{dali_app_ro_dir}/bin/ 38 %define dali_app_exe_dir %{dali_app_ro_dir}/bin/
39 %define dali_xml_file_dir /usr/share/packages/ 39 %define dali_xml_file_dir /usr/share/packages/
40 %define dali_icon_dir /usr/share/icons/ 40 %define dali_icon_dir /usr/share/icons/