1
=== modified file 'debian/changelog'
2
--- debian/changelog	2013-04-04 22:55:13 +0000
3
+++ debian/changelog	2013-04-11 12:55:24 +0000
4
@@ -1,3 +1,33 @@
5
1
qml-phone-shell (1.70) quantal; urgency=low
6
2
7
3
  * CMake fixes
8
4
  * improve HUD PeakDetector performance
9
5
  * initial QML coverage measurement
10
6
  * enable coverage analysis for C/C++
11
7
  * require out-of-source builds
12
8
  * fix incorrect linkage in hudclient.cpp
13
9
  * reduce warnings
14
10
  * add an optional on-commit test hook
15
11
  * tests for:
16
12
    * IndicatorRow
17
13
    * Tile
18
14
    * SearchIndicator
19
15
    * trailing whitespace
20
16
    * PageHeader
21
17
    * SearchHistoryModel
22
18
    * ResponsiveFlowView
23
19
    * SideStage
24
20
    * Indicators
25
21
  * move tests into subdirectories
26
22
  * increase test setup consistency
27
23
  * remove some dead code
28
24
  * register CategoryFilter to QML
29
25
  * use a static python install path for autopilot
30
26
  * merge first stages of libunity-api
31
27
  * drop unneeded moc includes
32
28
33
29
 -- Michał Sawicz <michal.sawicz@canonical.com>  Thu, 11 Apr 2013 14:42:22 +0200
34
30
35
1
qml-phone-shell (1.69) quantal; urgency=low
31
qml-phone-shell (1.69) quantal; urgency=low
36
2
32
37
3
  [ Sergio Schvezov ]
33
  [ Sergio Schvezov ]
38
4
34
39
=== modified file 'run'
40
--- run	2013-04-05 14:39:17 +0000
41
+++ run	2013-04-11 12:55:24 +0000
42
@@ -1,4 +1,4 @@
43
1
#!/bin/sh
1
#!/bin/sh
44
2
2
45
3
UNITY_CORE_BUILD_DIR=$PWD/../unity_build/build
3
UNITY_CORE_BUILD_DIR=$PWD/../unity_build/build
47
4
LD_LIBRARY_PATH=$UNITY_CORE_BUILD_DIR/lib ./builddir/qml-phone-shell
4
LD_LIBRARY_PATH=$UNITY_CORE_BUILD_DIR/lib ./builddir/qml-phone-shell $@
48
5
5
49
=== modified file 'run_on_device'
50
--- run_on_device	2013-03-21 21:39:31 +0000
51
+++ run_on_device	2013-04-11 12:55:24 +0000
52
@@ -69,8 +69,7 @@
53
69
}
69
}
54
70
70
55
71
build() {
71
build() {
58
72
    exec_with_ssh "cd $CODE_DIR/ && PATH=/usr/lib/ccache:$PATH cmake -DCMAKE_BUILD_TYPE=Debug ."
72
    exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/ && PATH=/usr/lib/ccache:$PATH ./build"
57
73
    exec_with_ssh PATH=/usr/lib/ccache:$PATH "make -j${NUM_JOBS}" --directory=$CODE_DIR/
59
74
}
73
}
60
75
74
61
76
run() {
75
run() {
62
@@ -88,7 +87,7 @@
63
88
        adb shell "chroot /data/ubuntu /usr/bin/service ubuntu-session restart"
87
        adb shell "chroot /data/ubuntu /usr/bin/service ubuntu-session restart"
64
89
    fi
88
    fi
65
90
    adb shell pkill $BINARY
89
    adb shell pkill $BINARY
67
91
    exec_with_ssh "cd $CODE_DIR/ && ./$BINARY $RUN_OPTIONS"
90
    exec_with_ssh "cd $CODE_DIR/ && ./run $RUN_OPTIONS"
68
92
    if [ $CONTAINS_SHELL -eq 0 ]; then
91
    if [ $CONTAINS_SHELL -eq 0 ]; then
69
93
        echo "Restoring $SERVICEFILE on device from $SERVICEFILE.backup"
92
        echo "Restoring $SERVICEFILE on device from $SERVICEFILE.backup"
70
94
        adb shell cp $SERVICEFILE.backup $SERVICEFILE
93
        adb shell cp $SERVICEFILE.backup $SERVICEFILE
Status:	Merged
Approved by:	Albert Astals Cid on 2013-04-11
Approved revision:	no longer in the source branch.
Merged at revision:	580
Proposed branch:	lp:~saviq/unity/phablet.fix-run_on_device
Merge into:	lp:unity/phablet
Diff against target:	70 lines (+33/-4) 3 files modified debian/changelog (+30/-0) run (+1/-1) run_on_device (+2/-3)
To merge this branch:	bzr merge lp:~saviq/unity/phablet.fix-run_on_device
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-04-11
Albert Astals Cid (community)		2013-04-11	Approve on 2013-04-11
Review via email: mp+158348@code.launchpad.net