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

Proposed by Alberto Mardegan
Status: Merged
Approved by: David King
Approved revision: 80
Merged at revision: 80
Proposed branch: lp:~mardy/account-plugins/lp1041744
Merge into: lp:account-plugins
Diff against target: 66 lines (+21/-0)
3 files modified
.bzrignore (+19/-0)
Makefile.am (+1/-0)
debian/account-plugin-flickr.install (+1/-0)
To merge this branch: bzr merge lp:~mardy/account-plugins/lp1041744
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
David King (community) Approve
Review via email: mp+135848@code.launchpad.net

Description of the change

Force mobile version of Yahoo Flickr login

The webkit-options file for signon-ui was not installed.

To post a comment you must log in.
Revision history for this message
David King (amigadave) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2012-10-05 11:05:23 +0000
3+++ .bzrignore 2012-11-23 10:05:23 +0000
4@@ -1,7 +1,10 @@
5+*.debhelper
6 *.la
7 *.lo
8+*.log
9 *.provider
10 *.service
11+*.substvars
12 *.stamp
13 INSTALL
14 Makefile
15@@ -16,6 +19,21 @@
16 config.sub
17 configure
18 compile
19+/debian/account-plugin-facebook/
20+/debian/account-plugin-flickr/
21+/debian/account-plugin-foursquare/
22+/debian/account-plugin-google/
23+/debian/account-plugin-icons/
24+/debian/account-plugin-identica/
25+/debian/account-plugin-sina/
26+/debian/account-plugin-sohu/
27+/debian/account-plugin-tools/
28+/debian/account-plugin-twitter/
29+/debian/account-plugin-windows-live/
30+/debian/autoreconf.after
31+/debian/autoreconf.before
32+/debian/files
33+/debian/tmp/
34 depcomp
35 install-sh
36 libtool
37@@ -24,6 +42,7 @@
38 missing
39 /po/Makefile.in.in
40 /po/POTFILES
41+/po/account-plugins.pot
42 /po/stamp-it
43 stamp-h1
44 .deps
45
46=== modified file 'Makefile.am'
47--- Makefile.am 2012-11-13 09:00:39 +0000
48+++ Makefile.am 2012-11-23 10:05:23 +0000
49@@ -174,6 +174,7 @@
50 data/webkit-options/identi.ca.conf \
51 data/webkit-options/login.live.com.conf \
52 data/webkit-options/login.yahoo.com.conf \
53+ data/webkit-options/secure.flickr.com.conf \
54 data/webkit-options/www.facebook.com.conf
55
56 dist_bin_SCRIPTS = \
57
58=== modified file 'debian/account-plugin-flickr.install'
59--- debian/account-plugin-flickr.install 2012-11-09 16:15:25 +0000
60+++ debian/account-plugin-flickr.install 2012-11-23 10:05:23 +0000
61@@ -1,4 +1,5 @@
62 etc/signon-ui/webkit-options.d/login.yahoo.com.conf
63+etc/signon-ui/webkit-options.d/secure.flickr.com.conf
64 usr/lib/libaccount-plugin-1.0/providers/libflickr.so
65 usr/share/accounts/services/flickr-*.service
66 usr/share/accounts/providers/flickr.provider

Subscribers

People subscribed via source and target branches