evolution-couchdb

Merge lp:~ken-vandine/evolution-couchdb/all_gpl3 into lp:evolution-couchdb

  1. all_gpl3
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Merge reported by: Rodrigo Moya
Merged at revision: not available
Proposed branch: lp:~ken-vandine/evolution-couchdb/all_gpl3
Merge into: lp:evolution-couchdb
Diff against target: None lines
To merge this branch: bzr merge lp:~ken-vandine/evolution-couchdb/all_gpl3
Reviewer Review Type Date Requested Status
Rodrigo Moya (community) Approve
Guillermo Gonzalez Approve
Review via email: mp+9644@code.launchpad.net

Commit message

Clean up headers in the source files and the debian/copyright to make sure the license is consistently GPL-3

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Clean up headers in the source files and the debian/copyright to make sure the license is consistently GPL-3

Revision history for this message
Guillermo Gonzalez (verterok) :
review: Approve
Revision history for this message
Rodrigo Moya (rodrigo-moya) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addressbook/e-book-backend-couchdb-factory.c'
2--- addressbook/e-book-backend-couchdb-factory.c 2009-06-18 15:14:11 +0000
3+++ addressbook/e-book-backend-couchdb-factory.c 2009-08-04 14:28:34 +0000
4@@ -4,19 +4,18 @@
5 *
6 * Copyright (C) 2009 Canonical, Ltd. (www.canonical.com)
7 *
8- * This program is free software; you can redistribute it and/or
9- * modify it under the terms of version 3 of the GNU Lesser General Public
10- * License as published by the Free Software Foundation.
11- *
12+ * This program is free software: you can redistribute it and/or modify
13+ * it under the terms of the GNU General Public License as published by
14+ * the Free Software Foundation, either version 3 of the License, or
15+ * (at your option) any later version.
16+
17 * This program is distributed in the hope that it will be useful,
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
20- * General Public License for more details.
21+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+ * GNU General Public License for more details.
23 *
24- * You should have received a copy of the GNU Lesser General Public
25- * License along with this program; if not, write to the
26- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
27- * Boston, MA 02110-1301, USA.
28+ * You should have received a copy of the GNU General Public License
29+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
30 *
31 * Authors: Rodrigo Moya <rodrigo.moya@canonical.com>
32 */
33
34=== modified file 'addressbook/e-book-backend-couchdb.c'
35--- addressbook/e-book-backend-couchdb.c 2009-07-25 21:39:45 +0000
36+++ addressbook/e-book-backend-couchdb.c 2009-08-04 14:28:34 +0000
37@@ -4,19 +4,18 @@
38 *
39 * Copyright (C) 2009 Canonical, Ltd. (www.canonical.com)
40 *
41- * This program is free software; you can redistribute it and/or
42- * modify it under the terms of version 3 of the GNU Lesser General Public
43- * License as published by the Free Software Foundation.
44- *
45+ * This program is free software: you can redistribute it and/or modify
46+ * it under the terms of the GNU General Public License as published by
47+ * the Free Software Foundation, either version 3 of the License, or
48+ * (at your option) any later version.
49+
50 * This program is distributed in the hope that it will be useful,
51 * but WITHOUT ANY WARRANTY; without even the implied warranty of
52- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
53- * General Public License for more details.
54+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
55+ * GNU General Public License for more details.
56 *
57- * You should have received a copy of the GNU Lesser General Public
58- * License along with this program; if not, write to the
59- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
60- * Boston, MA 02110-1301, USA.
61+ * You should have received a copy of the GNU General Public License
62+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
63 *
64 * Authors: Rodrigo Moya <rodrigo.moya@canonical.com>
65 */
66
67=== modified file 'addressbook/e-book-backend-couchdb.h'
68--- addressbook/e-book-backend-couchdb.h 2009-06-19 15:25:19 +0000
69+++ addressbook/e-book-backend-couchdb.h 2009-08-04 14:28:34 +0000
70@@ -1,22 +1,21 @@
71 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
72
73-/* e-book-backend-couchdb-factory.c - CouchDB contact backend factory.
74+/* e-book-backend-couchdb.h - CouchDB contact backend factory.
75 *
76 * Copyright (C) 2009 Canonical, Ltd. (www.canonical.com)
77 *
78- * This program is free software; you can redistribute it and/or
79- * modify it under the terms of version 3 of the GNU Lesser General Public
80- * License as published by the Free Software Foundation.
81- *
82+ * This program is free software: you can redistribute it and/or modify
83+ * it under the terms of the GNU General Public License as published by
84+ * the Free Software Foundation, either version 3 of the License, or
85+ * (at your option) any later version.
86+
87 * This program is distributed in the hope that it will be useful,
88 * but WITHOUT ANY WARRANTY; without even the implied warranty of
89- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
90- * General Public License for more details.
91+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
92+ * GNU General Public License for more details.
93 *
94- * You should have received a copy of the GNU Lesser General Public
95- * License along with this program; if not, write to the
96- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
97- * Boston, MA 02110-1301, USA.
98+ * You should have received a copy of the GNU General Public License
99+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
100 *
101 * Authors: Rodrigo Moya <rodrigo.moya@canonical.com>
102 */
103
104=== modified file 'debian/copyright'
105--- debian/copyright 2009-07-20 14:22:31 +0000
106+++ debian/copyright 2009-08-04 14:28:34 +0000
107@@ -1,7 +1,7 @@
108 This package was debianized by Rodrigo Moya <rodrigo.moya@canonical.com> on Sun, 03 May 2009 17:06:26 CEST +0100
109
110 It was downloaded from:
111- http://download.gnome.org/sources/evolution-couchdb/0.1/evolution-couchdb-0.1.1.tar.gz
112+ http://download.gnome.org/sources/evolution-couchdb/
113
114 Upstream Author:
115 Rodrigo Moya <rodrigo.moya@canonical.com>
116@@ -9,21 +9,21 @@
117 Copyright (C) 2009 Canonical Ltd
118
119 License:
120- This program is free software; you can redistribute it and/or modify it under
121- the terms of the GNU General Public License as published by the Free
122- Software Foundation; either version 2 of the License, or (at your option) any
123- later version.
124-
125- This program is distributed in the hope that it will be useful, but WITHOUT
126- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
127- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
128-
129- You should have received a copy of the GNU General Public License along
130- with this library; if not, write to the Free Software Foundation, Inc., 51
131- Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
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 3 of the License, or
135+ (at your option) any later version.
136+
137+ This program is distributed in the hope that it will be useful,
138+ but WITHOUT ANY WARRANTY; without even the implied warranty of
139+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
140+ GNU General Public License for more details.
141+
142+ You should have received a copy of the GNU General Public License
143+ along with this program. If not, see <http://www.gnu.org/licenses/>.
144
145 On Debian systems, the complete text of the GNU General
146-Public License can be found in `/usr/share/common-licenses/GPL-2'.
147+Public License can be found in `/usr/share/common-licenses/GPL-3'.
148
149 Packaging:
150 Rodrigo Moya <rodrigo.moya@canonical.com>
151
152=== modified file 'plugins/couchdb-contacts-source.c'
153--- plugins/couchdb-contacts-source.c 2009-07-27 21:56:19 +0000
154+++ plugins/couchdb-contacts-source.c 2009-08-04 14:28:34 +0000
155@@ -1,26 +1,26 @@
156 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
157
158-/* e-book-backend-couchdb.c - CouchDB contact backend
159+/* couchdb-contacts-source.c - CouchDB contact backend
160 *
161 * Copyright (C) 2009 Canonical, Ltd. (www.canonical.com)
162 *
163- * This program is free software; you can redistribute it and/or
164- * modify it under the terms of version 3 of the GNU Lesser General Public
165- * License as published by the Free Software Foundation.
166- *
167+ * This program is free software: you can redistribute it and/or modify
168+ * it under the terms of the GNU General Public License as published by
169+ * the Free Software Foundation, either version 3 of the License, or
170+ * (at your option) any later version.
171+
172 * This program is distributed in the hope that it will be useful,
173 * but WITHOUT ANY WARRANTY; without even the implied warranty of
174- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
175- * General Public License for more details.
176+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
177+ * GNU General Public License for more details.
178 *
179- * You should have received a copy of the GNU Lesser General Public
180- * License along with this program; if not, write to the
181- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
182- * Boston, MA 02110-1301, USA.
183+ * You should have received a copy of the GNU General Public License
184+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
185 *
186 * Authors: Rodrigo Moya <rodrigo.moya@canonical.com>
187 */
188
189+
190 #ifdef HAVE_CONFIG_H
191 #include "config.h"
192 #endif
193
194=== modified file 'plugins/couchdb-contacts-source.h'
195--- plugins/couchdb-contacts-source.h 2009-06-18 11:51:51 +0000
196+++ plugins/couchdb-contacts-source.h 2009-08-04 14:28:34 +0000
197@@ -1,22 +1,21 @@
198 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
199
200-/* e-book-backend-couchdb.c - CouchDB contact backend
201+/* couchdb-contacts-source.h - CouchDB contact backend
202 *
203 * Copyright (C) 2009 Canonical, Ltd. (www.canonical.com)
204 *
205- * This program is free software; you can redistribute it and/or
206- * modify it under the terms of version 3 of the GNU Lesser General Public
207- * License as published by the Free Software Foundation.
208- *
209+ * This program is free software: you can redistribute it and/or modify
210+ * it under the terms of the GNU General Public License as published by
211+ * the Free Software Foundation, either version 3 of the License, or
212+ * (at your option) any later version.
213+
214 * This program is distributed in the hope that it will be useful,
215 * but WITHOUT ANY WARRANTY; without even the implied warranty of
216- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
217- * General Public License for more details.
218+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
219+ * GNU General Public License for more details.
220 *
221- * You should have received a copy of the GNU Lesser General Public
222- * License along with this program; if not, write to the
223- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
224- * Boston, MA 02110-1301, USA.
225+ * You should have received a copy of the GNU General Public License
226+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
227 *
228 * Authors: Rodrigo Moya <rodrigo.moya@canonical.com>
229 */

Subscribers

People subscribed via source and target branches