Merge lp:~ken-vandine/address-book-app/0.2+16.10.20160823-0ubuntu2 into lp:address-book-app

Proposed by Ken VanDine
Status: Merged
Approved by: Bill Filler
Approved revision: 628
Merged at revision: 628
Proposed branch: lp:~ken-vandine/address-book-app/0.2+16.10.20160823-0ubuntu2
Merge into: lp:address-book-app
Diff against target: 73 lines (+20/-14)
2 files modified
debian/changelog (+6/-0)
debian/control (+14/-14)
To merge this branch: bzr merge lp:~ken-vandine/address-book-app/0.2+16.10.20160823-0ubuntu2
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+305516@code.launchpad.net

Commit message

Sync back a change that was landed in yakkety

Description of the change

Sync back a change that was landed in yakkety

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:628
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/24/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1481
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/348
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1481
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1329
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1329/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1329
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1329/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1329
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1329/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1329
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1329/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1329
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1329/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1329
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1329/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1329
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1329/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1329
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1329/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1329
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1329/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/24/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-08-23 14:40:36 +0000
3+++ debian/changelog 2016-09-12 18:50:42 +0000
4@@ -1,3 +1,9 @@
5+address-book-app (0.2+16.10.20160823-0ubuntu2) yakkety; urgency=medium
6+
7+ * Rebuild against new protobuf 3.
8+
9+ -- Gianfranco Costamagna <locutusofborg@debian.org> Mon, 12 Sep 2016 15:18:02 +0200
10+
11 address-book-app (0.2+16.10.20160823-0ubuntu1) yakkety; urgency=medium
12
13 * Avoid building the package for s390x arch by introducing a s390x
14
15=== modified file 'debian/control'
16--- debian/control 2016-08-23 14:40:36 +0000
17+++ debian/control 2016-09-12 18:50:42 +0000
18@@ -17,17 +17,17 @@
19 libgles2-mesa-dev,
20 python3,
21 pkg-config,
22- qml-module-qttest [amd64 armhf i386],
23- qtdeclarative5-dev-tools [amd64 armhf i386],
24- qtdeclarative5-gsettings1.0 [amd64 armhf i386],
25- qtdeclarative5-ofono0.2 [amd64 armhf i386],
26- qtdeclarative5-qtcontacts-plugin [amd64 armhf i386],
27- qtdeclarative5-ubuntu-content1 [amd64 armhf i386 s390x],
28- qtdeclarative5-ubuntu-history0.1 [amd64 armhf i386],
29- qtdeclarative5-ubuntu-keyboard-extensions0.1 [amd64 armhf i386],
30- qtdeclarative5-buteo-syncfw0.1 [amd64 armhf i386],
31- qtdeclarative5-ubuntu-telephony-phonenumber0.1 [amd64 armhf i386],
32- qtdeclarative5-ubuntu-ui-toolkit-plugin [amd64 armhf i386],
33+ qml-module-qttest [amd64 arm64 armhf i386],
34+ qtdeclarative5-dev-tools [amd64 arm64 armhf i386],
35+ qtdeclarative5-gsettings1.0 [amd64 arm64 armhf i386],
36+ qtdeclarative5-ofono0.2 [amd64 arm64 armhf i386],
37+ qtdeclarative5-qtcontacts-plugin [amd64 arm64 armhf i386],
38+ qtdeclarative5-ubuntu-content1 [amd64 arm64 armhf i386 s390x],
39+ qtdeclarative5-ubuntu-history0.1 [amd64 arm64 armhf i386],
40+ qtdeclarative5-ubuntu-keyboard-extensions0.1 [amd64 arm64 armhf i386],
41+ qtdeclarative5-buteo-syncfw0.1 [amd64 arm64 armhf i386],
42+ qtdeclarative5-ubuntu-telephony-phonenumber0.1 [amd64 arm64 armhf i386],
43+ qtdeclarative5-ubuntu-ui-toolkit-plugin [amd64 arm64 armhf i386],
44 qt5-default,
45 qtbase5-dev,
46 qtdeclarative5-dev,
47@@ -35,7 +35,7 @@
48 libqofono-qt5-0,
49 libqofono-dev,
50 thumbnailer-service,
51- xvfb [amd64 armhf i386],
52+ xvfb [amd64 arm64 armhf i386],
53 lsb-release,
54 Standards-Version: 3.9.5
55 Homepage: https://launchpad.net/address-book-app
56@@ -46,7 +46,7 @@
57 X-Ubuntu-Use-Langpack: yes
58
59 Package: address-book-app
60-Architecture: amd64 armhf i386
61+Architecture: amd64 arm64 armhf i386
62 Depends: libqt5contacts5,
63 libqt5versit5,
64 ubuntu-ui-toolkit-theme (>= 0.1.49+14.10.20140707),
65@@ -96,7 +96,7 @@
66 This package contains the Ubuntu Address Book Components QML plugin.
67
68 Package: address-book-app-dbg
69-Architecture: amd64 armhf i386
70+Architecture: amd64 arm64 armhf i386
71 Section: debug
72 Priority: extra
73 Depends: address-book-app (= ${binary:Version}),

Subscribers

People subscribed via source and target branches