Fix desktop icons' install path

The desktop icons specified by the desktop XML files need
to be installed in /usr/share/icons/default/small/. This fix
is also a workaround to TC-1554.

And while we are at it, delete duplicate desktop .pngs.

FIXME: clean up install paths to use tzplatform variables.

Change-Id: Ie1bf2153164800d35d793218a0dba89b3fdc8a3b
Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>

diff --git a/data/apps/org.tizen.ico.homescreen/res/org.tizen.ico.homescreen.png b/data/apps/org.tizen.ico.homescreen/res/org.tizen.ico.homescreen.png
deleted file mode 100644 (file)
index 1a0c715..0000000
Binary files a/data/apps/org.tizen.ico.homescreen/res/org.tizen.ico.homescreen.png and /dev/null differ

diff --git a/data/apps/org.tizen.ico.onscreen/res/org.tizen.ico.onscreen.png b/data/apps/org.tizen.ico.onscreen/res/org.tizen.ico.onscreen.png
deleted file mode 100644 (file)
index 1a0c715..0000000
Binary files a/data/apps/org.tizen.ico.onscreen/res/org.tizen.ico.onscreen.png and /dev/null differ

diff --git a/data/apps/org.tizen.ico.statusbar/res/org.tizen.ico.statusbar.png b/data/apps/org.tizen.ico.statusbar/res/org.tizen.ico.statusbar.png
deleted file mode 100644 (file)
index 1a0c715..0000000
Binary files a/data/apps/org.tizen.ico.statusbar/res/org.tizen.ico.statusbar.png and /dev/null differ

diff --git a/packaging/ico-uxf-homescreen.spec b/packaging/ico-uxf-homescreen.spec
index eeb4869..a7d5e0f 100644 (file)
--- a/packaging/ico-uxf-homescreen.spec
+++ b/packaging/ico-uxf-homescreen.spec
@@ -156,6 +156,9 @@ rm -f /usr/share/applications/org.tizen.ico.system-controller.desktop
 %{_bindir}/ico_dump_notification
 %{_bindir}/ico_send_notification
 %{_bindir}/ico_send_notification2
+%{_datadir}/icons/default/small/org.tizen.ico.homescreen.png
+%{_datadir}/icons/default/small/org.tizen.ico.statusbar.png
+%{_datadir}/icons/default/small/org.tizen.ico.onscreen.png
 
 %files system-controller
 %manifest %{name}.manifest

diff --git a/src/homescreen/Makefile.am b/src/homescreen/Makefile.am
index d482572..713deb1 100644 (file)
--- a/src/homescreen/Makefile.am
+++ b/src/homescreen/Makefile.am
@@ -96,30 +96,15 @@ install-exec-hook:
        mkdir -p $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/sound
        mkdir -p $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/edj
        mkdir -p $(INSTALL_ROOT)/usr/share/packages
+       mkdir -p $(INSTALL_ROOT)/usr/share/icons/default/small/
        install -m 0755 HomeScreen $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/bin
        install -m 0644 home_screen_bg.edj $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/edj
        install -m 0644 home_screen_touch.edj $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/edj
-       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/bg.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
-       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/ctrl.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
-       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/applist_off.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
-       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/applist_off_2.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
-       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/applist_on.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
-       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/applist_on_2.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
-       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/api_all_off.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
-       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/api_all_on.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
-       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/pagePointer_n.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
-       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/pagePointer_p.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
-       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/pageDownCursor.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
-       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/pageUpCursor.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
-       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/button_really.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
-       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/button_no.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
-       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/button_yes.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
-       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/termIcon.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
-       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/tizen_32.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
+       install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/images/* $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/images
        install -m 0644 $(top_srcdir)/data/share/packages/org.tizen.ico.homescreen.xml $(INSTALL_ROOT)/usr/share/packages
        install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/config/* $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/config
        install -m 0644 $(top_srcdir)/res/org.tizen.ico.homescreen/res/sound/* $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen/res/sound
-       cp -r $(top_srcdir)/data/apps/org.tizen.ico.homescreen $(INSTALL_ROOT)/usr/apps/
+       install -m 0644 $(top_srcdir)/data/apps/org.tizen.ico.homescreen/res/icons/default/small/* $(INSTALL_ROOT)/usr/share/icons/default/small/
 
 uninstall:
        rm -rf $(INSTALL_ROOT)/usr/apps/org.tizen.ico.homescreen

diff --git a/src/onscreen/Makefile.am b/src/onscreen/Makefile.am
index 32eaa68..d4abc03 100644 (file)
--- a/src/onscreen/Makefile.am
+++ b/src/onscreen/Makefile.am
@@ -65,10 +65,12 @@ install-exec-hook:
        mkdir -p $(INSTALL_ROOT)/usr/apps/org.tizen.ico.onscreen/res/config
        mkdir -p $(INSTALL_ROOT)/usr/apps/org.tizen.ico.onscreen/res/themes
        mkdir -p $(INSTALL_ROOT)/usr/share/packages
+       mkdir -p $(INSTALL_ROOT)/usr/share/icons/default/small/
        install -m 0755 OnScreen $(INSTALL_ROOT)/usr/apps/org.tizen.ico.onscreen/bin
        install -m 0644 $(top_srcdir)/data/share/packages/org.tizen.ico.onscreen.xml $(INSTALL_ROOT)/usr/share/packages
        install -m 0644 $(top_srcdir)/res/org.tizen.ico.onscreen/res/config/* $(INSTALL_ROOT)/usr/apps/org.tizen.ico.onscreen/res/config
        install -m 0644 *.edj $(INSTALL_ROOT)/usr/apps/org.tizen.ico.onscreen/res/themes
+       install -m 0644 $(top_srcdir)/data/apps/org.tizen.ico.onscreen/res/icons/default/small/* $(INSTALL_ROOT)/usr/share/icons/default/small/
 
 uninstall:
        rm -rf $(INSTALL_ROOT)/usr/apps/org.tizen.ico.onscreen

diff --git a/src/statusbar/Makefile.am b/src/statusbar/Makefile.am
index e41e969..10c5da0 100644 (file)
--- a/src/statusbar/Makefile.am
+++ b/src/statusbar/Makefile.am
@@ -67,11 +67,13 @@ install-exec-hook:
        mkdir -p $(INSTALL_ROOT)/usr/apps/org.tizen.ico.statusbar/res/images
        mkdir -p $(INSTALL_ROOT)/usr/apps/org.tizen.ico.statusbar/res/themes
        mkdir -p $(INSTALL_ROOT)/usr/share/packages
+       mkdir -p $(INSTALL_ROOT)/usr/share/icons/default/small/
        install -m 0755 StatusBar $(INSTALL_ROOT)/usr/apps/org.tizen.ico.statusbar/bin
        install -m 0644 $(top_srcdir)/res/org.tizen.ico.statusbar/res/images/time*.png $(INSTALL_ROOT)/usr/apps/org.tizen.ico.statusbar/res/images
        install -m 0644 $(top_srcdir)/data/share/packages/org.tizen.ico.statusbar.xml $(INSTALL_ROOT)/usr/share/packages
        install -m 0644 $(top_srcdir)/res/org.tizen.ico.statusbar/res/config/* $(INSTALL_ROOT)/usr/apps/org.tizen.ico.statusbar/res/config
        install -m 0644 *.edj $(INSTALL_ROOT)/usr/apps/org.tizen.ico.statusbar/res/themes
+       install -m 0644 $(top_srcdir)/data/apps/org.tizen.ico.statusbar/res/icons/default/small/* $(INSTALL_ROOT)/usr/share/icons/default/small/
 
 uninstall:
        rm -rf $(INSTALL_ROOT)/usr/apps/org.tizen.ico.statusbar