Merge lp:~ken-vandine/account-plugins/inline into lp:account-plugins

[Ken VanDine]

Merge packaging inline to trunk

[David King (amigadave)]

I am not sure of the terms, but surely this exposes the API keys for the various online services, by placing them in the same branch?

[Alberto Mardegan (mardy)]

This looks fine to me, but I'm a bit concerned about the application keys, which will now live in the same branch as the source code.
(though this won't be a big problem, once we allow applications specify their own keys)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:77
http://s-jenkins:8080/job/online-accounts-account-plugins-ci/14/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/online-accounts-account-plugins-ci/./label=quantal/14/console

review: Needs Fixing (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

As discussed on Friday, looks good to me :)

Please coordinate with fginther to get it merged as he needs to make some magic in jenkins side.

review: Approve

Unmerged revisions

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2012-11-12 13:47:31 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== added directory 'debian'
=== added file 'debian/account-plugin-facebook.install'
--- debian/account-plugin-facebook.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-facebook.install	2012-11-12 13:47:31 +0000
@@ -0,0 +1,7 @@
+etc/signon-ui/webkit-options.d/www.facebook.com.conf
+usr/lib/libaccount-plugin-1.0/providers/libfacebook.so
+usr/share/accounts/services/facebook-sharing.service
+usr/share/accounts/services/facebook-microblog.service
+usr/share/accounts/services/facebook-im.service
+usr/share/accounts/providers/facebook.provider
+usr/share/icons/hicolor/32x32/apps/facebook.png

=== added file 'debian/account-plugin-flickr.install'
--- debian/account-plugin-flickr.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-flickr.install	2012-11-12 13:47:31 +0000
@@ -0,0 +1,5 @@
+etc/signon-ui/webkit-options.d/login.yahoo.com.conf
+usr/lib/libaccount-plugin-1.0/providers/libflickr.so
+usr/share/accounts/services/flickr-*.service
+usr/share/accounts/providers/flickr.provider
+usr/share/icons/hicolor/32x32/apps/flickr.png

=== added file 'debian/account-plugin-foursquare.install'
--- debian/account-plugin-foursquare.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-foursquare.install	2012-11-12 13:47:31 +0000
@@ -0,0 +1,5 @@
+etc/signon-ui/webkit-options.d/foursquare.com.conf
+usr/lib/libaccount-plugin-1.0/providers/libfoursquare.so
+usr/share/accounts/services/foursquare-microblog.service
+usr/share/accounts/providers/foursquare.provider
+usr/share/icons/hicolor/32x32/apps/foursquare.png

=== added file 'debian/account-plugin-google.install'
--- debian/account-plugin-google.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-google.install	2012-11-12 13:47:31 +0000
@@ -0,0 +1,7 @@
+etc/signon-ui/webkit-options.d/accounts.google.com.conf
+usr/lib/libaccount-plugin-1.0/providers/libgoogle.so
+usr/share/accounts/services/google-docs.service
+usr/share/accounts/services/google-im.service
+usr/share/accounts/services/picasa.service
+usr/share/accounts/providers/google.provider
+usr/share/icons/hicolor/32x32/apps/google.png

=== added file 'debian/account-plugin-icons.install'
--- debian/account-plugin-icons.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-icons.install	2012-11-12 13:47:31 +0000
@@ -0,0 +1,14 @@
+usr/share/icons/hicolor/32x32/apps/aim.png
+usr/share/icons/hicolor/32x32/apps/gadugadu.png
+usr/share/icons/hicolor/32x32/apps/groupwise.png
+usr/share/icons/hicolor/32x32/apps/icq.png
+usr/share/icons/hicolor/32x32/apps/irc.png
+usr/share/icons/hicolor/32x32/apps/jabber.png
+usr/share/icons/hicolor/32x32/apps/msn.png
+usr/share/icons/hicolor/32x32/apps/mxit.png
+usr/share/icons/hicolor/32x32/apps/myspace.png
+usr/share/icons/hicolor/32x32/apps/people-nearby.png
+usr/share/icons/hicolor/32x32/apps/sametime.png
+usr/share/icons/hicolor/32x32/apps/sip.png
+usr/share/icons/hicolor/32x32/apps/yahoo.png
+usr/share/icons/hicolor/32x32/apps/zephyr.png

=== added file 'debian/account-plugin-identica.install'
--- debian/account-plugin-identica.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-identica.install	2012-11-12 13:47:31 +0000
@@ -0,0 +1,5 @@
+etc/signon-ui/webkit-options.d/identi.ca.conf
+usr/lib/libaccount-plugin-1.0/providers/libidentica.so
+usr/share/accounts/services/identica-microblog.service
+usr/share/accounts/providers/identica.provider
+usr/share/icons/hicolor/32x32/apps/identica.png

=== added file 'debian/account-plugin-sina.install'
--- debian/account-plugin-sina.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-sina.install	2012-11-12 13:47:31 +0000
@@ -0,0 +1,4 @@
+etc/signon-ui/webkit-options.d/api.t.sina.com.cn.conf
+usr/lib/libaccount-plugin-1.0/providers/libsina.so
+usr/share/accounts/services/sina-microblog.service
+usr/share/accounts/providers/sina.provider

=== added file 'debian/account-plugin-sohu.install'
--- debian/account-plugin-sohu.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-sohu.install	2012-11-12 13:47:31 +0000
@@ -0,0 +1,4 @@
+etc/signon-ui/webkit-options.d/api.t.sohu.com.conf
+usr/lib/libaccount-plugin-1.0/providers/libsohu.so
+usr/share/accounts/services/sohu-microblog.service
+usr/share/accounts/providers/sohu.provider

=== added file 'debian/account-plugin-tools.install'
--- debian/account-plugin-tools.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-tools.install	2012-11-12 13:47:31 +0000
@@ -0,0 +1,2 @@
+usr/share/account-plugins/tools
+usr/bin

=== added file 'debian/account-plugin-twitter.install'
--- debian/account-plugin-twitter.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-twitter.install	2012-11-12 13:47:31 +0000
@@ -0,0 +1,5 @@
+etc/signon-ui/webkit-options.d/api.twitter.com.conf
+usr/lib/libaccount-plugin-1.0/providers/libtwitter.so
+usr/share/accounts/services/twitter-microblog.service
+usr/share/accounts/providers/twitter.provider
+usr/share/icons/hicolor/32x32/apps/twitter.png

=== added file 'debian/account-plugin-windows-live.install'
--- debian/account-plugin-windows-live.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-windows-live.install	2012-11-12 13:47:31 +0000
@@ -0,0 +1,5 @@
+etc/signon-ui/webkit-options.d/login.live.com.conf
+usr/lib/libaccount-plugin-1.0/providers/libwindows-live.so
+usr/share/accounts/services/wlm.service
+usr/share/accounts/providers/windows-live.provider
+usr/share/icons/hicolor/32x32/apps/live.png

=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2012-11-12 13:47:31 +0000
@@ -0,0 +1,201 @@
+account-plugins (0.9-0ubuntu1) raring; urgency=low
+
+  * New upstream release.
+    - Add COPYING, using GNU GPL version 2 (LP: #1062194)
+    - Use intltool for internationalization support (LP: #1061433)
+    - Request mobile version of identi.ca (LP: #1051596)
+  * -debian/patches/lp_1064293.patch, upstream
+
+ -- Ken VanDine <[e-mail]>  Fri, 09 Nov 2012 11:14:46 -0500
+
+account-plugins (0.8-0ubuntu2) quantal; urgency=low
+
+  * debian/patches/lp_1064293.patch
+    - Do not reveal Google secret API key. (LP: #1064293)
+  * debian/rules
+    - Update API keys for twitter, windows live, foursquare, google,
+      and flickr (LP: #1064293)
+
+ -- Ken VanDine <[e-mail]>  Thu, 11 Oct 2012 16:40:21 -0400
+
+account-plugins (0.8-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+    - include the sip icon (LP: #1040091)
+
+ -- Ken VanDine <[e-mail]>  Wed, 19 Sep 2012 15:43:55 -0400
+
+account-plugins (0.7-0ubuntu3) quantal; urgency=low
+
+  * debian/account-plugin-icons.install
+    - removed missing icon
+
+ -- Ken VanDine <[e-mail]>  Fri, 14 Sep 2012 16:59:24 -0400
+
+account-plugins (0.7-0ubuntu2) quantal; urgency=low
+
+  * debian/control
+    - removed unneeded depends for python-gobject
+
+ -- Ken VanDine <[e-mail]>  Fri, 14 Sep 2012 11:45:25 -0400
+
+account-plugins (0.7-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+    - Updates to work with signon-ui >= 0.7 which requires https (LP: #1039084)
+  * -debian/patches/py3.patch
+    - merged upstream
+
+ -- Ken VanDine <[e-mail]>  Fri, 07 Sep 2012 09:34:51 -0400
+
+account-plugins (0.5-0ubuntu3) quantal; urgency=low
+
+  * debian/patches/lp_1037169.patch
+    - Use the secure end point for flickr (LP: #1037169)
+
+ -- Ken VanDine <[e-mail]>  Wed, 15 Aug 2012 14:49:05 -0400
+
+account-plugins (0.5-0ubuntu2) quantal; urgency=low
+
+  * debian/watch
+    - added
+  * debian/patches/py3.patch
+    - ported account-console to python3
+  * debian/control, debian/rules
+    - python3
+  * debian/compat
+    - debhelper 9
+
+ -- Ken VanDine <[e-mail]>  Mon, 06 Aug 2012 16:48:13 -0400
+
+account-plugins (0.5-0ubuntu1) quantal; urgency=low
+
+  * New upstream release
+
+ -- Ken VanDine <[e-mail]>  Thu, 02 Aug 2012 14:49:44 -0400
+
+account-plugins (0.4+r53-0quantal2) quantal; urgency=low
+
+  * debian/account-plugin-icons.install, debian/control
+    - install extra icons in a separate package
+
+ -- Ken VanDine <[e-mail]>  Tue, 24 Jul 2012 23:05:33 -0400
+
+account-plugins (0.4+r53-0quantal1) quantal; urgency=low
+
+  * Merged from trunk rev 53
+    - Adds windows live support
+
+ -- Ken VanDine <[e-mail]>  Tue, 24 Jul 2012 22:45:27 -0400
+
+account-plugins (0.4+r51-0quantal2) quantal; urgency=low
+
+  * debian/control
+    - build depend on libsignon-glib-dev >= 1.2+bzr127-0quantal2
+
+
+ -- Ken VanDine <[e-mail]>  Fri, 20 Jul 2012 14:22:25 -0400
+
+account-plugins (0.4+r51-0quantal1) quantal; urgency=low
+
+  * New snapshot tagged 0.4-bzr51
+
+ -- Ken VanDine <[e-mail]>  Fri, 20 Jul 2012 13:19:35 -0400
+
+account-plugins (0.4+r45-0quantal1) quantal; urgency=low
+
+  * rebuild for quantal
+
+ -- Ken VanDine <[e-mail]>  Mon, 16 Jul 2012 10:28:28 -0400
+
+account-plugins (0.4+r45-0precise1) precise; urgency=low
+
+  * New snapshot tagged 0.4-bzr45
+
+ -- Ken VanDine <[e-mail]>  Thu, 05 Jul 2012 10:33:10 -0400
+
+account-plugins (0.3+r43-0precise1) precise; urgency=low
+
+  * Added account-plugin-identica and account-plugin-foursquare
+
+ -- Ken VanDine <[e-mail]>  Tue, 26 Jun 2012 13:25:23 -0400
+
+account-plugins (0.3+r40-0precise1) precise; urgency=low
+
+  * New snapshot from trunk revision 40
+  * debian/rules
+    - Added configure args for twitter consumer key/secret
+
+ -- Ken VanDine <[e-mail]>  Tue, 26 Jun 2012 11:51:30 -0400
+
+account-plugins (0.3+r35-0precise1) precise; urgency=low
+
+  * New snapshot tagged 0.3-bzr35
+
+ -- David King <[e-mail]>  Wed, 20 Jun 2012 12:12:10 +0100
+
+account-plugins (0.3+r34-0precise3) precise; urgency=low
+
+  * data/services/*-microblog.service
+    - Added gwibber settings
+
+ -- Ken VanDine <[e-mail]>  Tue, 19 Jun 2012 22:36:16 -0400
+
+account-plugins (0.3+r34-0precise2) precise; urgency=low
+
+  * no change rebuild
+
+ -- Ken VanDine <[e-mail]>  Fri, 15 Jun 2012 16:43:48 -0400
+
+account-plugins (0.3+r34-0precise1) precise; urgency=low
+
+  * New snapshot tagged 0.3-bzr34
+  * debian/control
+    - bumped the depends for signon-plugin-oauth2 to >= 0.10+bzr39
+    - bumped build depends for libaccount-plugin-1.0-dev to >= 0.0.6+r73
+    - added new packages account-plugin-twitter and account-plugin-flickr
+
+ -- Ken VanDine <[e-mail]>  Thu, 14 Jun 2012 15:38:46 -0400
+
+account-plugins (0.2+r29-0precise1) precise; urgency=low
+
+  * New snapshot tagged 0.2-bzr29
+
+ -- Ken VanDine <[e-mail]>  Fri, 01 Jun 2012 14:44:31 -0400
+
+account-plugins (0.1+r27-0precise1) precise; urgency=low
+
+  [ David King ]
+  * Merged trunk r27
+
+  [ Ken VanDine ]
+  * debian/rules
+    - Fix removal of the .la files, path changed
+  * debian/control
+    - Build depend on libaccount-plugin-1.0-dev (>= 0.0.2+r56)
+
+ -- Ken VanDine <[e-mail]>  Thu, 17 May 2012 14:09:09 -0400
+
+account-plugins (0.1+r22-0precise1) precise; urgency=low
+
+  * Merged trunk r22
+
+ -- Ken VanDine <[e-mail]>  Fri, 23 Mar 2012 09:47:27 -0400
+
+account-plugins (0.1+r21-0precise1) precise; urgency=low
+
+  * New snapshot tagged 0.1-bzr21
+
+ -- Ken VanDine <[e-mail]>  Thu, 22 Mar 2012 12:24:09 -0400
+
+account-plugins (0.0.1+r20-0precise1) precise; urgency=low
+
+  * New snapshot
+
+ -- Ken VanDine <[e-mail]>  Fri, 16 Mar 2012 14:22:37 -0400
+
+account-plugins (0.0.1+r10-0precise1) precise; urgency=low
+
+  * Initial package
+
+ -- Alberto Mardegan <[e-mail]>  Tue, 10 Jan 2012 12:19:29 +0100

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2012-11-12 13:47:31 +0000
@@ -0,0 +1,1 @@
+9

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2012-11-12 13:47:31 +0000
@@ -0,0 +1,108 @@
+Source: account-plugins
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team <[e-mail]>
+Build-Depends: debhelper (>= 9),
+               autotools-dev,
+               gobject-introspection,
+               python3,
+               pkg-config,
+               libaccounts-glib-dev,
+               libsignon-glib-dev,
+               libaccount-plugin-1.0-dev,
+               valac-0.16,
+               gnome-common,
+               dh-autoreconf,
+Standards-Version: 3.9.3
+Homepage: https://launchpad.net/online-accounts-account-plugins
+# If you aren't a member of ~online-accounts but need to upload packaging changes,
+# just go ahead.  ~online-accounts will notice and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/~online-accounts/online-accounts-account-plugins/trunk
+
+Package: account-plugin-google
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+        signon-keyring-extension,
+        signon-plugin-oauth2
+Description: GNOME Control Center account plugin for single signon
+ GNOME Control Center account plugins for single signon
+
+Package: account-plugin-facebook
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+        signon-keyring-extension,
+        signon-plugin-oauth2
+Description: GNOME Control Center account plugin for single signon - facebook
+ GNOME Control Center account plugins for single signon
+
+Package: account-plugin-twitter
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+        signon-keyring-extension,
+        signon-plugin-oauth2
+Description: GNOME Control Center account plugin for single signon - twitter
+ GNOME Control Center account plugins for single signon
+
+Package: account-plugin-flickr
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+        signon-keyring-extension,
+        signon-plugin-oauth2
+Description: GNOME Control Center account plugin for single signon - flickr
+ GNOME Control Center account plugins for single signon
+
+Package: account-plugin-identica
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+        signon-keyring-extension,
+        signon-plugin-oauth2
+Description: GNOME Control Center account plugin for single signon - identica
+ GNOME Control Center account plugins for single signon
+
+Package: account-plugin-foursquare
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+        signon-keyring-extension,
+        signon-plugin-oauth2
+Description: GNOME Control Center account plugin for single signon - foursquare
+ GNOME Control Center account plugins for single signon
+
+Package: account-plugin-windows-live
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+        signon-keyring-extension,
+        signon-plugin-oauth2
+Description: GNOME Control Center account plugin for single signon - windows live
+ GNOME Control Center account plugins for single signon
+
+Package: account-plugin-sohu
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+        signon-keyring-extension,
+        signon-plugin-oauth2
+Description: GNOME Control Center account plugin for single signon - sohu
+ GNOME Control Center account plugins for single signon
+
+Package: account-plugin-sina
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+        signon-keyring-extension,
+        signon-plugin-oauth2
+Description: GNOME Control Center account plugin for single signon - sina
+ GNOME Control Center account plugins for single signon
+
+Package: account-plugin-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+         ${python3:Depends},
+         gir1.2-glib-2.0,
+         signon-keyring-extension,
+         signon-plugin-oauth2
+Description: GNOME Control Center account plugins for single signon - tools
+ GNOME Control Center account plugins for single signon
+
+Package: account-plugin-icons
+Architecture: all
+Depends: ${misc:Depends},
+Description: GNOME Control Center account plugin for single signon - icons
+ GNOME Control Center account plugins for single signon

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2012-11-12 13:47:31 +0000
@@ -0,0 +1,20 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: online-accounts-account-plugins
+Upstream-Contact: Alberto Mardegan <[e-mail]>
+Source: https://launchpad.net/online-accounts-account-plugins
+
+Files: *
+Copyright: 2012 Canonical Ltd.
+License: GPL-2+
+
+Files: src/windows-live.vala
+Copyright: 2012 Collabora Ltd.
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2012 Ken VanDine <[e-mail]>
+License: GPL-2+
+
+License: GPL-2+
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2012-11-12 13:47:31 +0000
@@ -0,0 +1,25 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+override_dh_autoreconf:
+	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
+
+override_dh_auto_configure:
+	dh_auto_configure -- --with-twitter-consumer-key="NGOB5S7sICsj6epjh0PhAw" \
+		--with-twitter-consumer-secret="rbUEJCBEokMnGZd8bubd0QL2cSmoCjJeyiSJpnx3OM0" \
+		--with-windows-live-client-id="00000000400D5635" \
+		--with-foursquare-client-id="1I2UNJXPHNDZT3OPZOOA5LCPIUEUJFMKRXSF42UFCN1KXKTK" \
+		--with-google-client-id="759250720802-4sii0me9963n9fdqdmi7cepn6ub8luoh.apps.googleusercontent.com" \
+		--with-flickr-consumer-key="d87224f0b467093b2a87fd788d950e27" \
+		--with-flickr-consumer-secret="4c7e48102c226509"
+
+override_dh_install:
+	rm -f debian/*/usr/lib/*/*/*.la
+	mkdir -p debian/tmp/usr/share/account-plugins/tools
+	dh_install --fail-missing
+
+%:
+	dh $@ --with python3,autoreconf