Merge lp:~mardy/account-plugins/13.10lp1304798 into lp:account-plugins/13.10

Proposed by Alberto Mardegan on 2014-04-09
Status: Merged
Approved by: Robert Bruce Park on 2014-04-14
Approved revision: 131
Merged at revision: 129
Proposed branch: lp:~mardy/account-plugins/13.10lp1304798
Merge into: lp:account-plugins/13.10
Diff against target: 47 lines (+2/-5)
5 files modified
Makefile.am (+0/-1)
data/webkit-options/secure.flickr.com.conf (+0/-3)
debian/account-plugin-flickr.install (+0/-1)
debian/account-plugin-flickr.maintscript (+1/-0)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~mardy/account-plugins/13.10lp1304798
Reviewer Review Type Date Requested Status
Robert Bruce Park (community) 2014-04-09 Approve on 2014-04-14
PS Jenkins bot (community) continuous-integration Approve on 2014-04-14
Review via email: mp+214909@code.launchpad.net

Commit message

Use new Canonical-owned facebook application key

Description of the change

Use new Canonical-owned facebook application key

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
130. By Alberto Mardegan on 2014-04-14

Restore the ability to create flickr accounts.

131. By Alberto Mardegan on 2014-04-14

Use maintscript

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Robert Bruce Park (robru) wrote :

I will begin SRU'ing this immediately.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2013-08-01 14:34:21 +0000
3+++ Makefile.am 2014-04-14 10:59:16 +0000
4@@ -112,7 +112,6 @@
5 data/webkit-options/identi.ca.conf \
6 data/webkit-options/login.live.com.conf \
7 data/webkit-options/login.yahoo.com.conf \
8- data/webkit-options/secure.flickr.com.conf \
9 data/webkit-options/www.facebook.com.conf \
10 data/webkit-options/www.linkedin.com.conf
11
12
13=== removed file 'data/webkit-options/secure.flickr.com.conf'
14--- data/webkit-options/secure.flickr.com.conf 2012-08-31 11:57:21 +0000
15+++ data/webkit-options/secure.flickr.com.conf 1970-01-01 00:00:00 +0000
16@@ -1,3 +0,0 @@
17-# Force mobile version, not to show google and facebook login options.
18-# See also https://bugs.launchpad.net/bugs/1041744
19-UserAgent = Mozilla/5.0 (iPhone; CPU iPhone OS 5_1_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B206 Safari/7534.48.3
20
21=== modified file 'debian/account-plugin-flickr.install'
22--- debian/account-plugin-flickr.install 2013-06-07 11:56:25 +0000
23+++ debian/account-plugin-flickr.install 2014-04-14 10:59:16 +0000
24@@ -1,5 +1,4 @@
25 etc/signon-ui/webkit-options.d/login.yahoo.com.conf
26-etc/signon-ui/webkit-options.d/secure.flickr.com.conf
27 usr/share/accounts/services/flickr-*.service
28 usr/share/accounts/providers/flickr.provider
29 usr/share/accounts/qml-plugins/flickr/Main.qml
30
31=== added file 'debian/account-plugin-flickr.maintscript'
32--- debian/account-plugin-flickr.maintscript 1970-01-01 00:00:00 +0000
33+++ debian/account-plugin-flickr.maintscript 2014-04-14 10:59:16 +0000
34@@ -0,0 +1,1 @@
35+rm_conffile /etc/signon-ui/webkit-options.d/secure.flickr.com.conf 0.11+14.04.20140408
36
37=== modified file 'debian/rules'
38--- debian/rules 2013-06-12 05:49:46 +0000
39+++ debian/rules 2014-04-14 10:59:16 +0000
40@@ -12,6 +12,7 @@
41 --with-twitter-consumer-key="NGOB5S7sICsj6epjh0PhAw" \
42 --with-twitter-consumer-secret="rbUEJCBEokMnGZd8bubd0QL2cSmoCjJeyiSJpnx3OM0" \
43 --with-windows-live-client-id="00000000400D5635" \
44+ --with-facebook-client-id="271112146382618" \
45 --with-foursquare-client-id="1I2UNJXPHNDZT3OPZOOA5LCPIUEUJFMKRXSF42UFCN1KXKTK" \
46 --with-google-client-id="759250720802-4sii0me9963n9fdqdmi7cepn6ub8luoh.apps.googleusercontent.com" \
47 --with-google-client-secret="juFngKUcuhB7IRQqHtSLavqJ" \

Subscribers

People subscribed via source and target branches