Merge lp:~mardy/account-plugins/gpl2 into lp:account-plugins/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
1=== modified file 'src/config.vapi'
2--- src/config.vapi 2012-07-19 17:18:08 +0000
3+++ src/config.vapi 2012-11-12 12:01:29 +0000
4@@ -2,9 +2,8 @@
5 * Copyright (C) 2012 Canonical, Inc
6 *
7 * This program is free software; you can redistribute it and/or modify
8- * it under the terms of the GNU General Public License as published by
9- * the Free Software Foundation; either version 2 of the License, or
10- * (at your option) any later version.
11+ * it under the terms of the GNU General Public License version 2 as
12+ * published by the Free Software Foundation.
13 *
14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16
17=== modified file 'src/facebook.vala'
18--- src/facebook.vala 2012-07-25 11:08:55 +0000
19+++ src/facebook.vala 2012-11-12 12:01:29 +0000
20@@ -2,9 +2,8 @@
21 * Copyright (C) 2012 Canonical, Inc
22 *
23 * This program is free software; you can redistribute it and/or modify
24- * it under the terms of the GNU General Public License as published by
25- * the Free Software Foundation; either version 2 of the License, or
26- * (at your option) any later version.
27+ * it under the terms of the GNU General Public License version 2 as
28+ * published by the Free Software Foundation.
29 *
30 * This program is distributed in the hope that it will be useful,
31 * but WITHOUT ANY WARRANTY; without even the implied warranty of
32
33=== modified file 'src/flickr.vala'
34--- src/flickr.vala 2012-08-31 09:52:33 +0000
35+++ src/flickr.vala 2012-11-12 12:01:29 +0000
36@@ -2,9 +2,8 @@
37 * Copyright (C) 2012 Canonical, Inc
38 *
39 * This program is free software; you can redistribute it and/or modify
40- * it under the terms of the GNU General Public License as published by
41- * the Free Software Foundation; either version 2 of the License, or
42- * (at your option) any later version.
43+ * it under the terms of the GNU General Public License version 2 as
44+ * published by the Free Software Foundation.
45 *
46 * This program is distributed in the hope that it will be useful,
47 * but WITHOUT ANY WARRANTY; without even the implied warranty of
48
49=== modified file 'src/foursquare.vala'
50--- src/foursquare.vala 2012-06-26 10:05:06 +0000
51+++ src/foursquare.vala 2012-11-12 12:01:29 +0000
52@@ -2,9 +2,8 @@
53 * Copyright (C) 2012 Canonical, Inc
54 *
55 * This program is free software; you can redistribute it and/or modify
56- * it under the terms of the GNU General Public License as published by
57- * the Free Software Foundation; either version 2 of the License, or
58- * (at your option) any later version.
59+ * it under the terms of the GNU General Public License version 2 as
60+ * published by the Free Software Foundation.
61 *
62 * This program is distributed in the hope that it will be useful,
63 * but WITHOUT ANY WARRANTY; without even the implied warranty of
64
65=== modified file 'src/google.vala'
66--- src/google.vala 2012-11-09 11:11:43 +0000
67+++ src/google.vala 2012-11-12 12:01:29 +0000
68@@ -2,9 +2,8 @@
69 * Copyright (C) 2012 Canonical, Inc
70 *
71 * This program is free software; you can redistribute it and/or modify
72- * it under the terms of the GNU General Public License as published by
73- * the Free Software Foundation; either version 2 of the License, or
74- * (at your option) any later version.
75+ * it under the terms of the GNU General Public License version 2 as
76+ * published by the Free Software Foundation.
77 *
78 * This program is distributed in the hope that it will be useful,
79 * but WITHOUT ANY WARRANTY; without even the implied warranty of
80
81=== modified file 'src/identica.vala'
82--- src/identica.vala 2012-06-26 10:15:24 +0000
83+++ src/identica.vala 2012-11-12 12:01:29 +0000
84@@ -2,9 +2,8 @@
85 * Copyright (C) 2012 Canonical, Inc
86 *
87 * This program is free software; you can redistribute it and/or modify
88- * it under the terms of the GNU General Public License as published by
89- * the Free Software Foundation; either version 2 of the License, or
90- * (at your option) any later version.
91+ * it under the terms of the GNU General Public License version 2 as
92+ * published by the Free Software Foundation.
93 *
94 * This program is distributed in the hope that it will be useful,
95 * but WITHOUT ANY WARRANTY; without even the implied warranty of
96
97=== modified file 'src/sina.vala'
98--- src/sina.vala 2012-08-31 10:07:10 +0000
99+++ src/sina.vala 2012-11-12 12:01:29 +0000
100@@ -2,9 +2,8 @@
101 * Copyright (C) 2012 Canonical, Inc
102 *
103 * This program is free software; you can redistribute it and/or modify
104- * it under the terms of the GNU General Public License as published by
105- * the Free Software Foundation; either version 2 of the License, or
106- * (at your option) any later version.
107+ * it under the terms of the GNU General Public License version 2 as
108+ * published by the Free Software Foundation.
109 *
110 * This program is distributed in the hope that it will be useful,
111 * but WITHOUT ANY WARRANTY; without even the implied warranty of
112
113=== modified file 'src/sohu.vala'
114--- src/sohu.vala 2012-08-31 10:07:10 +0000
115+++ src/sohu.vala 2012-11-12 12:01:29 +0000
116@@ -2,9 +2,8 @@
117 * Copyright (C) 2012 Canonical, Inc
118 *
119 * This program is free software; you can redistribute it and/or modify
120- * it under the terms of the GNU General Public License as published by
121- * the Free Software Foundation; either version 2 of the License, or
122- * (at your option) any later version.
123+ * it under the terms of the GNU General Public License version 2 as
124+ * published by the Free Software Foundation.
125 *
126 * This program is distributed in the hope that it will be useful,
127 * but WITHOUT ANY WARRANTY; without even the implied warranty of
128
129=== modified file 'src/twitter.vala'
130--- src/twitter.vala 2012-08-31 09:52:33 +0000
131+++ src/twitter.vala 2012-11-12 12:01:29 +0000
132@@ -2,9 +2,8 @@
133 * Copyright (C) 2012 Canonical, Inc
134 *
135 * This program is free software; you can redistribute it and/or modify
136- * it under the terms of the GNU General Public License as published by
137- * the Free Software Foundation; either version 2 of the License, or
138- * (at your option) any later version.
139+ * it under the terms of the GNU General Public License version 2 as
140+ * published by the Free Software Foundation.
141 *
142 * This program is distributed in the hope that it will be useful,
143 * but WITHOUT ANY WARRANTY; without even the implied warranty of
144
145=== modified file 'src/windows-live.vala'
146--- src/windows-live.vala 2012-07-20 07:27:21 +0000
147+++ src/windows-live.vala 2012-11-12 12:01:29 +0000
148@@ -2,9 +2,8 @@
149 * Copyright (C) 2012 Collabora Ltd.
150 *
151 * This program is free software; you can redistribute it and/or modify
152- * it under the terms of the GNU General Public License as published by
153- * the Free Software Foundation; either version 2 of the License, or
154- * (at your option) any later version.
155+ * it under the terms of the GNU General Public License version 2 as
156+ * published by the Free Software Foundation.
157 *
158 * This program is distributed in the hope that it will be useful,
159 * but WITHOUT ANY WARRANTY; without even the implied warranty of

Subscribers

People subscribed via source and target branches