Online Accounts: Sign-on daemon

Merge lp:~ken-vandine/signon/qt5default into lp:signon

  1. qt5default
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 563
Merged at revision: 562
Proposed branch: lp:~ken-vandine/signon/qt5default
Merge into: lp:signon
Diff against target: 39 lines (+8/-4)
2 files modified
debian/changelog (+5/-1)
debian/rules (+3/-3)
To merge this branch: bzr merge lp:~ken-vandine/signon/qt5default
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+160742@code.launchpad.net

Commit message

Default to Qt5 build

Description of the change

Default to Qt5 build

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:563
http://jenkins.qa.ubuntu.com/job/signon-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-raring-amd64-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/signon-ci/20/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alberto Mardegan (mardy) wrote :

Let's try :-)

review: Approve

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 2013-04-10 11:28:06 +0000
3+++ debian/changelog 2013-04-24 18:40:36 +0000
4@@ -1,5 +1,6 @@
5 signon (8.50-0ubuntu1) UNRELEASED; urgency=low
6
7+ [ Alberto Mardegan ]
8 * New upstream release.
9 - IdentityInfo::secret() and setId() are now public
10 http://code.google.com/p/accounts-sso/issues/detail?id=177
11@@ -7,7 +8,10 @@
12 - Allow to install tests
13 - pluginproxytest: link with rpath set
14
15- -- Alberto Mardegan <alberto.mardegan@canonical.com> Wed, 10 Apr 2013 15:26:12 +0400
16+ [ Ken VanDine ]
17+ * Default to Qt5 build
18+
19+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 24 Apr 2013 10:07:19 -0400
20
21 signon (8.49-0ubuntu2) raring; urgency=low
22
23
24=== modified file 'debian/rules'
25--- debian/rules 2013-03-26 08:32:30 +0000
26+++ debian/rules 2013-04-24 18:40:36 +0000
27@@ -30,9 +30,9 @@
28 dh_auto_clean -Bbuild/qt5
29
30 override_dh_auto_install:
31- dh_auto_install -Bbuild/qt5 -plibsignon-qt5-1
32- dh_auto_install -Bbuild/qt5 -plibsignon-qt5-dev
33- dh_auto_install -Bbuild/qt4
34+ dh_auto_install -Bbuild/qt4 -plibsignon-qt1
35+ dh_auto_install -Bbuild/qt4 -plibsignon-qt-dev
36+ dh_auto_install -Bbuild/qt5
37
38 override_dh_install:
39 rm -f debian/tmp/usr/include/signon-plugins/*example*.h

Subscribers

People subscribed via source and target branches

to all changes: