Merge lp:~mvo/libaccounts-qt/multi-arch into lp:libaccounts-qt

Proposed by Michael Vogt
Status: Approved
Approved by: Alberto Mardegan
Approved revision: 144
Proposed branch: lp:~mvo/libaccounts-qt/multi-arch
Merge into: lp:libaccounts-qt
Diff against target: 47 lines (+18/-0)
2 files modified
debian/changelog (+15/-0)
debian/control (+3/-0)
To merge this branch: bzr merge lp:~mvo/libaccounts-qt/multi-arch
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+233015@code.launchpad.net

Commit message

Add "Multi-Arch: same" field for libaccounts-qt1 and libaccounts-qt5-1

Description of the change

Trivial branch that adds "Multi-Arch: same" to the lib packages. Thanks to dh9 and cmake the correct dirs are already used so its just the label that is missing. While doing that I also added a Vcs-Bzr header as it appears to be missing.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Alberto Mardegan (mardy) wrote :

Looks good, thanks!

review: Approve
Revision history for this message
Michael Vogt (mvo) wrote :

I uploaded this into vivid now as it blocks the install of the ubuntu-sdk-15.04-dev1 framework in the click chroots.

lp:~mvo/libaccounts-qt/multi-arch updated
145. By Michael Vogt

fix typo in previous upload

Unmerged revisions

145. By Michael Vogt

fix typo in previous upload

144. By Michael Vogt

add multi-arch: same and a vcs-bzr header

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-08-19 14:46:28 +0000
+++ debian/changelog 2014-11-26 09:48:36 +0000
@@ -1,3 +1,18 @@
1libaccounts-qt (1.13+14.10.20140819.1-0ubuntu3) vivid; urgency=low
2
3 * fix typo in previous upload
4
5 -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 26 Nov 2014 10:48:19 +0100
6
7libaccounts-qt (1.13+14.10.20140819.1-0ubuntu2) vivid; urgency=low
8
9 * debian/control:
10 - add "Multi-Arch: same" to libaccounts-qt1 and libaccounts-qt5-1
11 (no further changes needed thanks to dh9)
12 - add Vcs-Bzr field
13
14 -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 02 Sep 2014 11:43:26 +0200
15
1libaccounts-qt (1.13+14.10.20140819.1-0ubuntu1) utopic; urgency=medium16libaccounts-qt (1.13+14.10.20140819.1-0ubuntu1) utopic; urgency=medium
217
3 [ Alberto Mardegan ]18 [ Alberto Mardegan ]
419
=== modified file 'debian/control'
--- debian/control 2014-08-15 10:44:53 +0000
+++ debian/control 2014-11-26 09:48:36 +0000
@@ -16,10 +16,12 @@
16Standards-Version: 3.9.316Standards-Version: 3.9.3
17Section: libs17Section: libs
18Homepage: http://code.google.com/p/accounts-sso/18Homepage: http://code.google.com/p/accounts-sso/
19Vcs-Bzr: https://code.launchpad.net/~online-accounts/libaccounts-qt/trunk
1920
20Package: libaccounts-qt121Package: libaccounts-qt1
21Section: libs22Section: libs
22Architecture: any23Architecture: any
24Multi-Arch: same
23Pre-Depends: ${misc:Pre-Depends}25Pre-Depends: ${misc:Pre-Depends}
24Depends: ${shlibs:Depends}, ${misc:Depends}26Depends: ${shlibs:Depends}, ${misc:Depends}
25Description: QT library for single sign on27Description: QT library for single sign on
@@ -41,6 +43,7 @@
41Package: libaccounts-qt5-143Package: libaccounts-qt5-1
42Section: libs44Section: libs
43Architecture: any45Architecture: any
46Multi-Arch: same
44Pre-Depends: ${misc:Pre-Depends}47Pre-Depends: ${misc:Pre-Depends}
45Depends: ${shlibs:Depends}, ${misc:Depends}48Depends: ${shlibs:Depends}, ${misc:Depends}
46Description: QT library for single sign on49Description: QT library for single sign on

Subscribers

People subscribed via source and target branches

to all changes: