Update copyright statements.

Remove gettext files, which resurrected mystically after
transition to Git.

20 files changed, 126 insertions, 371 deletions

diff --git a/Makefile.am b/Makefile.am
index fc6a79b..aba7c27 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,18 @@
-# This file is part of guile-sql.
+# This file is part of Gamma.
 # Copyright (C) 2002, 2007, 2010 Sergey Poznyakoff
 #
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
+# Gamma 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, or (at your option)
+# any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# Gamma 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 Gamma.  If not, see <http://www.gnu.org/licenses/>.
 
 ACLOCAL_AMFLAGS = -I m4 -I am
 
diff --git a/NEWS b/NEWS
index 620cbc5..cbdc3f3 100644
--- a/NEWS
+++ b/NEWS
@@ -28,7 +28,7 @@ PostgreSQL.
 =========================================================================
 Copyright information:
 
-Copyright (C) 2004, 2007 Sergey Poznyakoff
+Copyright (C) 2004, 2007, 2010 Sergey Poznyakoff
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/configure.ac b/configure.ac
index 136b933..e34de72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,20 +1,18 @@
 dnl This file is part of Gamma
 dnl Copyright (C) 2002, 2004, 2007, 2010 Sergey Poznyakoff
 dnl
-dnl This program is free software; you can redistribute it and/or modify it
-dnl under the terms of the GNU General Public License as published by the
-dnl Free Software Foundation; either version 3 of the License, or (at your
-dnl option) any later version.
+dnl Gamma is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3, or (at your option)
+dnl any later version.
 dnl
-dnl This program is distributed in the hope that it will be useful,
+dnl Gamma is distributed in the hope that it will be useful,
 dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 dnl
-dnl You should have received a copy of the GNU General Public License along
-dnl with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-dnl Process this file with autoconf to produce a configure script.
+dnl You should have received a copy of the GNU General Public License
+dnl along with Gamma.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.59)
 
diff --git a/examples/Makefile.am b/examples/Makefile.am
index ca2d904..dd33878 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1 +1,17 @@
+# This file is part of Gamma
+# Copyright (C) 2007, 2010 Sergey Poznyakoff
+#
+# Gamma 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, or (at your option)
+# any later version.
+#
+# Gamma 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 Gamma.  If not, see <http://www.gnu.org/licenses/>.
+
 EXTRA_DIST = whoisd.scm README
diff --git a/examples/README b/examples/README
index a56a725..51e6370 100644
--- a/examples/README
+++ b/examples/README
@@ -1,4 +1,4 @@
-This directory contains examples of guile-sql usage.
+This directory contains examples of (gamma sql) usage.
 
 whoisd -- a simple whois daemon.
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 850d661..291ff75 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,13 +1,18 @@
-# This file is part of guile-sql.
-# Copyright (C) 2002, 2007, Sergey Poznyakoff
+# This file is part of Gamma.
+# Copyright (C) 2002, 2007, 2010 Sergey Poznyakoff
 #
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
+# Gamma 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, or (at your option)
+# any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# Gamma 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 Gamma.  If not, see <http://www.gnu.org/licenses/>.
 
 EXTRA_DIST = \
  guile-doc-snarf\
diff --git a/scripts/guile-doc-snarf b/scripts/guile-doc-snarf
index 7ad40ba..6cc184f 100755
--- a/scripts/guile-doc-snarf
+++ b/scripts/guile-doc-snarf
@@ -1,11 +1,11 @@
 #! /bin/sh
-# Copyright (C) 2002 Sergey Poznyakoff
+# Copyright (C) 2002, 2010 Sergey Poznyakoff
 #
 # This is a snarfer for guile version 1.6
 # 
 #  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
+#  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,
diff --git a/scripts/guile-doc-snarf.awk b/scripts/guile-doc-snarf.awk
index 03c791f..2c8455e 100644
--- a/scripts/guile-doc-snarf.awk
+++ b/scripts/guile-doc-snarf.awk
@@ -1,4 +1,4 @@
-# Copyright (C) 2002 Sergey Poznyakoff
+# Copyright (C) 2002, 2010 Sergey Poznyakoff
 #
 # This is a snarfer for guile version 1.6
 # 
diff --git a/src/Makefile.am b/src/Makefile.am
index 3f05164..46633c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,18 @@
 # This file is part of Gamma.
 # Copyright (C) 2002, 2007, 2010 Sergey Poznyakoff
 #
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
+# Gamma 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, or (at your option)
+# any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# Gamma 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 Gamma.  If not, see <http://www.gnu.org/licenses/>.
 
 INCLUDES =-I$(top_builddir) -I$(srcdir) -I. @GUILE_INCLUDES@ @INCLUDEPATH@
 
diff --git a/src/app.h b/src/app.h
index 6b205ee..e46ed2a 100644
--- a/src/app.h
+++ b/src/app.h
@@ -1,18 +1,18 @@
-/* This file is part of guile-sql.
-   Copyright (C) 2002 Sergey Poznyakoff
+/* This file is part of Gamma.
+   Copyright (C) 2002, 2010 Sergey Poznyakoff
 
-   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.
+   Gamma 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, or (at your option)
+   any later version.
 
-   This program is distributed in the hope that it will be useful,
+   Gamma 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/>. */
+   You should have received a copy of the GNU General Public License
+   along with Gamma.  If not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef USE_SQL_MYSQL
 extern struct sql_iface mysql_iface;
diff --git a/src/gettext.c b/src/gettext.c
deleted file mode 100644
index 9dcaf1c..0000000
--- a/src/gettext.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* This file is part of gettext interface for guile.
-   Copyright (C) 2004 Sergey Poznyakoff
-
-   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, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-#include <gettext.h>
-#include <libguile.h>
-#include <locale.h>
-
-SCM_DEFINE (scm_bindtextdomain, "bindtextdomain", 2, 0, 0,
-	    (SCM PACKAGENAME, SCM LOCALEDIR),
-	    "")
-#define FUNC_NAME s_scm_bindtextdomain
-{
-	SCM_ASSERT(SCM_STRINGP(PACKAGENAME), PACKAGENAME, SCM_ARG1, FUNC_NAME);
-	SCM_ASSERT(SCM_STRINGP(LOCALEDIR), LOCALEDIR, SCM_ARG2, FUNC_NAME);
-	bindtextdomain(SCM_CHARS(PACKAGENAME), SCM_CHARS(LOCALEDIR));
-	return SCM_UNSPECIFIED;
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_bind_textdomain_codeset, "bind_textdomain_codeset", 1, 1, 0,
-	    (SCM DOMAINNAME, SCM CODESET),
-	    "")
-#define FUNC_NAME s_scm_bind_textdomain_codeset
-{
-	char *codeset;
-	
-	SCM_ASSERT(SCM_STRINGP(DOMAINNAME), DOMAINNAME, SCM_ARG1, FUNC_NAME);
-	if (SCM_UNBNDP(CODESET))
-		codeset = NULL;
-	else {
-		SCM_ASSERT(SCM_STRINGP(CODESET), CODESET, SCM_ARG2, FUNC_NAME);
-		codeset = SCM_CHARS(CODESET);
-	}
-	return scm_makfrom0str(bind_textdomain_codeset(SCM_CHARS(DOMAINNAME),
-						       codeset));
-}
-#undef FUNC_NAME
-
-
-SCM_DEFINE (scm_textdomain, "textdomain", 1, 0, 0,
-	    (SCM PACKAGENAME),
-	    "")
-#define FUNC_NAME s_scm_bindtextdomain
-{
-	SCM_ASSERT(SCM_STRINGP(PACKAGENAME), PACKAGENAME, SCM_ARG1, FUNC_NAME);
-	textdomain(SCM_CHARS(PACKAGENAME));
-	return SCM_UNSPECIFIED;
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_gettext, "gettext", 1, 0, 0,
-	    (SCM STRING),
-	    "Return a translation of the given string.")
-#define FUNC_NAME s_scm_gettext
-{
-	SCM_ASSERT(SCM_STRINGP(STRING), STRING, SCM_ARG1, FUNC_NAME);
-	return scm_makfrom0str(gettext(SCM_CHARS(STRING)));
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_dgettext, "dgettext", 2, 0, 0,
-	    (SCM DOMAIN, SCM STRING),
-	    "Return a translation of the given string within the given domain.")
-#define FUNC_NAME s_scm_dgettext
-{
-	SCM_ASSERT(SCM_STRINGP(DOMAIN), DOMAIN, SCM_ARG1, FUNC_NAME);
-	SCM_ASSERT(SCM_STRINGP(STRING), STRING, SCM_ARG2, FUNC_NAME);
-	return scm_makfrom0str(dgettext(SCM_CHARS(DOMAIN), SCM_CHARS(STRING)));
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_ngettext, "ngettext", 3, 0, 0,
-	    (SCM MSGID1, SCM MSGID2, SCM N),
-	    "The `ngettext' function is used to translate messages that "
-	    "have singular and plural forms. The MSGID1 parameter must "
-	    "contain the singular form of the string to be converted. It is "
-	    "also used as the key for the search in the catalog. The "
-	    "MSGID2 parameter is the plural form.  The parameter N "
-	    "is used to determine the plural form. If no message catalog is "
-	    "found MSGID1 is returned if `N == 1', otherwise MSGID2.")
-#define FUNC_NAME s_scm_ngettext
-{
-	SCM_ASSERT(SCM_STRINGP(MSGID1), MSGID1, SCM_ARG1, FUNC_NAME);
-	SCM_ASSERT(SCM_STRINGP(MSGID2), MSGID2, SCM_ARG2, FUNC_NAME);
-	SCM_ASSERT(SCM_IMP(N) && SCM_INUMP(N), N, SCM_ARG3, FUNC_NAME);
-	return scm_makfrom0str(ngettext(SCM_CHARS(MSGID1), SCM_CHARS(MSGID2),
-					SCM_INUM(N)));
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_dngettext, "dngettext", 4, 0, 0,
-	    (SCM DOMAIN, SCM MSGID1, SCM MSGID2, SCM N),
-	    "The `dngettext' function is used to translate messages that "
-	    "have singular and plural forms. The MSGID1 parameter must "
-	    "contain the singular form of the string to be converted. It is "
-	    "also used as the key for the search in the catalog. The "
-	    "MSGID2 parameter is the plural form.  The parameter N "
-	    "is used to determine the plural form. If no message catalog is "
-	    "found MSGID1 is returned if `N == 1', otherwise MSGID2.")
-#define FUNC_NAME s_scm_dngettext
-{
-	SCM_ASSERT(SCM_STRINGP(DOMAIN), DOMAIN, SCM_ARG1, FUNC_NAME);
-	SCM_ASSERT(SCM_STRINGP(MSGID1), MSGID1, SCM_ARG2, FUNC_NAME);
-	SCM_ASSERT(SCM_STRINGP(MSGID2), MSGID2, SCM_ARG3, FUNC_NAME);
-	SCM_ASSERT(SCM_IMP(N) && SCM_INUMP(N), N, SCM_ARG4, FUNC_NAME);
-	return scm_makfrom0str(dngettext(SCM_CHARS(DOMAIN),
-					 SCM_CHARS(MSGID1),
-					 SCM_CHARS(MSGID2),
-					 SCM_INUM(N)));
-}
-#undef FUNC_NAME
-
-extern void
-gettext_init()
-{
-#ifndef SCM_MAGIC_SNARFER
-# include <gettext.x>
-#endif
-}
diff --git a/src/gettext.h b/src/gettext.h
deleted file mode 100644
index 933ad22..0000000
--- a/src/gettext.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library 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.  */
-
-#ifndef _LIBGETTEXT_H
-#define _LIBGETTEXT_H 1
-
-/* NLS can be disabled through the configure --disable-nls option.  */
-#if ENABLE_NLS
-
-/* Get declarations of GNU message catalog functions.  */
-# include <libintl.h>
-
-#else
-
-/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
-   chokes if dcgettext is defined as a macro.  So include it now, to make
-   later inclusions of <locale.h> a NOP.  We don't include <libintl.h>
-   as well because people using "gettext.h" will not include <libintl.h>,
-   and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
-   is OK.  */
-#if defined(__sun)
-# include <locale.h>
-#endif
-
-/* Disabled NLS.
-   The casts to 'const char *' serve the purpose of producing warnings
-   for invalid uses of the value returned from these functions.
-   On pre-ANSI systems without 'const', the config.h file is supposed to
-   contain "#define const".  */
-# define gettext(Msgid) ((const char *) (Msgid))
-# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
-# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
-# define ngettext(Msgid1, Msgid2, N) \
-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-# define dngettext(Domainname, Msgid1, Msgid2, N) \
-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
-# define textdomain(Domainname) ((const char *) (Domainname))
-# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
-# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
-
-#endif
-
-/* A pseudo function call that serves as a marker for the automated
-   extraction of messages, but does not call gettext().  The run-time
-   translation is done at a different place in the code.
-   The argument, String, should be a literal string.  Concatenated strings
-   and other string expressions won't work.
-   The macro's expansion is not parenthesized, so that it is suitable as
-   initializer for static 'char[]' or 'const char[]' variables.  */
-#define gettext_noop(String) String
-
-#endif /* _LIBGETTEXT_H */
diff --git a/src/gettext.sci b/src/gettext.sci
deleted file mode 100644
index 78dc5e4..0000000
--- a/src/gettext.sci
+++ /dev/null
@@ -1,38 +0,0 @@
-;;;; -*- scheme -*-
-;;;; This file is part of gettext interface for guile.
-;;;; Copyright (C) 2004 Sergey Poznyakoff
-;;;; 
-;;;; 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, write to the Free Software Foundation,
-;;;; Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-changequote([,])dnl
-
-(define-module (gamma gettext))
-
-(let ((lib-path "LIBDIR/"))
-  (load-extension (string-append
-		   lib-path "libguile-gettext-v-VERSION") "gettext_init"))
-
-include(BUILDDIR/gettext.inc)
-
-(define (_ msgid)
-  (gettext msgid))
-
-(define (N_ msgid)
-  msgid)
-
-(export _)
-(export N_)
-
-;;;; EOF
diff --git a/src/gettext.scm b/src/gettext.scm
deleted file mode 100644
index a60bd59..0000000
--- a/src/gettext.scm
+++ /dev/null
@@ -1,29 +0,0 @@
-;;;; This file is part of gettext interface for guile.
-;;;; Copyright (C) 2004, 2007 Sergey Poznyakoff
-;;;; 
-;;;; 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/>.
-
-
-(define-module (gamma gettext))
-
-(define (_ msgid)
-  (gettext msgid))
-
-(define (N_ msgid)
-  msgid)
-
-(export _)
-(export N_)
-
-;;;; EOF
diff --git a/src/gsql_conn.c b/src/gsql_conn.c
index c10b197..5b2d1d6 100644
--- a/src/gsql_conn.c
+++ b/src/gsql_conn.c
@@ -1,18 +1,18 @@
-/* This file is part of guile-sql.
-   Copyright (C) 2002, 2005 Sergey Poznyakoff
+/* This file is part of Gamma.
+   Copyright (C) 2002, 2005, 2010 Sergey Poznyakoff
 
-   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.
+   Gamma 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, or (at your option)
+   any later version.
 
-   This program is distributed in the hope that it will be useful,
+   Gamma 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/>. */
+   You should have received a copy of the GNU General Public License
+   along with Gamma.  If not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/src/gsql_lib.c b/src/gsql_lib.c
index 842d09a..223b223 100644
--- a/src/gsql_lib.c
+++ b/src/gsql_lib.c
@@ -1,18 +1,18 @@
-/* This file is part of guile-sql.
-   Copyright (C) 2002 Sergey Poznyakoff
+/* This file is part of Gamma.
+   Copyright (C) 2002, 2010 Sergey Poznyakoff
 
-   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.
+   Gamma 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, or (at your option)
+   any later version.
 
-   This program is distributed in the hope that it will be useful,
+   Gamma 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/>. */
+   You should have received a copy of the GNU General Public License
+   along with Gamma.  If not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/src/guile-sql.h b/src/guile-sql.h
index 6bf3924..1956395 100644
--- a/src/guile-sql.h
+++ b/src/guile-sql.h
@@ -1,18 +1,18 @@
-/* This file is part of guile-sql.
-   Copyright (C) 2002, 2007 Sergey Poznyakoff
+/* This file is part of Gamma.
+   Copyright (C) 2002, 2007, 2010 Sergey Poznyakoff
 
-   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.
+   Gamma 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, or (at your option)
+   any later version.
 
-   This program is distributed in the hope that it will be useful,
+   Gamma 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/>. */
+   You should have received a copy of the GNU General Public License
+   along with Gamma.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/src/mysql.c b/src/mysql.c
index 3d63ec3..f4e178f 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -1,18 +1,18 @@
-/* This file is part of guile-sql.
-   Copyright (C) 2002, 2004, 2005 Sergey Poznyakoff
+/* This file is part of Gamma.
+   Copyright (C) 2002, 2004, 2005, 2010 Sergey Poznyakoff
 
-   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.
+   Gamma 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, or (at your option)
+   any later version.
 
-   This program is distributed in the hope that it will be useful,
+   Gamma 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/>. */
+   You should have received a copy of the GNU General Public License
+   along with Gamma.  If not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/src/pgsql.c b/src/pgsql.c
index 398cacc..2a7fe23 100644
--- a/src/pgsql.c
+++ b/src/pgsql.c
@@ -1,18 +1,18 @@
-/* This file is part of guile-sql.
-   Copyright (C) 2002 Sergey Poznyakoff
+/* This file is part of Gamma.
+   Copyright (C) 2002, 2010 Sergey Poznyakoff
 
-   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.
+   Gamma 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, or (at your option)
+   any later version.
 
-   This program is distributed in the hope that it will be useful,
+   Gamma 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/>. */
+   You should have received a copy of the GNU General Public License
+   along with Gamma.  If not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/src/sql.sci b/src/sql.sci
index 573e059..2437514 100644
--- a/src/sql.sci
+++ b/src/sql.sci
@@ -1,20 +1,18 @@
-;;;; -*- scheme -*-
-;;;; This file is part of guile-sql.
+;;;; This file is part of Gamma.                           -*- scheme -*-
 ;;;; Copyright (C) 2002, 2008, 2010 Sergey Poznyakoff
 ;;;; 
-;;;; This program is free software; you can redistribute it and/or modify
+;;;; Gamma 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,
+;;;; the Free Software Foundation; either version 3, or (at your option)
+;;;; any later version.
+;;;;
+;;;; Gamma 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+;;;; along with Gamma.  If not, see <http://www.gnu.org/licenses/>.
 
 changequote([,])dnl