[gcr] gcr: Fix licensing

[Stefan Walter <stefw src gnome org>]

commit dd8726a73b42f82622e8ce29ee27ec42ee3c2511
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Dec 19 09:18:34 2011 +0100

    gcr: Fix licensing
    
     * Remove unused gcr/gcr-menu-button.[ch]
     * Relicense gcr/gcr-collection-model.[ch]
    
    https://bugzilla.gnome.org/show_bug.cgi?id=666378

 gcr/Makefile.am            |    1 -
 gcr/gcr-collection-model.c |   29 ++--
 gcr/gcr-collection-model.h |   27 ++--
 gcr/gcr-menu-button.c      |  374 --------------------------------------------
 gcr/gcr-menu-button.h      |   61 -------
 5 files changed, 31 insertions(+), 461 deletions(-)
---
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index 83d56d2..d2b5ec6 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -175,7 +175,6 @@ libgcr_ GCR_MAJOR@_la_SOURCES = \
 	gcr-live-search.c gcr-live-search.h \
 	gcr-memory.c \
 	gcr-memory-icon.c gcr-memory-icon.h \
-	gcr-menu-button.c gcr-menu-button.h \
 	gcr-pkcs11-import-interaction.c gcr-pkcs11-import-interaction.h \
 	gcr-pkcs11-import-dialog.c gcr-pkcs11-import-dialog.h \
 	gcr-prompt-dialog.c gcr-prompt-dialog.h \
diff --git a/gcr/gcr-collection-model.c b/gcr/gcr-collection-model.c
index bc08862..58cf64f 100644
--- a/gcr/gcr-collection-model.c
+++ b/gcr/gcr-collection-model.c
@@ -2,21 +2,24 @@
  * gnome-keyring
  *
  * Copyright (C) 2010 Stefan Walter
+ * Copyright (C) 2011 Collabora Ltd.
  *
  * 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.
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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
+ * Lesser 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Author: Stef Walter <stefw collabora co uk>
  */
 
 #include "config.h"
diff --git a/gcr/gcr-collection-model.h b/gcr/gcr-collection-model.h
index 55c9460..a55f587 100644
--- a/gcr/gcr-collection-model.h
+++ b/gcr/gcr-collection-model.h
@@ -2,21 +2,24 @@
  * gnome-keyring
  *
  * Copyright (C) 2010 Stefan Walter
+ * Copyright (C) 2011 Collabora Ltd.
  *
  * 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.
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 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, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * 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
+ * Lesser 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Author: Stef Walter <stefw collabora co uk>
  */
 
 #ifndef __GCR_COLLECTION_MODEL_H__