[evolution-couchdb] Clean up headers in the source files and the debian/copyright to make sure the license is consistent

[Rodrigo Moya <rodrigo src gnome org>]

commit 0f0fe30351e8f325345a15886ad17c1b19bafbe8
Author: Ken Van Dine <ken vandine canonical com>
Date:   Wed Aug 5 14:09:30 2009 +0200

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

 addressbook/e-book-backend-couchdb-factory.c |   19 ++++++++---------
 addressbook/e-book-backend-couchdb.c         |   19 ++++++++---------
 addressbook/e-book-backend-couchdb.h         |   21 +++++++++----------
 debian/copyright                             |   28 +++++++++++++-------------
 plugins/couchdb-contacts-source.c            |   22 ++++++++++----------
 plugins/couchdb-contacts-source.h            |   21 +++++++++----------
 6 files changed, 63 insertions(+), 67 deletions(-)
---
diff --git a/addressbook/e-book-backend-couchdb-factory.c b/addressbook/e-book-backend-couchdb-factory.c
index 8551695..4cf0b56 100644
--- a/addressbook/e-book-backend-couchdb-factory.c
+++ b/addressbook/e-book-backend-couchdb-factory.c
@@ -4,19 +4,18 @@
  *
  * Copyright (C) 2009 Canonical, Ltd. (www.canonical.com)
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 3 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Rodrigo Moya <rodrigo moya canonical com>
  */
diff --git a/addressbook/e-book-backend-couchdb.c b/addressbook/e-book-backend-couchdb.c
index 902d556..0dec23c 100644
--- a/addressbook/e-book-backend-couchdb.c
+++ b/addressbook/e-book-backend-couchdb.c
@@ -4,19 +4,18 @@
  *
  * Copyright (C) 2009 Canonical, Ltd. (www.canonical.com)
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 3 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Rodrigo Moya <rodrigo moya canonical com>
  */
diff --git a/addressbook/e-book-backend-couchdb.h b/addressbook/e-book-backend-couchdb.h
index 0fa1cf0..2dee6f6 100644
--- a/addressbook/e-book-backend-couchdb.h
+++ b/addressbook/e-book-backend-couchdb.h
@@ -1,22 +1,21 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 
-/* e-book-backend-couchdb-factory.c - CouchDB contact backend factory.
+/* e-book-backend-couchdb.h - CouchDB contact backend factory.
  *
  * Copyright (C) 2009 Canonical, Ltd. (www.canonical.com)
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 3 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Rodrigo Moya <rodrigo moya canonical com>
  */
diff --git a/debian/copyright b/debian/copyright
index 4149c9d..fe4d1e0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Rodrigo Moya <rodrigo moya canonical com> on Sun, 03 May 2009 17:06:26 CEST +0100
 
 It was downloaded from:
-  http://download.gnome.org/sources/evolution-couchdb/0.1/evolution-couchdb-0.1.1.tar.gz
+  http://download.gnome.org/sources/evolution-couchdb/
 
 Upstream Author:
   Rodrigo Moya <rodrigo moya canonical com>
@@ -9,21 +9,21 @@ Upstream Author:
 Copyright (C) 2009 Canonical Ltd
 
 License:
-  This program is free software; you can redistribute it and/or modify it under
-  the terms of the GNU General Public License as published by the Free
-  Software Foundation; either version 2 of the License, or (at your option) any
-  later version.
-
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this library; if not, write to the Free Software Foundation, Inc., 51
-  Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
+Public License can be found in `/usr/share/common-licenses/GPL-3'.
 
 Packaging:
   Rodrigo Moya <rodrigo moya canonical com>
diff --git a/plugins/couchdb-contacts-source.c b/plugins/couchdb-contacts-source.c
index 4c1f972..83344b0 100644
--- a/plugins/couchdb-contacts-source.c
+++ b/plugins/couchdb-contacts-source.c
@@ -1,26 +1,26 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 
-/* e-book-backend-couchdb.c - CouchDB contact backend
+/* couchdb-contacts-source.c - CouchDB contact backend
  *
  * Copyright (C) 2009 Canonical, Ltd. (www.canonical.com)
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 3 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Rodrigo Moya <rodrigo moya canonical com>
  */
 
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/plugins/couchdb-contacts-source.h b/plugins/couchdb-contacts-source.h
index 345c8ac..c846162 100644
--- a/plugins/couchdb-contacts-source.h
+++ b/plugins/couchdb-contacts-source.h
@@ -1,22 +1,21 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 
-/* e-book-backend-couchdb.c - CouchDB contact backend
+/* couchdb-contacts-source.h - CouchDB contact backend
  *
  * Copyright (C) 2009 Canonical, Ltd. (www.canonical.com)
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 3 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Rodrigo Moya <rodrigo moya canonical com>
  */