Merge lp://staging/~mardy/account-plugins/default-plugin into lp://staging/account-plugins

Proposed by Alberto Mardegan
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 100
Merged at revision: 93
Proposed branch: lp://staging/~mardy/account-plugins/default-plugin
Merge into: lp://staging/account-plugins
Diff against target: 1096 lines (+131/-475)
33 files modified
.bzrignore (+3/-8)
Makefile.am (+18/-68)
configure.ac (+24/-15)
data/providers/facebook.provider.in.in (+2/-0)
data/providers/flickr.provider.in.in (+3/-0)
data/providers/foursquare.provider.in.in (+2/-0)
data/providers/google.provider.in.in (+2/-0)
data/providers/identica.provider.in.in (+3/-0)
data/providers/sina.provider.in.in (+3/-0)
data/providers/sohu.provider.in.in (+3/-0)
data/providers/twitter.provider.in.in (+3/-0)
data/providers/windows-live.provider.in.in (+2/-0)
debian/account-plugin-facebook.install (+0/-1)
debian/account-plugin-flickr.install (+0/-1)
debian/account-plugin-foursquare.install (+0/-1)
debian/account-plugin-generic-oauth.install (+1/-0)
debian/account-plugin-identica.install (+0/-1)
debian/account-plugin-sina.install (+0/-1)
debian/account-plugin-sohu.install (+0/-1)
debian/account-plugin-twitter.install (+0/-1)
debian/account-plugin-windows-live.install (+0/-1)
debian/control (+24/-24)
po/POTFILES.in (+1/-1)
src/facebook.vala (+0/-38)
src/flickr.vala (+0/-41)
src/foursquare.vala (+0/-39)
src/generic-oauth.vala (+31/-0)
src/google.vala (+6/-29)
src/identica.vala (+0/-42)
src/sina.vala (+0/-41)
src/sohu.vala (+0/-41)
src/twitter.vala (+0/-41)
src/windows-live.vala (+0/-39)
To merge this branch: bzr merge lp://staging/~mardy/account-plugins/default-plugin
Reviewer Review Type Date Requested Status
David King (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+154008@code.staging.launchpad.net

Commit message

Add a generic OAuth plugin

Remove most of the binary plugins.

Description of the change

Add a generic OAuth plugin

Remove most of the binary plugins.

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

You are missing src/generic-oauth.vala :-)

review: Needs Fixing
98. By Alberto Mardegan

Add missing files, update .bzrignore

Revision history for this message
Alberto Mardegan (mardy) wrote :

Ops, small detail :-)

Revision history for this message
David King (amigadave) wrote :

make distcheck fails:

make[2]: Entering directory `/home/david/checkout/account-plugins/default-plugin/account-plugins-0.9/_build/po'
INTLTOOL_EXTRACT="/usr/bin/intltool-extract" XGETTEXT="/usr/bin/xgettext" srcdir=../../po /usr/bin/intltool-update --gettext-package account-plugins --pot
can't open ../../po/../data/providers/google.provider.in: No such file or directory at /usr/bin/intltool-extract line 212.
/usr/bin/xgettext: error while opening "../data/providers/google.provider.in.h" for reading: No such file or directory
ERROR: xgettext failed to generate PO template file. Please consult
       error message above if there is any.
make[2]: *** [account-plugins.pot] Error 1
make[2]: Leaving directory `/home/david/checkout/account-plugins/default-plugin/account-plugins-0.9/_build/po'
make[1]: *** [check-recursive] Error 1
make[1]: Leaving directory `/home/david/checkout/account-plugins/default-plugin/account-plugins-0.9/_build'
make: *** [distcheck] Error 1

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
99. By Alberto Mardegan

Fix make distcheck

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
David King (amigadave) wrote :

Looking better.

153 dist_noinst_DATA = \
154 - $(providers_in_files) \
155 + $(providers_in_in_files) \

You do not need to distribute the .in.in files, as the configure substitution already pulls them into the distributed files.

100. By Alberto Mardegan

Remove unnecessary mention of .in.in files

These files are required and handled by configure.ac.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
David King (amigadave) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches