Merge lp:~mardy/account-plugins/foursquare-1159795 into lp:account-plugins

Proposed by Alberto Mardegan on 2013-03-26
Status: Merged
Approved by: Ken VanDine on 2013-05-01
Approved revision: 100
Merged at revision: 104
Proposed branch: lp:~mardy/account-plugins/foursquare-1159795
Merge into: lp:account-plugins
Diff against target: 43 lines (+9/-2)
3 files modified
configure.ac (+1/-1)
data/providers/foursquare.provider.in.in (+1/-1)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~mardy/account-plugins/foursquare-1159795
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-05-01
Ken VanDine 2013-03-26 Approve on 2013-05-01
Review via email: mp+155493@code.launchpad.net

Commit message

Fix Foursquare authentication

Description of the change

Fix Foursquare authentication

To post a comment you must log in.
Ken VanDine (ken-vandine) wrote :

please fix the conflict in changelog

review: Needs Fixing
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Alberto Mardegan (mardy) wrote :

Updated. Ken, please have a look (is "raring" OK, or should I use "UNRELEASED"?).

Ken VanDine (ken-vandine) :
review: Approve
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/account-plugins-autolanding/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/account-plugins-raring-amd64-autolanding/7/console

review: Needs Fixing (continuous-integration)
100. By Alberto Mardegan on 2013-05-01

Update to latest trunk

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2013-04-29 17:22:56 +0000
3+++ configure.ac 2013-05-01 20:56:26 +0000
4@@ -1,7 +1,7 @@
5 dnl Process this file with autoconf to produce a configure script.
6
7 AC_INIT([account-plugins],
8- [0.9],
9+ [0.10],
10 [https://bugs.launchpad.net/online-accounts-account-plugins/+filebug],
11 [account-plugins],
12 [https://launchpad.net/online-accounts-account-plugins])
13
14=== modified file 'data/providers/foursquare.provider.in.in'
15--- data/providers/foursquare.provider.in.in 2013-02-25 06:25:34 +0000
16+++ data/providers/foursquare.provider.in.in 2013-05-01 20:56:26 +0000
17@@ -14,7 +14,7 @@
18 <group name="user_agent">
19 <setting name="Host">foursquare.com</setting>
20 <setting name="AuthPath">/oauth2/authenticate</setting>
21- <setting name="RedirectUri">http://gwibber.com/0/auth.html</setting>
22+ <setting name="RedirectUri">https://wiki.ubuntu.com/</setting>
23 <setting name="Display">touch</setting>
24 <setting name="ResponseType">token</setting>
25 <setting name="ClientId">@FOURSQUARE_CLIENT_ID@</setting>
26
27=== modified file 'debian/changelog'
28--- debian/changelog 2013-05-01 07:55:49 +0000
29+++ debian/changelog 2013-05-01 20:56:26 +0000
30@@ -31,6 +31,13 @@
31
32 -- Ken VanDine <ken.vandine@canonical.com> Fri, 26 Apr 2013 14:17:51 -0400
33
34+account-plugins (0.10bzr13.03.26-0ubuntu1) raring; urgency=low
35+
36+ * New upstream snapshot
37+ - Fix Foursquare authentication (LP: #1159795)
38+
39+ -- Alberto Mardegan <alberto.mardegan@canonical.com> Tue, 26 Mar 2013 15:32:44 +0200
40+
41 account-plugins (0.10bzr13.03.19-0ubuntu1) raring; urgency=low
42
43 * Add transitional dummy package for unity-asset-pool

Subscribers

People subscribed via source and target branches

to all changes: