gnucash maint: Bug 755781 - Files with copyright but no grant of license.

John Ralls jralls at code.gnucash.org
Fri Oct 9 13:56:37 EDT 2015


Updated	 via  https://github.com/Gnucash/gnucash/commit/8d9c0d66 (commit)
	from  https://github.com/Gnucash/gnucash/commit/557ec686 (commit)



commit 8d9c0d66964b54945857b09705e85a291f4dc454
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Oct 9 10:53:17 2015 -0700

    Bug 755781 - Files with copyright but no grant of license.
    
    Fix some license mismatches.

diff --git a/src/app-utils/gfec.c b/src/app-utils/gfec.c
index 50c361e..94f6876 100644
--- a/src/app-utils/gfec.c
+++ b/src/app-utils/gfec.c
@@ -5,26 +5,6 @@
  *  gfec stands for 'guile fancy error catching'.
  *  This code is in the public domain.
  */
-/********************************************************************\
- * 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 program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
 
 #include <assert.h>
 #include <string.h>
@@ -261,4 +241,3 @@ gfec_try_load(gchar *fn)
     }
     return FALSE;
 }
-
diff --git a/src/app-utils/gfec.h b/src/app-utils/gfec.h
index 205a4de..16852ca 100644
--- a/src/app-utils/gfec.h
+++ b/src/app-utils/gfec.h
@@ -5,26 +5,6 @@
  *  gfec stands for 'guile fancy error catching'.
  *  This code is in the public domain.
  */
-/********************************************************************\
- * 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 program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
 
 #ifndef GFEC_H
 #define GFEC_H
diff --git a/src/gnome-utils/test/test-gnc-recurrence.c b/src/gnome-utils/test/test-gnc-recurrence.c
index 1541914..e451653 100644
--- a/src/gnome-utils/test/test-gnc-recurrence.c
+++ b/src/gnome-utils/test/test-gnc-recurrence.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2005, Chris Shoemaker <c.shoemaker at cox.net>
- * This file is free software.  See COPYING for details. */
-/********************************************************************\
+ /********************************************************************\
+ * Copyright (C) 2005, Chris Shoemaker <c.shoemaker at cox.net>        *
  * 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   *
diff --git a/src/import-export/csv-imp/gnc-csv-gnumeric-popup.c b/src/import-export/csv-imp/gnc-csv-gnumeric-popup.c
index 5348344..4d5b770 100644
--- a/src/import-export/csv-imp/gnc-csv-gnumeric-popup.c
+++ b/src/import-export/csv-imp/gnc-csv-gnumeric-popup.c
@@ -1,8 +1,6 @@
-/* The following is code copied from Gnumeric 1.7.8 licensed under the
- * GNU General Public License version 2 and/or version 3. It is from the file
- * gnumeric/src/gui-util.c, and it has been modified slightly to work
- * within GnuCash. */
 /********************************************************************\
+ * The following is code copied from Gnumeric 1.7.8 src/gui-util.c, *
+ * and it has been modified slightly to work within GnuCash.        *
  * 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   *



Summary of changes:
 src/app-utils/gfec.c                               | 21 ---------------------
 src/app-utils/gfec.h                               | 20 --------------------
 src/gnome-utils/test/test-gnc-recurrence.c         |  5 ++---
 src/import-export/csv-imp/gnc-csv-gnumeric-popup.c |  6 ++----
 4 files changed, 4 insertions(+), 48 deletions(-)



More information about the gnucash-changes mailing list