From: Jing Yigang Date: Thu, 6 Sep 2012 05:43:19 +0000 (+0800) Subject: [Feature] use system-info api to get build info . X-Git-Tag: 2.0_alpha~24^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=03e0afece5648aef9226c5aa589c9c117dc934f0;p=apps%2Fcore%2Fpreloaded%2Fsettings.git [Feature] use system-info api to get build info . Change-Id: Iff539819caf643e711c85af6b25ae9fa8b0e671b --- diff --git a/packaging/settings.spec b/packaging/settings.spec index 1ccbf8f..3a11194 100755 --- a/packaging/settings.spec +++ b/packaging/settings.spec @@ -16,7 +16,6 @@ BuildRequires: pkgconfig(devman_haptic) BuildRequires: pkgconfig(bluetooth-api) BuildRequires: pkgconfig(mm-sound) BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(iniparser) BuildRequires: pkgconfig(heynoti) BuildRequires: pkgconfig(ui-gadget-1) BuildRequires: pkgconfig(json-glib-1.0) diff --git a/resource/Open_Source_Announcement.html b/resource/Open_Source_Announcement.html old mode 100644 new mode 100755 index 183fd80..a32d1f0 --- a/resource/Open_Source_Announcement.html +++ b/resource/Open_Source_Announcement.html @@ -11,7 +11,8 @@ Packages: dbus, libdbus-1-0, libdbus-glib-1-2

License: AFLv2, LGPLv2.0
Packages: libxdgmime

License: Apache License v2.0
-Packages: alarm-server, appsvc-tool, bluetooth-frwk-agent, bluetooth-frwk-test, bluetooth-share, boot-animation, capi-appfw-app-manager, capi-appfw-application, capi-base-common-dev, capi-content-media-content, capi-location-geocoder, capi-location-manager, capi-media-audio-io, capi-media-camera, capi-media-image-util, capi-media-player, capi-media-radio, capi-media-recorder, capi-media-sound-manager, capi-media-tone-player, capi-media-wav-player, capi-messaging-email, capi-messaging-mms, capi-messaging-sms, capi-network-bluetooth, capi-network-connection, capi-network-nfc, capi-social-calendar, capi-social-call-log, capi-social-contacts, capi-system-device, capi-system-haptic, capi-system-info, capi-system-power, capi-system-runtime-info, capi-system-sensor, capi-telephony-call, capi-telephony-network-info, capi-telephony-sim, capi-ui-efl-util, capi-uix-feedback, capi-uix-tts, cbhm, org.tizen.alert-3g-syspopup, org.tizen.app-selector, org.tizen.bluetooth, org.tizen.bluetooth-headers, org.tizen.bluetooth-share-ui, org.tizen.browser, org.tizen.bt-appsvc, org.tizen.bt-syspopup, org.tizen.calculator, org.tizen.calendar-viewer, org.tizen.call, org.tizen.ciss, org.tizen.clock, org.tizen.contacts, org.tizen.contacts-viewer, org.tizen.download-provider, org.tizen.efl-calendar, org.tizen.gallery, org.tizen.idle-lock, org.tizen.image-viewer, org.tizen.indicator, org.tizen.lowbat-syspopup, org.tizen.lowmem-syspopup, org.tizen.memo, org.tizen.menu-screen, org.tizen.music-player, org.tizen.phone, org.tizen.phone-lock, org.tizen.poweroff-syspopup, org.tizen.pwlock, org.tizen.quickpanel, org.tizen.setting, org.tizen.smartsearch, org.tizen.taskmgr, org.tizen.usb-syspopup, org.tizen.video-player, org.tizen.voicerecorder, org.tizen.volume, org.tizen.wifi-qs, contacts-service-bin, default-fonts-fc-sdk, default-fonts-sdk, dlogutil-bin, drm-service-0, efl-theme-tizen, efl-theme-tizen-black, efl-theme-tizen-black-hd, efl-theme-tizen-hd, gps-manager, ise-default, ise-engine-default, libail-0, libalarm-0, libapp-checker-0, libapp-checker-server-0, libappcore-common-0, libappcore-efl-0, libappsvc-0, libaudiosessionmgr-0, libaul-1, libaul-1-executable, libavsystem-0, libbluetooth-engine-0, libbluetooth-frwk-0, libbundle-0, libcamsrcjpegenc, libcamsrcjpegenc-sw-libjpeg, libcert-svc-0, libconnectivity-device-interface-0, libcontacts-service, libdevman-0, libdlog-0, libdownload-agent-0, libelm-webview, libheynoti-0, libmedia-service, libmedia-thumbnail, libmedia-utils, libmm-camcorder, libmm-common, libmm-fileinfo, libmm-imgp-gstcs, libmm-log, libmm-player, libmm-radio, libmm-session-0, libmm-sound-0, libmm-sound-tool, libmm-ta, libmm-utility, libnetwork-0, libnfc-common-lib-0, libnfc-manager-0, libopencore-amrnb, libopencore-amrwb, libpkgmgr-client-0, libpkgmgr-installer, libprivilege-control-0, librua-0, libsecurity-server-client-0, libsf-common-0, libslp-alarm-0, libslp-calendar-0, libslp-db-util-0, libslp-location, libslp-memo, libslp-mms-plugin, libslp-msg-service-0, libslp-pm-0, libslp-sensor-0, libslp-setting-0, libslp-shortcut-0, libslp-sms-plugin, libslp-sysman, libslp-tapi-0, libslp-utilx-0, libsppc-0, libss-client-0, libstt, libsvi-0, libsys-assert-0, libtts, libug-calendar-efl, libug-calendar-picker-efl, libug-contacts-efl, libug-gallery-efl-0, libug-image-viewer-efl, libug-memo-efl, libug-myfile-efl, libug-phone-efl, libug-setting-bluetooth-efl, libug-setting-call-efl, libug-setting-gallery-efl, libug-setting-location-efl, libug-setting-manage-applications-efl-0, libug-setting-theme-efl, libug-worldclock-efl, libui-gadget-0, libui-idlecapture-0, libuw-imap-toolkit-0, libvconf-0, location-geoclue-gpsd, location-geoclue-nominatim, location-gps-manager, media-data-sdk, media-server, media-thumbnail-server, menu-daemon, mm-fileinfo-tools, mmfw-sysconf-cleansdk-target, mmfw-sysconf-simulator, msg-service-tools, myaccount-0, rpm-installer, nitz, opengl-es, opengl-es-virtual-drv, pkgmgr-server, sdbd, security-server, sensor-framework, sonet0, spp-client-bin, spp-client-tool, ss-server, starter, svi-data-sdk, syspopup-0, syspopup-caller-0, system-server-bin, telephony-server, usb-setting-app, wifi-efl-ug, wrt, wrt-plugins-common, wrt-plugins-tizen, wrt-plugins-wac, wrt-test, openssh-client, openssh-server +Packages: alarm-server, appsvc-tool, bluetooth-frwk-agent, bluetooth-frwk-test, bluetooth-share, boot-animation, capi-appfw-app-manager, capi-appfw-application, capi-base-common-dev, capi-content-media-content, capi-location-geocoder, capi-location-manager, capi-media-audio-io, capi-media-camera, capi-media-image-util, capi-media-player, capi-media-radio, capi-media-recorder, capi-media-sound-manager, capi-media-tone-player, capi-media-wav-player, capi-messaging-email, capi-messaging-mms, capi-messaging-sms, capi-network-bluetooth, capi-network-connection, capi-network-nfc, capi-social-calendar, capi-social-call-log, capi-social-contacts, capi-system-device, capi-system-haptic, capi-system-info, capi-system-power, capi-system-runtime-info, capi-system-sensor, capi-telephony-call, capi-telephony-network-info, capi-telephony-sim, capi-ui-efl-util, capi-uix-feedback, capi-uix-tts, cbhm, org.tizen.alert-3g-syspopup, org.tizen.app-selector, org.tizen.bluetooth, org.tizen.bluetooth-headers, org.tizen.bluetooth-share-ui, org.tizen.browser, org.tizen.bt-appsvc, org.tizen.bt-syspopup, org.tizen.calculator, org.tizen.calendar-viewer, org.tizen.call, org.tizen.ciss, org.tizen.clock, org.tizen.contacts, org.tizen.contacts-viewer, org.tizen.download-provider, org.tizen.efl-calendar, org.tizen.gallery, org.tizen.idle-lock, org.tizen.image-viewer, org.tizen.indicator, org.tizen.lowbat-syspopup, org.tizen.lowmem-syspopup, org.tizen.memo, org.tizen.menu-screen, org.tizen.music-player, org.tizen.phone, org.tizen.phone-lock, org.tizen.poweroff-syspopup, org.tizen.pwlock, org.tizen.quickpanel, org.tizen.setting, org.tizen.smartsearch, org.tizen.taskmgr, org.tizen.usb-syspopup, org.tizen.video-player, org.tizen.voicerecorder, org.tizen.volume, org.tizen.wifi-qs, contacts-service-bin, default-fonts-fc-sdk, default-fonts-sdk, dlogutil-bin, drm-service-0, efl-theme-tizen, efl-theme-tizen-black, efl-theme-tizen-black-hd, efl-theme-tizen-hd, gps-manager, ise-default, ise-engine-default, libail-0, libalarm-0, libapp-checker-0, libapp-checker-server-0, libappcore-common-0, libappcore-efl-0, libappsvc-0, libaudiosessionmgr-0, libaul-1, libaul-1-executable, libavsystem-0, libbluetooth-engine-0, libbluetooth-frwk-0, libbundle-0, libcamsrcjpegenc, libcamsrcjpegenc-sw-libjpeg, libcert-svc-0, libconnectivity-device-interface-0, libcontacts-service, libdevman-0, libdlog-0, libdownload-agent-0, libelm-webview, libheynoti-0, libmedia-service, libmedia-thumbnail, libmedia-utils, libmm-camcorder, libmm-common, libmm-fileinfo, libmm-imgp-gstcs, libmm-log, libmm-player, libmm-radio, libmm-session-0, libmm-sound-0, libmm-sound-tool, libmm-ta, libmm-utility, libnetwork-0, libnfc-common-lib-0, libnfc-manager-0, libopencore-amrnb, libopencore-amrwb, libpkgmgr-client-0, libpkgmgr-installer, libprivilege-control-0, librua-0, libsecurity-server-client-0, libsf-common-0, libslp-alarm-0, libslp-calendar-0, libslp-db-util-0, libslp-location, libslp-memo, libslp-mms-plugin, libslp-msg-service-0, libslp-pm-0, libslp-sensor-0, libslp-setting-0, libslp-shortcut-0, libslp-sms-plugin, libslp-sysman, libslp-tapi-0, libslp-utilx-0, libsppc-0, libss-client-0, libstt, libsvi-0, libsys-assert-0, libtts, libug-calendar-efl, libug-calendar-picker-efl, libug-contacts-efl, libug-gallery-efl-0, libug-image-viewer-efl, libug-memo-efl, libug-myfile-efl, libug-phone-efl, libug-setting-bluetooth-efl, libug-setting-call-efl, libug-setting-gallery-efl, libug-setting-location-efl, libug-setting-manage-applications-efl-0, libug-setting-theme-efl, libug-worldclock-efl, libui-gadget-0, libui-idlecapture-0, libuw-imap-toolkit-0, libvconf-0, location-geoclue-gpsd, location-geoclue-nominatim, location-gps-manager, media-data-sdk, media-server, media-thumbnail-server, menu-daemon, mm-fileinfo-tools, mmfw-sysconf-cleansdk-target, mmfw-sysconf-simulator, msg-service-tools, myaccount-0, rpm-installer, nitz, opengl-es, opengl-es-virtual-drv, pkgmgr-server, sdbd, security-server, sensor-framework, sonet0, spp-client-bin, spp-client-tool, ss-server, starter, svi-data-sdk, syspopup-0, syspopup-caller-0, + system-server-bin, telephony-server, usb-setting-app, wifi-efl-ug, wrt, wrt-plugins-common, wrt-plugins-tizen, wrt-plugins-wac, wrt-test, openssh-client, openssh-server

Licence: BSD
Packages: libuuid1

License: New BSD
@@ -57,7 +58,7 @@ Packages: icu-doc, libicu

License: MIT/X Consortium License
Packages: libexpat1, expat

License: MIT License
-Packages: fontconfig, fontconfig-config, giflib-tools, iniparser, libcurl, libcurl3, libdmx1, libdri2, libdrm-slp1, libdrm2, libfontconfig1, libfontenc1, libgif4, libharfbuzz, libice6, libkms1, liblua5.1-0, liboauth, libpciaccess0, libpixman-1-0, libpthread-stubs0, libsm6, libungif-bin, libungif4g, libx11-6, libx11-data, libx11-xcb1, libxau6, libxaw7, libxcb-atom1, libxcb-aux0, libxcb-composite0, libxcb-damage0, libxcb-dpms0, libxcb-dri2-0, libxcb-event1, libxcb-glx0, libxcb-icccm1, libxcb-image0, libxcb-keysyms1, libxcb-property1, libxcb-randr0, libxcb-record0, libxcb-render-util0, libxcb-render0, libxcb-reply1, libxcb-res0, libxcb-screensaver0, libxcb-shape0, libxcb-shm0, libxcb-sync0, libxcb-xevie0, libxcb-xf86dri0, libxcb-xfixes0, libxcb-xinerama0, libxcb-xprint0, libxcb-xtest0, libxcb-xv0, libxcb-xvmc0, libxcb1, libxcomposite1, libxcursor1, libxdamage1, libxdmcp6, libxext6, libxfixes3, libxfont1, libxft2, libxgesture0, libxi6, libxinerama1, libxkbfile1, libxml2, libxml2-0, libxml2-doc, libxml2-utils, libxmlsec1, libxmlsec1-openssl, libxmu-headers, libxmu6, libxmuu1, libxpm4, libxrandr2, libxrender1, libxres1, libxslt1.1, libxt6, libxtrap6, libxtst6, libxv1, libxxf86dga1, libxxf86misc1, libxxf86vm1, lua5.1, lua5.1-doc, python-xcbgen, x11-apps, x11-common, x11-utils, x11-xkb-utils, x11-xserver-utils, x11proto-bigreqs-dev, x11proto-composite-dev, x11proto-core-dev, x11proto-damage-dev, x11proto-dmx-dev, x11proto-dri2-dev, x11proto-fixes-dev, x11proto-fontcache-dev, x11proto-fonts-dev, x11proto-gesture-dev, x11proto-input-dev, x11proto-kb-dev, x11proto-randr-dev, x11proto-record-dev, x11proto-render-dev, x11proto-resource-dev, x11proto-scrnsaver-dev, x11proto-trap-dev, x11proto-video-dev, x11proto-xcmisc-dev, x11proto-xext-dev, x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86dri-dev, x11proto-xf86misc-dev, x11proto-xf86vidmode-dev, x11proto-xinerama-dev, xbitmaps, xcb-proto, xfonts-utils, xinit, xinput, xkb-data, xkb-data-i18n, xpmutils, xrestop, xserver-common, xserver-xorg-core, xserver-xorg-input-evdev, xserver-xorg-input-evdev-multitouch, xserver-xorg-input-gesture, xserver-xorg-misc-emulfb, xserver-xorg-tools, xserver-xorg-video-emulfb, xtrans-dev, xutils-dev +Packages: fontconfig, fontconfig-config, giflib-tools, libcurl, libcurl3, libdmx1, libdri2, libdrm-slp1, libdrm2, libfontconfig1, libfontenc1, libgif4, libharfbuzz, libice6, libkms1, liblua5.1-0, liboauth, libpciaccess0, libpixman-1-0, libpthread-stubs0, libsm6, libungif-bin, libungif4g, libx11-6, libx11-data, libx11-xcb1, libxau6, libxaw7, libxcb-atom1, libxcb-aux0, libxcb-composite0, libxcb-damage0, libxcb-dpms0, libxcb-dri2-0, libxcb-event1, libxcb-glx0, libxcb-icccm1, libxcb-image0, libxcb-keysyms1, libxcb-property1, libxcb-randr0, libxcb-record0, libxcb-render-util0, libxcb-render0, libxcb-reply1, libxcb-res0, libxcb-screensaver0, libxcb-shape0, libxcb-shm0, libxcb-sync0, libxcb-xevie0, libxcb-xf86dri0, libxcb-xfixes0, libxcb-xinerama0, libxcb-xprint0, libxcb-xtest0, libxcb-xv0, libxcb-xvmc0, libxcb1, libxcomposite1, libxcursor1, libxdamage1, libxdmcp6, libxext6, libxfixes3, libxfont1, libxft2, libxgesture0, libxi6, libxinerama1, libxkbfile1, libxml2, libxml2-0, libxml2-doc, libxml2-utils, libxmlsec1, libxmlsec1-openssl, libxmu-headers, libxmu6, libxmuu1, libxpm4, libxrandr2, libxrender1, libxres1, libxslt1.1, libxt6, libxtrap6, libxtst6, libxv1, libxxf86dga1, libxxf86misc1, libxxf86vm1, lua5.1, lua5.1-doc, python-xcbgen, x11-apps, x11-common, x11-utils, x11-xkb-utils, x11-xserver-utils, x11proto-bigreqs-dev, x11proto-composite-dev, x11proto-core-dev, x11proto-damage-dev, x11proto-dmx-dev, x11proto-dri2-dev, x11proto-fixes-dev, x11proto-fontcache-dev, x11proto-fonts-dev, x11proto-gesture-dev, x11proto-input-dev, x11proto-kb-dev, x11proto-randr-dev, x11proto-record-dev, x11proto-render-dev, x11proto-resource-dev, x11proto-scrnsaver-dev, x11proto-trap-dev, x11proto-video-dev, x11proto-xcmisc-dev, x11proto-xext-dev, x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86dri-dev, x11proto-xf86misc-dev, x11proto-xf86vidmode-dev, x11proto-xinerama-dev, xbitmaps, xcb-proto, xfonts-utils, xinit, xinput, xkb-data, xkb-data-i18n, xpmutils, xrestop, xserver-common, xserver-xorg-core, xserver-xorg-input-evdev, xserver-xorg-input-evdev-multitouch, xserver-xorg-input-gesture, xserver-xorg-misc-emulfb, xserver-xorg-tools, xserver-xorg-video-emulfb, xtrans-dev, xutils-dev

License: ISC(Internet Software Consortium) Packages: rfkill

License: MIT, ISC(Internet Software Consortium) diff --git a/resource/Open_Source_Announcement.txt b/resource/Open_Source_Announcement.txt old mode 100644 new mode 100755 index cdb12d4..e5199f5 --- a/resource/Open_Source_Announcement.txt +++ b/resource/Open_Source_Announcement.txt @@ -74,7 +74,7 @@ License: MIT/X Consortium License Packages: libexpat1, expat License: MIT License -Packages: fontconfig, fontconfig-config, giflib-tools, iniparser, libcurl, libcurl3, libdmx1, libdri2, libdrm-slp1, libdrm2, libfontconfig1, libfontenc1, libgif4, libharfbuzz, libice6, libkms1, liblua5.1-0, liboauth, libpciaccess0, libpixman-1-0, libpthread-stubs0, libsm6, libungif-bin, libungif4g, libx11-6, libx11-data, libx11-xcb1, libxau6, libxaw7, libxcb-atom1, libxcb-aux0, libxcb-composite0, libxcb-damage0, libxcb-dpms0, libxcb-dri2-0, libxcb-event1, libxcb-glx0, libxcb-icccm1, libxcb-image0, libxcb-keysyms1, libxcb-property1, libxcb-randr0, libxcb-record0, libxcb-render-util0, libxcb-render0, libxcb-reply1, libxcb-res0, libxcb-screensaver0, libxcb-shape0, libxcb-shm0, libxcb-sync0, libxcb-xevie0, libxcb-xf86dri0, libxcb-xfixes0, libxcb-xinerama0, libxcb-xprint0, libxcb-xtest0, libxcb-xv0, libxcb-xvmc0, libxcb1, libxcomposite1, libxcursor1, libxdamage1, libxdmcp6, libxext6, libxfixes3, libxfont1, libxft2, libxgesture0, libxi6, libxinerama1, libxkbfile1, libxml2, libxml2-0, libxml2-doc, libxml2-utils, libxmlsec1, libxmlsec1-openssl, libxmu-headers, libxmu6, libxmuu1, libxpm4, libxrandr2, libxrender1, libxres1, libxslt1.1, libxt6, libxtrap6, libxtst6, libxv1, libxxf86dga1, libxxf86misc1, libxxf86vm1, lua5.1, lua5.1-doc, python-xcbgen, x11-apps, x11-common, x11-utils, x11-xkb-utils, x11-xserver-utils, x11proto-bigreqs-dev, x11proto-composite-dev, x11proto-core-dev, x11proto-damage-dev, x11proto-dmx-dev, x11proto-dri2-dev, x11proto-fixes-dev, x11proto-fontcache-dev, x11proto-fonts-dev, x11proto-gesture-dev, x11proto-input-dev, x11proto-kb-dev, x11proto-randr-dev, x11proto-record-dev, x11proto-render-dev, x11proto-resource-dev, x11proto-scrnsaver-dev, x11proto-trap-dev, x11proto-video-dev, x11proto-xcmisc-dev, x11proto-xext-dev, x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86dri-dev, x11proto-xf86misc-dev, x11proto-xf86vidmode-dev, x11proto-xinerama-dev, xbitmaps, xcb-proto, xfonts-utils, xinit, xinput, xkb-data, xkb-data-i18n, xpmutils, xrestop, xserver-common, xserver-xorg-core, xserver-xorg-input-evdev, xserver-xorg-input-evdev-multitouch, xserver-xorg-input-gesture, xserver-xorg-misc-emulfb, xserver-xorg-tools, xserver-xorg-video-emulfb, xtrans-dev, xutils-dev +Packages: fontconfig, fontconfig-config, giflib-tools, libcurl, libcurl3, libdmx1, libdri2, libdrm-slp1, libdrm2, libfontconfig1, libfontenc1, libgif4, libharfbuzz, libice6, libkms1, liblua5.1-0, liboauth, libpciaccess0, libpixman-1-0, libpthread-stubs0, libsm6, libungif-bin, libungif4g, libx11-6, libx11-data, libx11-xcb1, libxau6, libxaw7, libxcb-atom1, libxcb-aux0, libxcb-composite0, libxcb-damage0, libxcb-dpms0, libxcb-dri2-0, libxcb-event1, libxcb-glx0, libxcb-icccm1, libxcb-image0, libxcb-keysyms1, libxcb-property1, libxcb-randr0, libxcb-record0, libxcb-render-util0, libxcb-render0, libxcb-reply1, libxcb-res0, libxcb-screensaver0, libxcb-shape0, libxcb-shm0, libxcb-sync0, libxcb-xevie0, libxcb-xf86dri0, libxcb-xfixes0, libxcb-xinerama0, libxcb-xprint0, libxcb-xtest0, libxcb-xv0, libxcb-xvmc0, libxcb1, libxcomposite1, libxcursor1, libxdamage1, libxdmcp6, libxext6, libxfixes3, libxfont1, libxft2, libxgesture0, libxi6, libxinerama1, libxkbfile1, libxml2, libxml2-0, libxml2-doc, libxml2-utils, libxmlsec1, libxmlsec1-openssl, libxmu-headers, libxmu6, libxmuu1, libxpm4, libxrandr2, libxrender1, libxres1, libxslt1.1, libxt6, libxtrap6, libxtst6, libxv1, libxxf86dga1, libxxf86misc1, libxxf86vm1, lua5.1, lua5.1-doc, python-xcbgen, x11-apps, x11-common, x11-utils, x11-xkb-utils, x11-xserver-utils, x11proto-bigreqs-dev, x11proto-composite-dev, x11proto-core-dev, x11proto-damage-dev, x11proto-dmx-dev, x11proto-dri2-dev, x11proto-fixes-dev, x11proto-fontcache-dev, x11proto-fonts-dev, x11proto-gesture-dev, x11proto-input-dev, x11proto-kb-dev, x11proto-randr-dev, x11proto-record-dev, x11proto-render-dev, x11proto-resource-dev, x11proto-scrnsaver-dev, x11proto-trap-dev, x11proto-video-dev, x11proto-xcmisc-dev, x11proto-xext-dev, x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86dri-dev, x11proto-xf86misc-dev, x11proto-xf86vidmode-dev, x11proto-xinerama-dev, xbitmaps, xcb-proto, xfonts-utils, xinit, xinput, xkb-data, xkb-data-i18n, xpmutils, xrestop, xserver-common, xserver-xorg-core, xserver-xorg-input-evdev, xserver-xorg-input-evdev-multitouch, xserver-xorg-input-gesture, xserver-xorg-misc-emulfb, xserver-xorg-tools, xserver-xorg-video-emulfb, xtrans-dev, xutils-dev License: ISC(Internet Software Consortium) Packages: rfkill diff --git a/setting-about/CMakeLists.txt b/setting-about/CMakeLists.txt index b9291d0..6fe2611 100755 --- a/setting-about/CMakeLists.txt +++ b/setting-about/CMakeLists.txt @@ -6,8 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include) INCLUDE(FindPkgConfig) pkg_check_modules(pkgs_about REQUIRED elementary appcore-common appcore-efl -# drm-service iniparser ui-gadget-1 - iniparser ui-gadget-1 + ui-gadget-1 capi-appfw-application capi-appfw-app-manager evas ecore tapi bluetooth-api json-glib-1.0 capi-system-info) diff --git a/setting-about/include/setting-about-main.h b/setting-about/include/setting-about-main.h index 46c8d76..2d1409c 100755 --- a/setting-about/include/setting-about-main.h +++ b/setting-about/include/setting-about-main.h @@ -25,7 +25,6 @@ // #define SUPPORT_FOTA -#define SETTING_ABOUT_INFO_PATH "/etc/info.ini" #define SETTING_ABOUT_MACINFO_PATH "/opt/etc/.mac.info" #define SETTING_ABOUT_POWER_SUPPLY_PATH "/sys/class/power_supply" #define SETTING_ABOUT_BD_ADDR_PATH "/opt/etc/.bd_addr" diff --git a/setting-about/include/setting-about.h b/setting-about/include/setting-about.h index c3006c7..5a6e1a4 100755 --- a/setting-about/include/setting-about.h +++ b/setting-about/include/setting-about.h @@ -27,7 +27,6 @@ #include -#include // #include #include diff --git a/setting-about/src/setting-about-main.c b/setting-about/src/setting-about-main.c index a7b5909..7181576 100755 --- a/setting-about/src/setting-about-main.c +++ b/setting-about/src/setting-about-main.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -229,43 +228,29 @@ void setting_about_main_get_sw_version(char* szStr, int nSize) { retm_if(szStr == NULL, "szStr parameter is NULL"); - dictionary* dic = iniparser_load(SETTING_ABOUT_INFO_PATH); - if (dic == NULL) { + char *version = NULL; + int ret = system_info_get_value_string(SYSTEM_INFO_KEY_TIZEN_VERSION, &version); + if (ret != SYSTEM_INFO_ERROR_NONE) { + SETTING_TRACE_ERROR("fail to call system_info_get_value_string"); + FREE(version); snprintf(szStr, nSize, "%s", _("IDS_ST_HEADER_UNAVAILABLE")); - } else { - char* szBinVer = - g_strdup((char*)iniparser_getstr(dic, "Version:Build")); - char* szVerMaj = - g_strdup((char*)iniparser_getstr(dic, "Version:Major")); - char* szVerMin = - g_strdup((char*)iniparser_getstr(dic, "Version:Minor")); - - if (szBinVer) { - char* pPos = szBinVer; - while(*pPos++) { - if ('.' == *pPos) *pPos = '\0'; - } - } - else { - szBinVer = g_strdup(_("IDS_ST_HEADER_UNAVAILABLE")); - } - if (!szVerMaj) { - szVerMaj = g_strdup("-"); - } - if (!szVerMin) { - szVerMin = g_strdup("-"); - } - - snprintf(szStr, nSize, "SLP%s.%s (%s)", szVerMaj, szVerMin, szBinVer); - G_FREE(szBinVer); - G_FREE(szVerMaj); - G_FREE(szVerMin); + return; } - if (dic) { - iniparser_freedict(dic); - dic = NULL; + char *build_info = NULL; + ret = system_info_get_value_string(SYSTEM_INFO_KEY_BUILD_STRING, &build_info); + if (ret != SYSTEM_INFO_ERROR_NONE) { + SETTING_TRACE_ERROR("fail to call system_info_get_value_string"); + FREE(version); + FREE(build_info); + snprintf(szStr, nSize, "%s", _("IDS_ST_HEADER_UNAVAILABLE")); + return; } + + snprintf(szStr, nSize, "SLP%s (%s)", version, build_info); + + FREE(version); + FREE(build_info); } void setting_about_main_get_wifi_mac_address_string(char *str, int size) diff --git a/setting-common/CMakeLists.txt b/setting-common/CMakeLists.txt index 4c3684f..7f675fc 100755 --- a/setting-common/CMakeLists.txt +++ b/setting-common/CMakeLists.txt @@ -19,7 +19,7 @@ PROJECT(${LIB_SETTING_COMMON}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs_common_data REQUIRED appcore-efl elementary vconf openssl evas ecore ecore-imf json-glib-1.0 edje iniparser glib-2.0 libxml-2.0 ui-gadget-1 capi-appfw-application capi-system-info capi-system-system-settings) +pkg_check_modules(pkgs_common_data REQUIRED appcore-efl elementary vconf openssl evas ecore ecore-imf json-glib-1.0 edje glib-2.0 libxml-2.0 ui-gadget-1 capi-appfw-application capi-system-info capi-system-system-settings) FOREACH(flag ${pkgs_common_data_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") diff --git a/setting-common/include/setting-common-data-type.h b/setting-common/include/setting-common-data-type.h index c5c6400..ca44618 100755 --- a/setting-common/include/setting-common-data-type.h +++ b/setting-common/include/setting-common-data-type.h @@ -148,7 +148,6 @@ typedef void (*setting_call_back_func) (void *data, Evas_Object *obj, void *even #define __STR_EMUL "emul" #define __LEN_STR_EMUL 4 -#define BIN_INFO_FILE_PATH "/etc/info.ini" #define MAX_SYSTEM_SERVICE_NUM 30 #define SYSTEM_SERVICE_LIST_PATH "/opt/osp/system/configuration/system-services.list" diff --git a/setting-common/src/setting-common-general-func.c b/setting-common/src/setting-common-general-func.c index b6e051e..cc96a96 100755 --- a/setting-common/src/setting-common-general-func.c +++ b/setting-common/src/setting-common-general-func.c @@ -23,7 +23,6 @@ #include #include -#include #include #include #include @@ -807,60 +806,32 @@ char* get_icon_path(const char *package) // not SLP : 0 int is_slp_binary() { - dictionary* dic = iniparser_load("/etc/info.ini"); - char* str = (char *)iniparser_getstr(dic, "Version:Build"); + char *str = NULL; + int ret = system_info_get_value_string(SYSTEM_INFO_KEY_BUILD_STRING, &str); + if (ret != SYSTEM_INFO_ERROR_NONE) { + SETTING_TRACE_ERROR("fail to call system_info_get_value_string"); + FREE(str); + return 0; + } + char* pos = str; if (str) { while(*pos++){ if('_' == *pos) { *pos = '\0'; - if (!strncmp(str, "SLP", 3)) return 1; + if (!strncmp(str, "SLP", 3)){ + FREE(str); + return 1; + } } } } - if (dic) { - iniparser_freedict(dic); - dic = NULL; - } + FREE(str); return 0; } bool isEmulBin() { -#if DISABLED_CODE - char szEmul[__LEN_STR_EMUL+1]; - const char* szBinVer = NULL; - - dictionary* dic = iniparser_load(BIN_INFO_FILE_PATH); - // when failed to get the info, let's regard the binary as an emulator one - if (!dic) - return TRUE; - - szBinVer = (const char*)iniparser_getstr(dic, "Version:Build"); - if (szBinVer) { - char* str = g_strdup(szBinVer); - if (str) { - char* pPos = str; - while (*pPos++) { - if ('_' == *pPos) - *pPos = ' '; - } - sscanf(str, "%*s %4s", szEmul); - } - G_FREE(str); - } - - if (dic) { - iniparser_freedict(dic); - dic = NULL; - } - - if (!strncmp(szEmul, __STR_EMUL, __LEN_STR_EMUL)) { - return TRUE; - } else { - return FALSE; - } -#else char *model_str = NULL; int ret = system_info_get_value_string(SYSTEM_INFO_KEY_MODEL, &model_str); //SETTING_TRACE("model_str : %s", model_str); @@ -877,7 +848,6 @@ bool isEmulBin() FREE(model_str); return FALSE; } -#endif } int get_popup_btn_response_type(const char *btn_str)