Merge lp:~mardy/account-plugins/lp1299659 into lp:account-plugins

Proposed by Alberto Mardegan on 2014-03-31
Status: Rejected
Rejected by: Alberto Mardegan on 2014-05-15
Proposed branch: lp:~mardy/account-plugins/lp1299659
Merge into: lp:account-plugins
Diff against target: 56 lines (+12/-5)
6 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.postinst (+4/-0)
debian/account-plugin-flickr.postrm (+4/-0)
debian/account-plugin-flickr.preinst (+4/-0)
To merge this branch: bzr merge lp:~mardy/account-plugins/lp1299659
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2014-04-02
Alexandre Abreu (community) 2014-03-31 Approve on 2014-04-01
Online Accounts 2014-03-31 Pending
Review via email: mp+213415@code.launchpad.net

Commit message

Restore the ability to create flickr accounts.

This has the unfortunate side-effect of re-opening bug 1041744, by making the unsupported "login with Facebook" and "login with Google" buttons visible again, but that's a necessary evil.

Description of the change

Restore the ability to create flickr accounts.

This has the unfortunate side-effect of re-opening bug 1041744, by making the unsupported "login with Facebook" and "login with Google" buttons visible again, but that's a necessary evil.

To post a comment you must log in.
lp:~mardy/account-plugins/lp1299659 updated on 2014-04-01
135. By Alberto Mardegan on 2014-04-01

Remove obsolete config file

review: Approve
lp:~mardy/account-plugins/lp1299659 updated on 2014-04-02
136. By Alberto Mardegan on 2014-04-02

Add version to debian scripts

Alberto Mardegan (mardy) wrote :

Looks like flickr fixed the problem, so this is no longer needed.

Unmerged revisions

136. By Alberto Mardegan on 2014-04-02

Add version to debian scripts

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-02 06:56:03 +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-02 06:56:03 +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.postinst'
32--- debian/account-plugin-flickr.postinst 1970-01-01 00:00:00 +0000
33+++ debian/account-plugin-flickr.postinst 2014-04-02 06:56:03 +0000
34@@ -0,0 +1,4 @@
35+#!/bin/sh
36+set -e
37+
38+dpkg-maintscript-helper rm_conffile /etc/signon-ui/webkit-options.d/secure.flickr.com.conf 0.11+14.04.20140401 -- "$@"
39
40=== added file 'debian/account-plugin-flickr.postrm'
41--- debian/account-plugin-flickr.postrm 1970-01-01 00:00:00 +0000
42+++ debian/account-plugin-flickr.postrm 2014-04-02 06:56:03 +0000
43@@ -0,0 +1,4 @@
44+#!/bin/sh
45+set -e
46+
47+dpkg-maintscript-helper rm_conffile /etc/signon-ui/webkit-options.d/secure.flickr.com.conf 0.11+14.04.20140401 -- "$@"
48
49=== added file 'debian/account-plugin-flickr.preinst'
50--- debian/account-plugin-flickr.preinst 1970-01-01 00:00:00 +0000
51+++ debian/account-plugin-flickr.preinst 2014-04-02 06:56:03 +0000
52@@ -0,0 +1,4 @@
53+#!/bin/sh
54+set -e
55+
56+dpkg-maintscript-helper rm_conffile /etc/signon-ui/webkit-options.d/secure.flickr.com.conf 0.11+14.04.20140401 -- "$@"

Subscribers

People subscribed via source and target branches

to all changes: