address-book-service

Merge lp:~renatofilho/address-book-service/rename-eds-extension into lp:address-book-service

  1. rename-eds-extension
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Ken VanDine
Approved revision: 225
Merged at revision: 210
Proposed branch: lp:~renatofilho/address-book-service/rename-eds-extension
Merge into: lp:address-book-service
Prerequisite: lp:~renatofilho/address-book-service/create-eds-extension-package
Diff against target: 70 lines (+23/-9)
2 files modified
debian/changelog (+6/-0)
debian/control (+17/-9)
To merge this branch: bzr merge lp:~renatofilho/address-book-service/rename-eds-extension
Reviewer Review Type Date Requested Status
Ken VanDine packaging Approve
system-apps-ci-bot continuous-integration Approve
Review via email: mp+300614@code.launchpad.net

This proposal supersedes a proposal from 2016-07-20.

Commit message

Rename 'evolution-data-server-ubuntu' package.
And fixes package conflict with old version.

To post a comment you must log in.
lp:~renatofilho/address-book-service/rename-eds-extension updated
217. By Renato Araujo Oliveira Filho

Removed extra package.

218. By Renato Araujo Oliveira Filho

Fix control rules.

219. By Renato Araujo Oliveira Filho

Fixed control line length.

Revision history for this message
Ken VanDine (ken-vandine) wrote :

Actually because of the version mangling across vivid, xenial and yakkety you should really bump the version of address-book-service to 0.1.2 then make it breaks/replaces (<< 0.1.2)

review: Needs Fixing
lp:~renatofilho/address-book-service/rename-eds-extension updated
220. By Renato Araujo Oliveira Filho

Bump version to 0.1.2

221. By Renato Araujo Oliveira Filho

Fixed version number.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:218
https://jenkins.canonical.com/system-apps/job/lp-address-book-service-ci/5/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1004/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1004
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/902
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/902
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/902
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/896/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/896/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/896/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/896/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/896/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/896/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/896/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/896/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/896/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-service/rename-eds-extension updated
222. By Renato Araujo Oliveira Filho

Update dev pakcage name.

223. By Renato Araujo Oliveira Filho

More package fixes.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:221
https://jenkins.canonical.com/system-apps/job/lp-address-book-service-ci/6/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1006/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1006
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/904
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/904
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/904
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/898/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/898/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/898/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/898/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/898/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/898/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/898/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/898/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/898/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-service/rename-eds-extension updated
224. By Renato Araujo Oliveira Filho

Rename install files.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:223
https://jenkins.canonical.com/system-apps/job/lp-address-book-service-ci/7/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1007/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1007
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/905
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/905
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/905
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/899/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/899/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/899/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/899/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/899/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/899/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/899/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/899/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/899/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:224
https://jenkins.canonical.com/system-apps/job/lp-address-book-service-ci/8/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1008/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1008
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/906
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/906
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/906
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/900
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/900/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/900
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/900/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/900/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/900
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/900/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/900
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/900/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/900
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/900/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/900/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/900
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/900/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/900/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-service/rename-eds-extension updated
225. By Renato Araujo Oliveira Filho

Trunk merged.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:225
https://jenkins.canonical.com/system-apps/job/lp-address-book-service-ci/9/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1017
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/192
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1017
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/915
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/915
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/915
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/909
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/909/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/909
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/909/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/909
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/909/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/909
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/909/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/909
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/909/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/909
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/909/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/909
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/909/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/909
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/909/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/909
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/909/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good now

review: Approve (packaging)

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-07-11 15:02:10 +0000
3+++ debian/changelog 2016-07-21 14:09:16 +0000
4@@ -1,3 +1,9 @@
5+address-book-service (0.1.2-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Create a new package evolution-data-server-utouch.
8+
9+ -- Renato Araujo Oliveira Filho <renato.filho@canonical.com> Wed, 20 Jul 2016 11:26:02 -0300
10+
11 address-book-service (0.1.1+16.10.20160711-0ubuntu1) yakkety; urgency=medium
12
13 * Created a debian package "evolution-data-server-ubuntu" to used by
14
15=== modified file 'debian/control'
16--- debian/control 2016-07-11 14:39:36 +0000
17+++ debian/control 2016-07-21 14:09:16 +0000
18@@ -34,7 +34,7 @@
19 Architecture: any
20 Multi-Arch: same
21 Depends: address-book-updater (= ${binary:Version}),
22- evolution-data-server-ubuntu (= ${binary:Version}),
23+ evolution-data-server-utouch (= ${binary:Version}),
24 evolution-data-server(>= 3.12.11),
25 libfolks-eds25,
26 ${misc:Depends},
27@@ -77,24 +77,32 @@
28 ${misc:Depends},
29 ${shlibs:Depends},
30 Description: Ubuntu contact service updater
31- A helper program to update address book service and address book app configuration and sync files.
32+ A helper program to update address book service and address book app
33+ configuration and sync files.
34
35-Package: evolution-data-server-ubuntu
36+Package: evolution-data-server-utouch
37+Replaces: evolution-data-server-ubuntu,
38+ address-book-service (<< 0.1.2)
39+Breaks: address-book-service (<< 0.1.2)
40 Architecture: any
41 Multi-Arch: same
42 Depends: ${misc:Depends},
43 ${shlibs:Depends},
44-Description: EDS extension used by Ubuntu apps
45- An EDS extension used by Ubuntu apps to store metadata about the online account and sync infomation.
46+Description: EDS extension used by Ubuntu Touch apps
47+ An EDS extension used by Ubuntu Touch apps to store extra metadata into EDS
48+ sources, used by address-book-service and qtorganizer5-eds.
49
50-Package: evolution-data-server-ubuntu-dev
51+Package: evolution-data-server-utouch-dev
52+Replaces: evolution-data-server-ubuntu-dev
53+Breaks: evolution-data-server-ubuntu-dev
54 Architecture: any
55 Multi-Arch: same
56-Depends: evolution-data-server-ubuntu (= ${binary:Version}),
57+Depends: evolution-data-server-utouch (= ${binary:Version}),
58 ${misc:Depends},
59 ${shlibs:Depends},
60-Description: EDS extension used by Ubuntu apps
61- An EDS extension used by Ubuntu apps to store metadata about the online account and sync infomation.
62+Description: EDS extension used by Ubuntu Touch apps
63+ An EDS extension used by Ubuntu Touch apps to store extra metadata into EDS
64+ sources, used by address-book-service and qtorganizer5-eds.
65 .
66 This package contains header files for evolution-data-server-ubuntu.
67
68
69=== renamed file 'debian/evolution-data-server-ubuntu-dev.install' => 'debian/evolution-data-server-utouch-dev.install'
70=== renamed file 'debian/evolution-data-server-ubuntu.install' => 'debian/evolution-data-server-utouch.install'

Subscribers

People subscribed via source and target branches