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

[Alberto Mardegan]

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.

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.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:134
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-plugins-ci/23/rebuild

review: Approve (continuous-integration)

[lp:~mardy/account-plugins/lp1299659]

135. By Alberto Mardegan on 2014-04-01

Remove obsolete config file

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:135
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/6/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-plugins-ci/24/rebuild

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

[lp:~mardy/account-plugins/lp1299659]

136. By Alberto Mardegan on 2014-04-02

Add version to debian scripts

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:136
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/7/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-plugins-ci/25/rebuild

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

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

=== modified file 'Makefile.am'
--- Makefile.am	2013-08-01 14:34:21 +0000
+++ Makefile.am	2014-04-02 06:56:03 +0000
@@ -112,7 +112,6 @@
 	data/webkit-options/identi.ca.conf \
 	data/webkit-options/login.live.com.conf \
 	data/webkit-options/login.yahoo.com.conf \
-	data/webkit-options/secure.flickr.com.conf \
 	data/webkit-options/www.facebook.com.conf \
 	data/webkit-options/www.linkedin.com.conf
 

=== removed file 'data/webkit-options/secure.flickr.com.conf'
--- data/webkit-options/secure.flickr.com.conf	2012-08-31 11:57:21 +0000
+++ data/webkit-options/secure.flickr.com.conf	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-# Force mobile version, not to show google and facebook login options.
-# See also https://bugs.launchpad.net/bugs/1041744
-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

=== modified file 'debian/account-plugin-flickr.install'
--- debian/account-plugin-flickr.install	2013-06-07 11:56:25 +0000
+++ debian/account-plugin-flickr.install	2014-04-02 06:56:03 +0000
@@ -1,5 +1,4 @@
 etc/signon-ui/webkit-options.d/login.yahoo.com.conf
-etc/signon-ui/webkit-options.d/secure.flickr.com.conf
 usr/share/accounts/services/flickr-*.service
 usr/share/accounts/providers/flickr.provider
 usr/share/accounts/qml-plugins/flickr/Main.qml

=== added file 'debian/account-plugin-flickr.postinst'
--- debian/account-plugin-flickr.postinst	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-flickr.postinst	2014-04-02 06:56:03 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+
+dpkg-maintscript-helper rm_conffile /etc/signon-ui/webkit-options.d/secure.flickr.com.conf 0.11+14.04.20140401 -- "$@"

=== added file 'debian/account-plugin-flickr.postrm'
--- debian/account-plugin-flickr.postrm	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-flickr.postrm	2014-04-02 06:56:03 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+
+dpkg-maintscript-helper rm_conffile /etc/signon-ui/webkit-options.d/secure.flickr.com.conf 0.11+14.04.20140401 -- "$@"

=== added file 'debian/account-plugin-flickr.preinst'
--- debian/account-plugin-flickr.preinst	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-flickr.preinst	2014-04-02 06:56:03 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+
+dpkg-maintscript-helper rm_conffile /etc/signon-ui/webkit-options.d/secure.flickr.com.conf 0.11+14.04.20140401 -- "$@"