=== modified file 'Makefile.am'
--- Makefile.am	2013-08-01 14:34:21 +0000
+++ Makefile.am	2014-04-14 10:59:16 +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-14 10:59:16 +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.maintscript'
--- debian/account-plugin-flickr.maintscript	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-flickr.maintscript	2014-04-14 10:59:16 +0000
@@ -0,0 +1,1 @@
+rm_conffile /etc/signon-ui/webkit-options.d/secure.flickr.com.conf 0.11+14.04.20140408

=== modified file 'debian/rules'
--- debian/rules	2013-06-12 05:49:46 +0000
+++ debian/rules	2014-04-14 10:59:16 +0000
@@ -12,6 +12,7 @@
 		--with-twitter-consumer-key="NGOB5S7sICsj6epjh0PhAw" \
 		--with-twitter-consumer-secret="rbUEJCBEokMnGZd8bubd0QL2cSmoCjJeyiSJpnx3OM0" \
 		--with-windows-live-client-id="00000000400D5635" \
+		--with-facebook-client-id="271112146382618" \
 		--with-foursquare-client-id="1I2UNJXPHNDZT3OPZOOA5LCPIUEUJFMKRXSF42UFCN1KXKTK" \
 		--with-google-client-id="759250720802-4sii0me9963n9fdqdmi7cepn6ub8luoh.apps.googleusercontent.com" \
 		--with-google-client-secret="juFngKUcuhB7IRQqHtSLavqJ" \