I have made the following changes intended for : CE:UX:MTF / meegotouchcp-language
Please review and accept ASAP - BOSS has already processed this request and suggests ??? See the "Messages from BOSS" section below https://build.pub.meego.com/request/show/2717 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 2717: Messages from BOSS: None State: new 2011-10-24T20:43:21 bossbot Reviews: from bossbot :BOSS suggests accepting this review. See email for more details. BOSS accepted this review because: Target repo CE_UX_MTF_armv7hl found. accepted on No date Changes: submit: Project:MTF / meegotouchcp-language -> CE:UX:MTF / meegotouchcp-language Index: meegotouchcp-language.changes =================================================================== --- meegotouchcp-language.changes (revision 0) +++ meegotouchcp-language.changes (revision 6) @@ -0,0 +1,51 @@ +* Tue Oct 03 2011 Marko Saukko <[email protected]> - 0.11.1 +- Updated to latest upstream version. + +* Fri Aug 12 2011 Gabor Juhasz <[email protected]> - 0.8.33.1 +- BMC#16756 - meegotouchcp-language-tests does not work with test automation + +* Mon Jun 20 2011 Gabor Juhasz <[email protected]> - 0.8.33.1 +- BMC#19603 - Initial version of meegotouchcp-language [CE] +- Removing "!!" prefix from Engineer English +- Fixes: Moving the language applet into proper category +- Reverted fix: Input; Inconsistent Zhuyin symbol with VKB and input field +- Fixes: Changing language while in USB Mass Storage mode prevents reboot, resulting in mix of two different languages +- Fixes: English UK layout remains the active after setting other language in the startup wizard +- Fixes: [FEA] HKSCS-2004 HongKong specific font set - A360 238304 +- Fixes: Language setting header style update +- Fixes: In SUW, language view title is not getting translated according to the language change +- Fixes: [TASK] Dashboard is red for elongated period. Should be green! +- Fixes: After selecting Finnish language, British date and time still shown in the language select screen +- Fixes: Language settings plugin needs to be moved to Time & language category +- Fixes: COREWEB: /usr/bin/mstartup 'DisplayWidget::changeLanguageAndClose DisplayWidget::qt_metacall QMetaObject::metacall QMetaObject::activate QSingleShotTimer::timerEvent' +- Fixes: Language list view with the "Changing device language" query dialog is shown twice in a scenario. + +* Thu Feb 17 2011 Gabor Juhasz <[email protected]> - 0.8.24 +- New version of language applet - BMC#13657 +- Fixes: Language applet main view opening is above the target +- Regressions are fixed +- Fix filtering crash and proper language selection +- Fix compilation bug +- Live filtering works +- Fixes: No keyboard shortcuts for the language dialog +- Fixes: Current language is not highlighted in the language list in the given scenario. + +* Sat Dec 11 2010 Gabor Juhasz <[email protected]> - 0.8.16 +- BMC#11190 +- Add missing profile.d in yaml file +- Fixes: - Automatic regional format switch is not happening when the device language is changed. +- Fixes: - When changing language settings for the first time, region is not set automatically +- Store locale id in /var/lib/duicontrolpanel-displaylanguageapplet/lang +- Fixes: Language settings layout is not as per layout guide. +- Fixes: duicontrolpanel-languageapplet: package built without compiler optimizations +- Automatic region change if region is set as default +- BMC#11133, Fixes : language setting doesn't work +- Removing Kaitlin's 'add_missing_include_patch' + +* Mon Nov 08 2010 Gabor Juhasz <[email protected]> - 0.8.12 +- New version of meegotouchcp-language : 0.8.12 +- replacing libmeegocontrolpanel-devel with pkgconfig(meegotouch-controlpanel) +- BMC#10250 + +* Thu Oct 21 2010 Gabor Juhasz <[email protected]> - 0.8.6 +- Initial version of meegotouchcp-language Index: meegotouchcp-language.spec =================================================================== --- meegotouchcp-language.spec (revision 0) +++ meegotouchcp-language.spec (revision 6) @@ -0,0 +1,108 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.23 +# +# >> macros +# << macros + +Name: meegotouchcp-language +Summary: MeeGo Language Settings +Version: 0.11.1 +Release: 1 +Group: Application Framework/MeeGo Touch Settings +License: LGPLv2.1 +URL: http://meego.gitorious.org/meegotouch/meegotouch-controlpanellanguageapplet +Source0: %{name}-%{version}.tar.bz2 +Source100: meegotouchcp-language.yaml +Patch0: BMC16756_meegotouchcp-language-tests_does_not_work_with_test_automation.patch +Requires: meegotouchcp-language-l10n-engineering-english = %{version} +BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(meegotouch) +BuildRequires: pkgconfig(meegotouch-controlpanel) + + +%description +MeegoTouchControlPanel plugin to choose language + + +%package -n meegotouchcp-language-l10n-engineering-english +Summary: Engineering English translations for the display language applet +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description -n meegotouchcp-language-l10n-engineering-english +Engineering English translations for the display language applet + + +%package -n meegotouchcp-language-tests +Summary: meegotouchcp-language applet functional and unit tests +Group: System/Libraries +Requires: %{name} = %{version}-%{release} +Requires: meegotouchcp-language = %{version} + +%description -n meegotouchcp-language-tests +Functional and Unit testing binaries and shellscripts for testing meegotouchcp-language display language applet + + + +%prep +%setup -q -n %{name}-%{version} + +# BMC16756_meegotouchcp-language-tests_does_not_work_with_test_automation.patch +%patch0 -p1 +# >> setup +# << setup + +%build +# >> build pre +# << build pre + +%qmake + +make %{?jobs:-j%jobs} + +# >> build post +# << build post +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%qmake_install + +# >> install post +# << install post + + + + + + + + + + + + +%files +%defattr(-,root,root,-) +%{_libdir}/duicontrolpanel/applets/libdisplaylanguage.so +%{_datadir}/duicontrolpanel/desktops/displaylanguage.desktop +%{_datadir}/themes/base/meegotouch/libdisplaylanguage/style/libdisplaylanguage.css +%{_sysconfdir}/profile.d +# >> files +# << files + + +%files -n meegotouchcp-language-l10n-engineering-english +%defattr(-,root,root,-) +%{_datadir}/l10n/meegotouch/language.qm +# >> files meegotouchcp-language-l10n-engineering-english +# << files meegotouchcp-language-l10n-engineering-english + +%files -n meegotouchcp-language-tests +%defattr(-,root,root,-) +%{_datadir}/meegotouchcp-language-tests/* +%{_libdir}/meegotouchcp-language-tests/* +# >> files meegotouchcp-language-tests +# << files meegotouchcp-language-tests + Index: BMC16756_meegotouchcp-language-tests_does_not_work_with_test_automation.patch =================================================================== --- BMC16756_meegotouchcp-language-tests_does_not_work_with_test_automation.patch (revision 0) +++ BMC16756_meegotouchcp-language-tests_does_not_work_with_test_automation.patch (revision 6) @@ -0,0 +1,65 @@ +diff --git a/./a/display/tests/gen-tests-xml.sh b/display/tests/gen-tests-xml.sh +index e7fbf18..1c5dd0a 100755 +--- a/display/tests/gen-tests-xml.sh ++++ b/display/tests/gen-tests-xml.sh +@@ -7,7 +7,7 @@ for TEST in `ls -d ?t_*`; do + if [ -x $TEST/$TEST ]; then + + TESTCASE_TEMPLATE="<case name=\"$TEST\" description=\"$TEST\" requirement=\"\" timeout=\"60\"> +- <step expected_result=\"0\">/usr/lib/duicontrolpanel-displaylanguageapplet-tests/$TEST</step> ++ <step expected_result=\"0\">/usr/lib/meegotouchcp-language-tests/$TEST</step> + </case> + " + +@@ -21,7 +21,7 @@ done + + echo "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?> + <testdefinition version=\"0.1\"> +-<suite name=\"duicontrolpanel-displaylanguageapplet-tests\">" ++<suite name=\"meegotouchcp-language-tests\">" + + if [ -n "$UT_TESTCASES" ]; then + echo " <set name=\"unit_tests\" description=\"Unit Tests\"> +diff --git a/display/tests/tests.pro b/display/tests/tests.pro +index 01e4cc9..38534ca 100644 +--- a/display/tests/tests.pro ++++ b/display/tests/tests.pro +@@ -17,7 +17,7 @@ QMAKE_EXTRA_TARGETS += check + + shell_scripts.commands += ./gen-tests-xml.sh > tests.xml + shell_scripts.files += tests.xml +-shell_scripts.path += $$DCP_PREFIX/share/duicontrolpanel-displaylanguageapplet-tests ++shell_scripts.path += $$DCP_PREFIX/share/meegotouchcp-language-tests + shell_scripts.CONFIG += no_check_exist + + INSTALLS += shell_scripts +diff --git a/display/tests/ut-head.pri b/display/tests/ut-head.pri +index bd9096f..df2e6fc 100644 +--- a/display/tests/ut-head.pri ++++ b/display/tests/ut-head.pri +@@ -17,7 +17,7 @@ QMAKE_LIBDIR += $$PKGROOT/lib + DEFINES += UNIT_TEST + DEFINES += QT_NO_DEBUG_OUTPUT + +-UT_INSTALL_DIR = $$DCP_PREFIX/lib/duicontrolpanel-displaylanguageapplet-tests ++UT_INSTALL_DIR = $$DCP_PREFIX/lib/meegotouchcp-language-tests + + target.path += $$UT_INSTALL_DIR + +diff --git a/display/tests/ut_regionconfreader/ut_regionconfreader.pro b/display/tests/ut_regionconfreader/ut_regionconfreader.pro +index 5a62362..ed9a972 100644 +--- a/display/tests/ut_regionconfreader/ut_regionconfreader.pro ++++ b/display/tests/ut_regionconfreader/ut_regionconfreader.pro +@@ -10,10 +10,10 @@ SOURCES += *.cpp \ + $$TEST_SOURCES + + testdata.files = testregions.conf +-testdata.path = $$DCP_PREFIX/lib/duicontrolpanel-displaylanguageapplet-tests ++testdata.path = $$DCP_PREFIX/lib/meegotouchcp-language-tests + INSTALLS += testdata + +-REGION_TESTCONF_PATH = $$DCP_PREFIX/lib/duicontrolpanel-displaylanguageapplet-tests/testregions.conf ++REGION_TESTCONF_PATH = $$DCP_PREFIX/lib/meegotouchcp-language-tests/testregions.conf + + DEFINES += REGION_CONF_PATH=\\\"$${REGION_TESTCONF_PATH}\\\" + TARGET = ut_regionconfreader Index: meegotouchcp-language.yaml =================================================================== --- meegotouchcp-language.yaml (revision 0) +++ meegotouchcp-language.yaml (revision 6) @@ -0,0 +1,47 @@ +Name: meegotouchcp-language +Summary: MeeGo Language Settings +Version: 0.11.1 +Release: 1 +Group: Application Framework/MeeGo Touch Settings +License: LGPLv2.1 +URL: http://meego.gitorious.org/meegotouch/meegotouch-controlpanellanguageapplet +Sources: + - "%{name}-%{version}.tar.bz2" +Description: MeegoTouchControlPanel plugin to choose language +PkgConfigBR: + - QtGui + - meegotouch + - meegotouch-controlpanel +Requires: + - meegotouchcp-language-l10n-engineering-english = %{version} +Patches: + - BMC16756_meegotouchcp-language-tests_does_not_work_with_test_automation.patch +Configure: none +Builder: qmake +SetupOptions: "-q -n %{name}-%{version}" +Files: + - "%{_libdir}/duicontrolpanel/applets/libdisplaylanguage.so" + - "%{_datadir}/duicontrolpanel/desktops/displaylanguage.desktop" + - "%{_datadir}/themes/base/meegotouch/libdisplaylanguage/style/libdisplaylanguage.css" + - "%{_sysconfdir}/profile.d" +SubPackages: + - Name: meegotouchcp-language-l10n-engineering-english + AsWholeName: True + Summary: Engineering English translations for the display language applet + Group: System/Libraries + Files: + - "%{_datadir}/l10n/meegotouch/language.qm" + Description: | + Engineering English translations for the display language applet + + - Name: meegotouchcp-language-tests + AsWholeName: True + Summary: meegotouchcp-language applet functional and unit tests + Group: System/Libraries + Requires: + - meegotouchcp-language = %{version} + Files: + - "%{_datadir}/meegotouchcp-language-tests/*" + - "%{_libdir}/meegotouchcp-language-tests/*" + Description: | + Functional and Unit testing binaries and shellscripts for testing meegotouchcp-language display language applet Index: meegotouchcp-language-0.11.1.tar.bz2 =================================================================== Binary file meegotouchcp-language-0.11.1.tar.bz2 added Index: Makefile =================================================================== --- Makefile (revision 0) +++ Makefile (revision 6) @@ -0,0 +1,5 @@ +PKG_NAME := meegotouchcp-language +SPECFILE = $(addsuffix .spec, $(PKG_NAME)) +YAMLFILE = $(addsuffix .yaml, $(PKG_NAME)) + +include /usr/share/packaging-tools/Makefile.common
