address-book-app

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

  1. 0.2+16.10.20160823-0ubuntu2
  2. Merge into trunk
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
=== modified file 'debian/changelog'
--- debian/changelog 2016-08-23 14:40:36 +0000
+++ debian/changelog 2016-09-12 18:50:42 +0000
@@ -1,3 +1,9 @@
1address-book-app (0.2+16.10.20160823-0ubuntu2) yakkety; urgency=medium
2
3 * Rebuild against new protobuf 3.
4
5 -- Gianfranco Costamagna <locutusofborg@debian.org> Mon, 12 Sep 2016 15:18:02 +0200
6
1address-book-app (0.2+16.10.20160823-0ubuntu1) yakkety; urgency=medium7address-book-app (0.2+16.10.20160823-0ubuntu1) yakkety; urgency=medium
28
3 * Avoid building the package for s390x arch by introducing a s390x9 * Avoid building the package for s390x arch by introducing a s390x
410
=== modified file 'debian/control'
--- debian/control 2016-08-23 14:40:36 +0000
+++ debian/control 2016-09-12 18:50:42 +0000
@@ -17,17 +17,17 @@
17 libgles2-mesa-dev,17 libgles2-mesa-dev,
18 python3,18 python3,
19 pkg-config,19 pkg-config,
20 qml-module-qttest [amd64 armhf i386],20 qml-module-qttest [amd64 arm64 armhf i386],
21 qtdeclarative5-dev-tools [amd64 armhf i386],21 qtdeclarative5-dev-tools [amd64 arm64 armhf i386],
22 qtdeclarative5-gsettings1.0 [amd64 armhf i386],22 qtdeclarative5-gsettings1.0 [amd64 arm64 armhf i386],
23 qtdeclarative5-ofono0.2 [amd64 armhf i386],23 qtdeclarative5-ofono0.2 [amd64 arm64 armhf i386],
24 qtdeclarative5-qtcontacts-plugin [amd64 armhf i386],24 qtdeclarative5-qtcontacts-plugin [amd64 arm64 armhf i386],
25 qtdeclarative5-ubuntu-content1 [amd64 armhf i386 s390x],25 qtdeclarative5-ubuntu-content1 [amd64 arm64 armhf i386 s390x],
26 qtdeclarative5-ubuntu-history0.1 [amd64 armhf i386],26 qtdeclarative5-ubuntu-history0.1 [amd64 arm64 armhf i386],
27 qtdeclarative5-ubuntu-keyboard-extensions0.1 [amd64 armhf i386],27 qtdeclarative5-ubuntu-keyboard-extensions0.1 [amd64 arm64 armhf i386],
28 qtdeclarative5-buteo-syncfw0.1 [amd64 armhf i386],28 qtdeclarative5-buteo-syncfw0.1 [amd64 arm64 armhf i386],
29 qtdeclarative5-ubuntu-telephony-phonenumber0.1 [amd64 armhf i386],29 qtdeclarative5-ubuntu-telephony-phonenumber0.1 [amd64 arm64 armhf i386],
30 qtdeclarative5-ubuntu-ui-toolkit-plugin [amd64 armhf i386],30 qtdeclarative5-ubuntu-ui-toolkit-plugin [amd64 arm64 armhf i386],
31 qt5-default,31 qt5-default,
32 qtbase5-dev,32 qtbase5-dev,
33 qtdeclarative5-dev,33 qtdeclarative5-dev,
@@ -35,7 +35,7 @@
35 libqofono-qt5-0,35 libqofono-qt5-0,
36 libqofono-dev,36 libqofono-dev,
37 thumbnailer-service,37 thumbnailer-service,
38 xvfb [amd64 armhf i386],38 xvfb [amd64 arm64 armhf i386],
39 lsb-release,39 lsb-release,
40Standards-Version: 3.9.540Standards-Version: 3.9.5
41Homepage: https://launchpad.net/address-book-app41Homepage: https://launchpad.net/address-book-app
@@ -46,7 +46,7 @@
46X-Ubuntu-Use-Langpack: yes46X-Ubuntu-Use-Langpack: yes
4747
48Package: address-book-app48Package: address-book-app
49Architecture: amd64 armhf i38649Architecture: amd64 arm64 armhf i386
50Depends: libqt5contacts5,50Depends: libqt5contacts5,
51 libqt5versit5,51 libqt5versit5,
52 ubuntu-ui-toolkit-theme (>= 0.1.49+14.10.20140707),52 ubuntu-ui-toolkit-theme (>= 0.1.49+14.10.20140707),
@@ -96,7 +96,7 @@
96 This package contains the Ubuntu Address Book Components QML plugin.96 This package contains the Ubuntu Address Book Components QML plugin.
9797
98Package: address-book-app-dbg98Package: address-book-app-dbg
99Architecture: amd64 armhf i38699Architecture: amd64 arm64 armhf i386
100Section: debug100Section: debug
101Priority: extra101Priority: extra
102Depends: address-book-app (= ${binary:Version}),102Depends: address-book-app (= ${binary:Version}),

Subscribers

People subscribed via source and target branches