Online Accounts: Account plugins

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

  1. gpl2-trunk
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Approved by: David King
Approved revision: 76
Merged at revision: 76
Proposed branch: lp:~mardy/account-plugins/gpl2-trunk
Merge into: lp:account-plugins
Diff against target: 172 lines (+21/-31)
11 files modified
README (+1/-1)
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-trunk
Reviewer Review Type Date Requested Status
David King (community) Approve
Review via email: mp+133932@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
David King (amigadave) :
review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches