Ubuntu Clock App

Merge lp://qastaging/~sergiusens/ubuntu-clock-app/reboot-packaging into lp://qastaging/ubuntu-clock-app/saucy

reboot-packaging
Merge into saucy

Proposed by Sergio Schvezov on 2014-08-12

Status:

Superseded

Proposed branch:

lp://qastaging/~sergiusens/ubuntu-clock-app/reboot-packaging

Merge into:

lp://qastaging/ubuntu-clock-app/saucy

Diff against target:

10032 lines (+9531/-0) (has conflicts)

91 files modified

.bzrignore (+2/-0)
CMakeLists.txt (+82/-0)
COPYING (+674/-0)
README (+9/-0)
README.autopilot (+45/-0)
README.developers (+28/-0)
app/CMakeLists.txt (+24/-0)
app/alarm/AlarmDelegate.qml (+95/-0)
app/alarm/AlarmLabel.qml (+65/-0)
app/alarm/AlarmList.qml (+147/-0)
app/alarm/AlarmPage.qml (+104/-0)
app/alarm/AlarmRepeat.qml (+114/-0)
app/alarm/AlarmSettingsPage.qml (+231/-0)
app/alarm/AlarmSound.qml (+120/-0)
app/alarm/AlarmUtils.qml (+138/-0)
app/alarm/CMakeLists.txt (+6/-0)
app/alarm/EditAlarmPage.qml (+261/-0)
app/clock/CMakeLists.txt (+6/-0)
app/clock/ClockPage.qml (+197/-0)
app/clock/MainClock.qml (+131/-0)
app/components/AnalogMode.qml (+102/-0)
app/components/AnalogShadow.qml (+83/-0)
app/components/Background.qml (+31/-0)
app/components/CMakeLists.txt (+6/-0)
app/components/Clock.qml (+254/-0)
app/components/ClockCircle.qml (+118/-0)
app/components/DigitalMode.qml (+124/-0)
app/components/DigitalShadow.qml (+83/-0)
app/components/PullToAdd.qml (+90/-0)
app/components/Shadow.qml (+44/-0)
app/components/SubtitledListItem.qml (+55/-0)
app/components/Utils.js (+25/-0)
app/graphics/CMakeLists.txt (+8/-0)
app/ubuntu-clock-app.desktop.in (+10/-0)
app/ubuntu-clock-app.qml (+107/-0)
app/upstreamcomponents/CMakeLists.txt (+6/-0)
app/upstreamcomponents/FastScroll.js (+130/-0)
app/upstreamcomponents/FastScroll.qml (+321/-0)
app/upstreamcomponents/ListItemWithActions.qml (+372/-0)
app/upstreamcomponents/ListItemWithActionsCheckBox.qml (+25/-0)
app/upstreamcomponents/MultipleSelectionListView.qml (+199/-0)
app/upstreamcomponents/MultipleSelectionVisualModel.qml (+31/-0)
app/upstreamcomponents/PageWithBottomEdge.qml (+396/-0)
app/upstreamcomponents/README.components (+33/-0)
app/worldclock/CMakeLists.txt (+6/-0)
app/worldclock/UserWorldCityDelegate.qml (+182/-0)
app/worldclock/UserWorldCityList.qml (+145/-0)
app/worldclock/WorldCityList.qml (+205/-0)
app/worldclock/world-city-list.xml (+1383/-0)
backend/CMakeLists.txt (+77/-0)
backend/modules/Alarm/Settings/alarmsettings.cpp (+172/-0)
backend/modules/Alarm/Settings/alarmsettings.h (+104/-0)
backend/modules/Alarm/Settings/backend.cpp (+34/-0)
backend/modules/Alarm/Settings/backend.h (+35/-0)
backend/modules/Alarm/Settings/qmldir (+2/-0)
backend/modules/DateTime/backend.cpp (+34/-0)
backend/modules/DateTime/backend.h (+35/-0)
backend/modules/DateTime/datetime.cpp (+73/-0)
backend/modules/DateTime/datetime.h (+94/-0)
backend/modules/DateTime/qmldir (+2/-0)
backend/modules/Timezone/backend.cpp (+37/-0)
backend/modules/Timezone/backend.h (+35/-0)
backend/modules/Timezone/generictimezonemodel.cpp (+81/-0)
backend/modules/Timezone/generictimezonemodel.h (+58/-0)
backend/modules/Timezone/qmldir (+2/-0)
backend/modules/Timezone/timezonemodel.cpp (+150/-0)
backend/modules/Timezone/timezonemodel.h (+109/-0)
backend/modules/Timezone/xmltimezonemodel.cpp (+139/-0)
backend/modules/Timezone/xmltimezonemodel.h (+54/-0)
debian/changelog (+197/-0)
debian/compat (+1/-0)
debian/control (+42/-0)
debian/copyright (+54/-0)
debian/rules (+20/-0)
debian/source/format (+1/-0)
debian/tests/control (+13/-0)
debian/tests/make-autopilot (+2/-0)
debian/tests/make-test (+2/-0)
debian/ubuntu-clock-app-autopilot.install (+1/-0)
debian/ubuntu-clock-app.install (+2/-0)
manifest.json (+23/-0)
tests/CMakeLists.txt (+1/-0)
tests/autopilot/CMakeLists.txt (+8/-0)
tests/autopilot/run (+13/-0)
tests/autopilot/ubuntu_clock_app/__init__.py (+18/-0)
tests/autopilot/ubuntu_clock_app/emulators.py (+411/-0)
tests/autopilot/ubuntu_clock_app/tests/__init__.py (+138/-0)
tests/autopilot/ubuntu_clock_app/tests/test_alarm.py (+103/-0)
tests/autopilot/ubuntu_clock_app/tests/test_clock.py (+44/-0)
tests/unit/tst_hellocomponent.qml (+49/-0)
ubuntu-clock-app.json (+8/-0)

Conflict adding file .bzrignore.  Moved existing file to .bzrignore.moved.
Conflict adding file .bzrignore.moved.  Moved existing file to .bzrignore.moved.moved.
Conflict adding file CMakeLists.txt.  Moved existing file to CMakeLists.txt.moved.
Conflict adding file COPYING.  Moved existing file to COPYING.moved.
Conflict adding file README.  Moved existing file to README.moved.
Conflict adding file debian.  Moved existing file to debian.moved.
Conflict adding file tests.  Moved existing file to tests.moved.

To merge this branch:

bzr merge lp://qastaging/~sergiusens/ubuntu-clock-app/reboot-packaging

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Nekhelesh Ramananthan		2014-08-12	Pending
Review via email: mp+230551@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2014-08-12.

lp://qastaging/~sergiusens/ubuntu-clock-app/reboot-packaging updated on 2014-08-12

84. By Sergio Schvezov on 2014-08-12: Don't install tests into click package

Unmerged revisions

84. By Sergio Schvezov on 2014-08-12: Don't install tests into click package
83. By Sergio Schvezov on 2014-08-12: Provision version and branch to x-source and version in the manifest
82. By Sergio Schvezov on 2014-08-12: Make it easy for us and let ubuntu-app-lauch use the expected import path
81. By Sergio Schvezov on 2014-08-12: Install apparmor manifest where manifest.json points to
80. By Sergio Schvezov on 2014-08-12: adding x-source to manifest for ci
79. By Nekhelesh Ramananthan on 2014-08-12: Merged trunk
78. By Nicholas Skaggs on 2014-08-12: fix pep8
77. By Nicholas Skaggs on 2014-08-12: remove find local path
76. By Daniel Holbach on 2014-08-11: remove 'builddir' portion from system-installed paths
75. By Daniel Holbach on 2014-08-11: merged lp:~nskaggs/ubuntu-clock-app/fix-ap-setup - resolve conflicts