Online Accounts: Account plugins

Merge lp:~mardy/account-plugins/gpl2 into lp:account-plugins/12.10

  1. gpl2
  2. Merge into 12.10
Proposed by Alberto Mardegan
Status: Merged
Merged at revision: 75
Proposed branch: lp:~mardy/account-plugins/gpl2
Merge into: lp:account-plugins/12.10
Diff against target: 159 lines (+20/-30)
10 files modified
src/config.vapi (+2/-3)
src/facebook.vala (+2/-3)
src/flickr.vala (+2/-3)
src/foursquare.vala (+2/-3)
src/google.vala (+2/-3)
src/identica.vala (+2/-3)
src/sina.vala (+2/-3)
src/sohu.vala (+2/-3)
src/twitter.vala (+2/-3)
src/windows-live.vala (+2/-3)
To merge this branch: bzr merge lp:~mardy/account-plugins/gpl2
Reviewer Review Type Date Requested Status
David King (community) Approve
Xavier Claessens Pending
Review via email: mp+133898@code.launchpad.net

Description of the change

Set licence to GPL v2.

To post a comment you must log in.
Revision history for this message
Alberto Mardegan (mardy) wrote :

After approval, I'll merge to trunk as well.

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

Looks fine.

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

Please also update the README, as it currently mentions the "or later".

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

The 12.10 branch has an empty README file. I created another MR for the current trunk:

https://code.launchpad.net/~mardy/online-accounts-account-plugins/gpl2-trunk/+merge/133932

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/config.vapi'
--- src/config.vapi 2012-07-19 17:18:08 +0000
+++ src/config.vapi 2012-11-12 12:01:29 +0000
@@ -2,9 +2,8 @@
2 * Copyright (C) 2012 Canonical, Inc2 * Copyright (C) 2012 Canonical, Inc
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License version 2 as
6 * the Free Software Foundation; either version 2 of the License, or6 * published by the Free Software Foundation.
7 * (at your option) any later version.
8 *7 *
9 * This program is distributed in the hope that it will be useful,8 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1110
=== modified file 'src/facebook.vala'
--- src/facebook.vala 2012-07-25 11:08:55 +0000
+++ src/facebook.vala 2012-11-12 12:01:29 +0000
@@ -2,9 +2,8 @@
2 * Copyright (C) 2012 Canonical, Inc2 * Copyright (C) 2012 Canonical, Inc
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License version 2 as
6 * the Free Software Foundation; either version 2 of the License, or6 * published by the Free Software Foundation.
7 * (at your option) any later version.
8 *7 *
9 * This program is distributed in the hope that it will be useful,8 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1110
=== modified file 'src/flickr.vala'
--- src/flickr.vala 2012-08-31 09:52:33 +0000
+++ src/flickr.vala 2012-11-12 12:01:29 +0000
@@ -2,9 +2,8 @@
2 * Copyright (C) 2012 Canonical, Inc2 * Copyright (C) 2012 Canonical, Inc
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License version 2 as
6 * the Free Software Foundation; either version 2 of the License, or6 * published by the Free Software Foundation.
7 * (at your option) any later version.
8 *7 *
9 * This program is distributed in the hope that it will be useful,8 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1110
=== modified file 'src/foursquare.vala'
--- src/foursquare.vala 2012-06-26 10:05:06 +0000
+++ src/foursquare.vala 2012-11-12 12:01:29 +0000
@@ -2,9 +2,8 @@
2 * Copyright (C) 2012 Canonical, Inc2 * Copyright (C) 2012 Canonical, Inc
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License version 2 as
6 * the Free Software Foundation; either version 2 of the License, or6 * published by the Free Software Foundation.
7 * (at your option) any later version.
8 *7 *
9 * This program is distributed in the hope that it will be useful,8 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1110
=== modified file 'src/google.vala'
--- src/google.vala 2012-11-09 11:11:43 +0000
+++ src/google.vala 2012-11-12 12:01:29 +0000
@@ -2,9 +2,8 @@
2 * Copyright (C) 2012 Canonical, Inc2 * Copyright (C) 2012 Canonical, Inc
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License version 2 as
6 * the Free Software Foundation; either version 2 of the License, or6 * published by the Free Software Foundation.
7 * (at your option) any later version.
8 *7 *
9 * This program is distributed in the hope that it will be useful,8 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1110
=== modified file 'src/identica.vala'
--- src/identica.vala 2012-06-26 10:15:24 +0000
+++ src/identica.vala 2012-11-12 12:01:29 +0000
@@ -2,9 +2,8 @@
2 * Copyright (C) 2012 Canonical, Inc2 * Copyright (C) 2012 Canonical, Inc
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License version 2 as
6 * the Free Software Foundation; either version 2 of the License, or6 * published by the Free Software Foundation.
7 * (at your option) any later version.
8 *7 *
9 * This program is distributed in the hope that it will be useful,8 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1110
=== modified file 'src/sina.vala'
--- src/sina.vala 2012-08-31 10:07:10 +0000
+++ src/sina.vala 2012-11-12 12:01:29 +0000
@@ -2,9 +2,8 @@
2 * Copyright (C) 2012 Canonical, Inc2 * Copyright (C) 2012 Canonical, Inc
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License version 2 as
6 * the Free Software Foundation; either version 2 of the License, or6 * published by the Free Software Foundation.
7 * (at your option) any later version.
8 *7 *
9 * This program is distributed in the hope that it will be useful,8 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1110
=== modified file 'src/sohu.vala'
--- src/sohu.vala 2012-08-31 10:07:10 +0000
+++ src/sohu.vala 2012-11-12 12:01:29 +0000
@@ -2,9 +2,8 @@
2 * Copyright (C) 2012 Canonical, Inc2 * Copyright (C) 2012 Canonical, Inc
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License version 2 as
6 * the Free Software Foundation; either version 2 of the License, or6 * published by the Free Software Foundation.
7 * (at your option) any later version.
8 *7 *
9 * This program is distributed in the hope that it will be useful,8 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1110
=== modified file 'src/twitter.vala'
--- src/twitter.vala 2012-08-31 09:52:33 +0000
+++ src/twitter.vala 2012-11-12 12:01:29 +0000
@@ -2,9 +2,8 @@
2 * Copyright (C) 2012 Canonical, Inc2 * Copyright (C) 2012 Canonical, Inc
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License version 2 as
6 * the Free Software Foundation; either version 2 of the License, or6 * published by the Free Software Foundation.
7 * (at your option) any later version.
8 *7 *
9 * This program is distributed in the hope that it will be useful,8 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1110
=== modified file 'src/windows-live.vala'
--- src/windows-live.vala 2012-07-20 07:27:21 +0000
+++ src/windows-live.vala 2012-11-12 12:01:29 +0000
@@ -2,9 +2,8 @@
2 * Copyright (C) 2012 Collabora Ltd.2 * Copyright (C) 2012 Collabora Ltd.
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License version 2 as
6 * the Free Software Foundation; either version 2 of the License, or6 * published by the Free Software Foundation.
7 * (at your option) any later version.
8 *7 *
9 * This program is distributed in the hope that it will be useful,8 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of9 * but WITHOUT ANY WARRANTY; without even the implied warranty of

Subscribers

People subscribed via source and target branches