From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 1 Apr 2008 21:11:45 +0000 (+0200)
Subject: Update source headers for 2008. Omit CVS ID keyword subst.
X-Git-Tag: v3.0.30~58
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=ee6ab2ee3a9ee1a8c65d7272ec7fba1d886f5af0;p=yaz-moved-to-github.git

Update source headers for 2008. Omit CVS ID keyword subst.
---

diff --git a/client/admin.c b/client/admin.c
index 16528ba..019910a 100644
--- a/client/admin.c
+++ b/client/admin.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: admin.c,v 1.26 2007-05-08 08:22:35 adam Exp $
  */
 
 #include <stdio.h>
diff --git a/client/admin.h b/client/admin.h
index 0d0ec2c..9b830b5 100644
--- a/client/admin.h
+++ b/client/admin.h
@@ -1,8 +1,28 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * See the file LICENSE for details.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Index Data nor the names of its contributors
+ *       may be used to endorse or promote products derived from this
+ *       software without specific prior written permission.
  *
- * $Id: admin.h,v 1.10 2007-01-24 11:50:18 adam Exp $
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 int cmd_adm_reindex(const char* arg);
diff --git a/client/bertorture.c b/client/bertorture.c
index 7565123..c42c2cb 100644
--- a/client/bertorture.c
+++ b/client/bertorture.c
@@ -1,8 +1,6 @@
-/* 
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: bertorture.c,v 1.5 2007-01-03 08:42:13 adam Exp $
  */
 
 #include <signal.h>
diff --git a/client/client.c b/client/client.c
index 468a0ea..d42b23b 100644
--- a/client/client.c
+++ b/client/client.c
@@ -1,8 +1,6 @@
-/* 
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: client.c,v 1.356 2007-12-27 13:27:40 adam Exp $
  */
 /** \file client.c
  *  \brief yaz-client program
diff --git a/client/fhistory.c b/client/fhistory.c
index 0094fd0..21f9b6f 100644
--- a/client/fhistory.c
+++ b/client/fhistory.c
@@ -1,8 +1,6 @@
-/* 
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: fhistory.c,v 1.4 2007-05-06 20:12:19 adam Exp $
  */
 /** \file fhistory.c
  *  \brief file history implementation
diff --git a/client/fhistory.h b/client/fhistory.h
index 39777ea..a40932d 100644
--- a/client/fhistory.h
+++ b/client/fhistory.h
@@ -1,8 +1,28 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * See the file LICENSE for details.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Index Data nor the names of its contributors
+ *       may be used to endorse or promote products derived from this
+ *       software without specific prior written permission.
  *
- * $Id: fhistory.h,v 1.1 2007-01-24 11:50:18 adam Exp $
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /** \file fhistory.h
  *  \brief file history header
diff --git a/client/tabcomplete.c b/client/tabcomplete.c
index d9e6cb1..7bd6eca 100644
--- a/client/tabcomplete.c
+++ b/client/tabcomplete.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tabcomplete.c,v 1.19 2007-05-08 08:22:35 adam Exp $
  */
 
 #include <string.h>
diff --git a/client/tabcomplete.h b/client/tabcomplete.h
index 8abb9a7..d7e80d8 100644
--- a/client/tabcomplete.h
+++ b/client/tabcomplete.h
@@ -1,8 +1,28 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * See the file LICENSE for details.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Index Data nor the names of its contributors
+ *       may be used to endorse or promote products derived from this
+ *       software without specific prior written permission.
  *
- * $Id: tabcomplete.h,v 1.9 2007-04-12 13:52:57 adam Exp $
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /* 
diff --git a/header.c b/header.c
index f7f24db..8658e57 100644
--- a/header.c
+++ b/header.c
@@ -1,9 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: header.c,v 1.11 2007-01-03 08:42:13 adam Exp $
- *
  */
 
 /*
diff --git a/include/yaz/backend.h b/include/yaz/backend.h
index b508627..2ebeee8 100644
--- a/include/yaz/backend.h
+++ b/include/yaz/backend.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/ccl.h b/include/yaz/ccl.h
index e6c5af2..4f65026 100644
--- a/include/yaz/ccl.h
+++ b/include/yaz/ccl.h
@@ -1,45 +1,28 @@
-/*
- * Copyright (c) 1995, the EUROPAGATE consortium (see below).
- *
- * The EUROPAGATE consortium members are:
- *
- *    University College Dublin
- *    Danmarks Teknologiske Videnscenter
- *    An Chomhairle Leabharlanna
- *    Consejo Superior de Investigaciones Cientificas
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation, in whole or in part, for any purpose, is hereby granted,
- * provided that:
- *
- * 1. This copyright and permission notice appear in all copies of the
- * software and its documentation. Notices of copyright or attribution
- * which appear at the beginning of any file must remain unchanged.
- *
- * 2. The names of EUROPAGATE or the project partners may not be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * 3. Users of this software (implementors and gateway operators) agree to
- * inform the EUROPAGATE consortium of their use of the software. This
- * information will be used to evaluate the EUROPAGATE project and the
- * software, and to plan further developments. The consortium may use
- * the information in later publications.
- * 
- * 4. Users of this software agree to make their best efforts, when
- * documenting their use of the software, to acknowledge the EUROPAGATE
- * consortium, and the role played by the software in their work.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
  *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL THE EUROPAGATE CONSORTIUM OR ITS MEMBERS BE LIABLE
- * FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF
- * ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
- * OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND
- * ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
- * USE OR PERFORMANCE OF THIS SOFTWARE.
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Index Data nor the names of its contributors
+ *       may be used to endorse or promote products derived from this
+ *       software without specific prior written permission.
  *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /** \file ccl.h
diff --git a/include/yaz/ccl_xml.h b/include/yaz/ccl_xml.h
index 19814c1..a7abed6 100644
--- a/include/yaz/ccl_xml.h
+++ b/include/yaz/ccl_xml.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/charneg.h b/include/yaz/charneg.h
index 485af0a..973f5ae 100644
--- a/include/yaz/charneg.h
+++ b/include/yaz/charneg.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/comstack.h b/include/yaz/comstack.h
index c78d6dc..46aef6c 100644
--- a/include/yaz/comstack.h
+++ b/include/yaz/comstack.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/copy_types.h b/include/yaz/copy_types.h
index 6340843..5a25abd 100644
--- a/include/yaz/copy_types.h
+++ b/include/yaz/copy_types.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/cql.h b/include/yaz/cql.h
index ddd7144..84570e8 100644
--- a/include/yaz/cql.h
+++ b/include/yaz/cql.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/daemon.h b/include/yaz/daemon.h
index 34902f9..02cb3fb 100644
--- a/include/yaz/daemon.h
+++ b/include/yaz/daemon.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2008, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/icu.h b/include/yaz/icu.h
index 066fdfb..bcc5d33 100644
--- a/include/yaz/icu.h
+++ b/include/yaz/icu.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/icu_I18N.h b/include/yaz/icu_I18N.h
index a61de4b..5be3957 100644
--- a/include/yaz/icu_I18N.h
+++ b/include/yaz/icu_I18N.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/ill.h b/include/yaz/ill.h
index bac208d..bb2e1ae 100644
--- a/include/yaz/ill.h
+++ b/include/yaz/ill.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/libxml2_error.h b/include/yaz/libxml2_error.h
index 540187b..ceb3471 100644
--- a/include/yaz/libxml2_error.h
+++ b/include/yaz/libxml2_error.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/log.h b/include/yaz/log.h
index 103cf1f..5b1e5be 100644
--- a/include/yaz/log.h
+++ b/include/yaz/log.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/logrpn.h b/include/yaz/logrpn.h
index 86293d5..352fc14 100644
--- a/include/yaz/logrpn.h
+++ b/include/yaz/logrpn.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/marcdisp.h b/include/yaz/marcdisp.h
index 81c5632..75bf1ad 100644
--- a/include/yaz/marcdisp.h
+++ b/include/yaz/marcdisp.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2008, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/match_glob.h b/include/yaz/match_glob.h
index a3e044e..9cf19a7 100644
--- a/include/yaz/match_glob.h
+++ b/include/yaz/match_glob.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/mutex.h b/include/yaz/mutex.h
index 009e091..2fb24e1 100644
--- a/include/yaz/mutex.h
+++ b/include/yaz/mutex.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/nmem.h b/include/yaz/nmem.h
index d63bd27..1676cfe 100644
--- a/include/yaz/nmem.h
+++ b/include/yaz/nmem.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/nmem_xml.h b/include/yaz/nmem_xml.h
index 854a07e..6378093 100644
--- a/include/yaz/nmem_xml.h
+++ b/include/yaz/nmem_xml.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/odr.h b/include/yaz/odr.h
index d9d77df..4694aa2 100644
--- a/include/yaz/odr.h
+++ b/include/yaz/odr.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/oid_db.h b/include/yaz/oid_db.h
index fb0304d..6aeec74 100644
--- a/include/yaz/oid_db.h
+++ b/include/yaz/oid_db.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/oid_util.h b/include/yaz/oid_util.h
index 42b8c07..744300d 100644
--- a/include/yaz/oid_util.h
+++ b/include/yaz/oid_util.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/options.h b/include/yaz/options.h
index 29a0955..edc602f 100644
--- a/include/yaz/options.h
+++ b/include/yaz/options.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2008, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/otherinfo.h b/include/yaz/otherinfo.h
index ed41c91..e267c88 100644
--- a/include/yaz/otherinfo.h
+++ b/include/yaz/otherinfo.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/poll.h b/include/yaz/poll.h
index 08ac9b5..3a11496 100644
--- a/include/yaz/poll.h
+++ b/include/yaz/poll.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/pquery.h b/include/yaz/pquery.h
index 066b560..a4ea1a0 100644
--- a/include/yaz/pquery.h
+++ b/include/yaz/pquery.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/proto.h b/include/yaz/proto.h
index 7031804..531610e 100644
--- a/include/yaz/proto.h
+++ b/include/yaz/proto.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/prt-ext.h b/include/yaz/prt-ext.h
index 04d8adb..3eba377 100644
--- a/include/yaz/prt-ext.h
+++ b/include/yaz/prt-ext.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/query-charset.h b/include/yaz/query-charset.h
index 572ba09..48ea791 100644
--- a/include/yaz/query-charset.h
+++ b/include/yaz/query-charset.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/querytowrbuf.h b/include/yaz/querytowrbuf.h
index c89f8b0..9708ccd 100644
--- a/include/yaz/querytowrbuf.h
+++ b/include/yaz/querytowrbuf.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/readconf.h b/include/yaz/readconf.h
index af71a26..ed72b1e 100644
--- a/include/yaz/readconf.h
+++ b/include/yaz/readconf.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/record_conv.h b/include/yaz/record_conv.h
index f60740d..71adf38 100644
--- a/include/yaz/record_conv.h
+++ b/include/yaz/record_conv.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/retrieval.h b/include/yaz/retrieval.h
index a6ce256..8d20b95 100644
--- a/include/yaz/retrieval.h
+++ b/include/yaz/retrieval.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/snprintf.h b/include/yaz/snprintf.h
index ee93e6c..9d1cc26 100644
--- a/include/yaz/snprintf.h
+++ b/include/yaz/snprintf.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/soap.h b/include/yaz/soap.h
index df47bff..c4b9e3f 100644
--- a/include/yaz/soap.h
+++ b/include/yaz/soap.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/sortspec.h b/include/yaz/sortspec.h
index f6e7537..ca5bb7d 100644
--- a/include/yaz/sortspec.h
+++ b/include/yaz/sortspec.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/srw.h b/include/yaz/srw.h
index 633af53..3ae7815 100644
--- a/include/yaz/srw.h
+++ b/include/yaz/srw.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/statserv.h b/include/yaz/statserv.h
index c3046a4..ec5cb7a 100644
--- a/include/yaz/statserv.h
+++ b/include/yaz/statserv.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/tcpip.h b/include/yaz/tcpip.h
index 0b5d3a2..b67ce62 100644
--- a/include/yaz/tcpip.h
+++ b/include/yaz/tcpip.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/test.h b/include/yaz/test.h
index ff34d17..93ff3e8 100644
--- a/include/yaz/test.h
+++ b/include/yaz/test.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/timing.h b/include/yaz/timing.h
index 6058701..0f96357 100644
--- a/include/yaz/timing.h
+++ b/include/yaz/timing.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/tokenizer.h b/include/yaz/tokenizer.h
index 5d62dc8..2a8f396 100644
--- a/include/yaz/tokenizer.h
+++ b/include/yaz/tokenizer.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/tpath.h b/include/yaz/tpath.h
index 44e064a..4b01d45 100644
--- a/include/yaz/tpath.h
+++ b/include/yaz/tpath.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/unix.h b/include/yaz/unix.h
index 53ea488..ee8ce1a 100644
--- a/include/yaz/unix.h
+++ b/include/yaz/unix.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/wrbuf.h b/include/yaz/wrbuf.h
index dc2a75d..c69c3ad 100644
--- a/include/yaz/wrbuf.h
+++ b/include/yaz/wrbuf.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2008, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/xmalloc.h b/include/yaz/xmalloc.h
index 9e8e840..290f23d 100644
--- a/include/yaz/xmalloc.h
+++ b/include/yaz/xmalloc.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/xmlquery.h b/include/yaz/xmlquery.h
index 67abce0..4b4e554 100644
--- a/include/yaz/xmlquery.h
+++ b/include/yaz/xmlquery.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/xmltypes.h b/include/yaz/xmltypes.h
index 2c905db..39c7da5 100644
--- a/include/yaz/xmltypes.h
+++ b/include/yaz/xmltypes.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/yaz-ccl.h b/include/yaz/yaz-ccl.h
index d2ab815..843674d 100644
--- a/include/yaz/yaz-ccl.h
+++ b/include/yaz/yaz-ccl.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/yaz-iconv.h b/include/yaz/yaz-iconv.h
index b975a5c..d066694 100644
--- a/include/yaz/yaz-iconv.h
+++ b/include/yaz/yaz-iconv.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/yaz-util.h b/include/yaz/yaz-util.h
index e8ac43e..4fc37eb 100644
--- a/include/yaz/yaz-util.h
+++ b/include/yaz/yaz-util.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/yaz-version.h b/include/yaz/yaz-version.h
index e204aa6..b5d5dfa 100644
--- a/include/yaz/yaz-version.h
+++ b/include/yaz/yaz-version.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2008, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/yconfig.h b/include/yaz/yconfig.h
index 9e4a595..f523a74 100644
--- a/include/yaz/yconfig.h
+++ b/include/yaz/yconfig.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/zgdu.h b/include/yaz/zgdu.h
index 3a65137..1d4d7df 100644
--- a/include/yaz/zgdu.h
+++ b/include/yaz/zgdu.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/include/yaz/zoom.h b/include/yaz/zoom.h
index a02778d..9b2d21f 100644
--- a/include/yaz/zoom.h
+++ b/include/yaz/zoom.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/advancegreek.c b/src/advancegreek.c
index 56f3dc0..7792073 100644
--- a/src/advancegreek.c
+++ b/src/advancegreek.c
@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
  */
 /**
diff --git a/src/atoin.c b/src/atoin.c
index fc40f19..e7718c5 100644
--- a/src/atoin.c
+++ b/src/atoin.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: atoin.c,v 1.8 2007-01-03 08:42:15 adam Exp $
  */
 
 /** 
diff --git a/src/ber_any.c b/src/ber_any.c
index 6f0e977..7aecc67 100644
--- a/src/ber_any.c
+++ b/src/ber_any.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ber_any.c,v 1.6 2007-01-03 08:42:15 adam Exp $
  */
 
 /** 
diff --git a/src/ber_bit.c b/src/ber_bit.c
index 211fa4e..5de79f5 100644
--- a/src/ber_bit.c
+++ b/src/ber_bit.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ber_bit.c,v 1.5 2007-01-03 08:42:15 adam Exp $
  */
 
 /** 
diff --git a/src/ber_bool.c b/src/ber_bool.c
index c8f6725..c01fd5a 100644
--- a/src/ber_bool.c
+++ b/src/ber_bool.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ber_bool.c,v 1.6 2007-01-03 08:42:15 adam Exp $
  */
 
 /** 
diff --git a/src/ber_int.c b/src/ber_int.c
index f9a61ae..f0680fb 100644
--- a/src/ber_int.c
+++ b/src/ber_int.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ber_int.c,v 1.7 2007-01-03 08:42:15 adam Exp $
  */
 
 /** 
diff --git a/src/ber_len.c b/src/ber_len.c
index 00be87c..b2f9a52 100644
--- a/src/ber_len.c
+++ b/src/ber_len.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ber_len.c,v 1.6 2007-01-03 08:42:15 adam Exp $
  */
 
 /** 
diff --git a/src/ber_null.c b/src/ber_null.c
index 3d743ae..44ec9bd 100644
--- a/src/ber_null.c
+++ b/src/ber_null.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ber_null.c,v 1.6 2007-01-03 08:42:15 adam Exp $
  */
 
 /** 
diff --git a/src/ber_oct.c b/src/ber_oct.c
index a31ba85..2002ec1 100644
--- a/src/ber_oct.c
+++ b/src/ber_oct.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ber_oct.c,v 1.5 2007-01-03 08:42:15 adam Exp $
  */
 
 /** 
diff --git a/src/ber_oid.c b/src/ber_oid.c
index c5dd5ea..dc72163 100644
--- a/src/ber_oid.c
+++ b/src/ber_oid.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ber_oid.c,v 1.9 2007-01-03 08:42:15 adam Exp $
  */
 
 /** 
diff --git a/src/ber_tag.c b/src/ber_tag.c
index a6b6ae8..59c324a 100644
--- a/src/ber_tag.c
+++ b/src/ber_tag.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ber_tag.c,v 1.8 2007-03-19 21:08:13 adam Exp $
  */
 
 /** 
diff --git a/src/ccl_stop_words.c b/src/ccl_stop_words.c
index 19b6d06..9dab91a 100644
--- a/src/ccl_stop_words.c
+++ b/src/ccl_stop_words.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ccl_stop_words.c,v 1.3 2008-01-09 21:35:23 adam Exp $
  */
 /** 
  * \file ccl_stop_words.c
diff --git a/src/cclerrms.c b/src/cclerrms.c
index b7ddd61..0ac3483 100644
--- a/src/cclerrms.c
+++ b/src/cclerrms.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: cclerrms.c,v 1.4 2008-01-09 21:32:27 adam Exp $
  */
 /** 
  * \file cclerrms.c
diff --git a/src/cclfind.c b/src/cclfind.c
index efc094c..d8cccbd 100644
--- a/src/cclfind.c
+++ b/src/cclfind.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: cclfind.c,v 1.15 2008-01-09 21:32:27 adam Exp $
  */
 /** 
  * \file cclfind.c
diff --git a/src/cclp.h b/src/cclp.h
index 24930f3..8dfa04d 100644
--- a/src/cclp.h
+++ b/src/cclp.h
@@ -1,8 +1,28 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
- * See the file LICENSE for details.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Index Data nor the names of its contributors
+ *       may be used to endorse or promote products derived from this
+ *       software without specific prior written permission.
  *
- * $Id: cclp.h,v 1.5 2007-05-01 12:22:11 adam Exp $
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /** 
diff --git a/src/cclptree.c b/src/cclptree.c
index d53345b..55d8ef8 100644
--- a/src/cclptree.c
+++ b/src/cclptree.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: cclptree.c,v 1.11 2008-01-09 21:32:27 adam Exp $
  */
 /** 
  * \file cclptree.c
diff --git a/src/cclqfile.c b/src/cclqfile.c
index 4906af8..96c8c75 100644
--- a/src/cclqfile.c
+++ b/src/cclqfile.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: cclqfile.c,v 1.12 2008-01-09 21:32:28 adam Exp $
  */
 /** 
  * \file cclqfile.c
diff --git a/src/cclqual.c b/src/cclqual.c
index de44650..6be36dd 100644
--- a/src/cclqual.c
+++ b/src/cclqual.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: cclqual.c,v 1.13 2008-01-09 21:32:28 adam Exp $
  */
 /** 
  * \file cclqual.c
diff --git a/src/cclstr.c b/src/cclstr.c
index a5b73d8..9b359e7 100644
--- a/src/cclstr.c
+++ b/src/cclstr.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: cclstr.c,v 1.4 2008-01-09 21:32:28 adam Exp $
  */
 /** 
  * \file cclstr.c
diff --git a/src/ccltoken.c b/src/ccltoken.c
index 150006f..b18834a 100644
--- a/src/ccltoken.c
+++ b/src/ccltoken.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ccltoken.c,v 1.15 2008-01-09 21:32:28 adam Exp $
  */
 /** 
  * \file ccltoken.c
diff --git a/src/cclxmlconfig.c b/src/cclxmlconfig.c
index 321073b..c339861 100644
--- a/src/cclxmlconfig.c
+++ b/src/cclxmlconfig.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * All rights reserved.
- *
- * $Id: cclxmlconfig.c,v 1.1 2007-01-08 13:20:58 adam Exp $
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
  */
 
 /** \file cclxmlconfig.c
diff --git a/src/charneg.c b/src/charneg.c
index 9f88490..4ca4ba4 100644
--- a/src/charneg.c
+++ b/src/charneg.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: charneg.c,v 1.9 2007-04-16 21:53:09 adam Exp $
  */
 
 /** 
diff --git a/src/comstack.c b/src/comstack.c
index 4c8fe05..0623457 100644
--- a/src/comstack.c
+++ b/src/comstack.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: comstack.c,v 1.22 2007-11-30 11:44:47 adam Exp $
  */
 
 /** 
diff --git a/src/copy_types.c b/src/copy_types.c
index c01d8e8..bfd9b00 100644
--- a/src/copy_types.c
+++ b/src/copy_types.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * All rights reserved.
- *
- * $Id: copy_types.c,v 1.1 2007-04-30 08:29:07 adam Exp $
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
  */
 
 /** \file copy_types.c
diff --git a/src/cqlstdio.c b/src/cqlstdio.c
index 83a1fe0..d5458cb 100644
--- a/src/cqlstdio.c
+++ b/src/cqlstdio.c
@@ -1,11 +1,7 @@
-/* $Id: cqlstdio.c,v 1.5 2007-01-03 08:42:15 adam Exp $
-   Copyright (C) 1995-2007, Index Data ApS
-   Index Data Aps
-
-This file is part of the YAZ toolkit.
-
-See the file LICENSE for details.
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 /**
  * \file cqlstdio.c
diff --git a/src/cqlstrer.c b/src/cqlstrer.c
index 43362f0..84bfac8 100644
--- a/src/cqlstrer.c
+++ b/src/cqlstrer.c
@@ -1,11 +1,7 @@
-/* $Id: cqlstrer.c,v 1.7 2007-01-03 08:42:15 adam Exp $
-   Copyright (C) 1995-2007, Index Data ApS
-   Index Data Aps
-
-This file is part of the YAZ toolkit.
-
-See the file LICENSE details.
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 /**
  * \file cqlstrer.c
diff --git a/src/cqlstring.c b/src/cqlstring.c
index d9923e5..fb2af49 100644
--- a/src/cqlstring.c
+++ b/src/cqlstring.c
@@ -1,11 +1,7 @@
-/* $Id: cqlstring.c,v 1.6 2007-01-03 08:42:15 adam Exp $
-   Copyright (C) 1995-2007, Index Data ApS
-   Index Data Aps
-
-This file is part of the YAZ toolkit.
-
-See the file LICENSE for details.
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 /**
  * \file cqlstring.c
diff --git a/src/cqltransform.c b/src/cqltransform.c
index 35e4219..6cd8c10 100644
--- a/src/cqltransform.c
+++ b/src/cqltransform.c
@@ -1,11 +1,7 @@
-/* $Id: cqltransform.c,v 1.32 2008-01-06 19:34:34 adam Exp $
-   Copyright (C) 1995-2007, Index Data ApS
-   Index Data Aps
-
-This file is part of the YAZ toolkit.
-
-See the file LICENSE.
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 /**
  * \file cqltransform.c
diff --git a/src/cqlutil.c b/src/cqlutil.c
index 2c25dea..eb6e24d 100644
--- a/src/cqlutil.c
+++ b/src/cqlutil.c
@@ -1,11 +1,7 @@
-/* $Id: cqlutil.c,v 1.13 2008-01-06 16:22:02 adam Exp $
-   Copyright (C) 1995-2007, Index Data ApS
-   Index Data Aps
-
-This file is part of the YAZ toolkit.
-
-See the file LICENSE for details.
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 /**
  * \file cqlutil.c
diff --git a/src/daemon.c b/src/daemon.c
index 53dc766..82fe6cf 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: daemon.c,v 1.3 2008-02-21 10:18:15 adam Exp $
  */
 
 /**
diff --git a/src/diag-entry.c b/src/diag-entry.c
index 40f54c4..4be0e23 100644
--- a/src/diag-entry.c
+++ b/src/diag-entry.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: diag-entry.c,v 1.4 2007-01-03 08:42:15 adam Exp $
  */
 
 /**
diff --git a/src/diag-entry.h b/src/diag-entry.h
index afc9b25..2a3a81e 100644
--- a/src/diag-entry.h
+++ b/src/diag-entry.h
@@ -1,8 +1,28 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * See the file LICENSE for details.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Index Data nor the names of its contributors
+ *       may be used to endorse or promote products derived from this
+ *       software without specific prior written permission.
  *
- * $Id: diag-entry.h,v 1.4 2007-01-03 08:42:15 adam Exp $
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
diff --git a/src/dumpber.c b/src/dumpber.c
index a60cb3c..9fd46af 100644
--- a/src/dumpber.c
+++ b/src/dumpber.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: dumpber.c,v 1.5 2007-01-03 08:42:15 adam Exp $
  */
 
 /**
diff --git a/src/elementset.c b/src/elementset.c
index 3e453d5..8d9816b 100644
--- a/src/elementset.c
+++ b/src/elementset.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: elementset.c,v 1.4 2007-05-06 20:12:20 adam Exp $
  */
 /**
  * \file elementset.c
diff --git a/src/eventl.c b/src/eventl.c
index f2963a1..dffdbe7 100644
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: eventl.c,v 1.17 2007-11-30 11:44:47 adam Exp $
  */
 
 /**
diff --git a/src/eventl.h b/src/eventl.h
index ac24123..d6d7d8f 100644
--- a/src/eventl.h
+++ b/src/eventl.h
@@ -1,8 +1,28 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
- * See the file LICENSE for details.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Index Data nor the names of its contributors
+ *       may be used to endorse or promote products derived from this
+ *       software without specific prior written permission.
  *
- * $Id: eventl.h,v 1.9 2007-11-12 08:41:56 adam Exp $
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
diff --git a/src/grs1disp.c b/src/grs1disp.c
index 9195ea0..dc5a5bd 100644
--- a/src/grs1disp.c
+++ b/src/grs1disp.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: grs1disp.c,v 1.8 2007-05-08 08:22:36 adam Exp $
  */
 
 /**
diff --git a/src/http.c b/src/http.c
index 3d62fcd..018fbca 100644
--- a/src/http.c
+++ b/src/http.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: http.c,v 1.4 2007-11-30 11:44:47 adam Exp $
  */
 
 /**
diff --git a/src/iconv-p.h b/src/iconv-p.h
index f9cc91e..1b199fd 100644
--- a/src/iconv-p.h
+++ b/src/iconv-p.h
@@ -1,7 +1,28 @@
-/*
- * Copyright (C) 2005-2008, Index Data ApS
- * See the file LICENSE for details.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Index Data nor the names of its contributors
+ *       may be used to endorse or promote products derived from this
+ *       software without specific prior written permission.
  *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
  * \file
diff --git a/src/iconv_encode_iso_8859_1.c b/src/iconv_encode_iso_8859_1.c
index f847186..b2d11ee 100644
--- a/src/iconv_encode_iso_8859_1.c
+++ b/src/iconv_encode_iso_8859_1.c
@@ -1,7 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
  */
 /**
  * \file
diff --git a/src/iconv_encode_marc8.c b/src/iconv_encode_marc8.c
index c4e95a4..a07bd2a 100644
--- a/src/iconv_encode_marc8.c
+++ b/src/iconv_encode_marc8.c
@@ -1,7 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
  */
 /**
  * \file
diff --git a/src/iconv_encode_wchar.c b/src/iconv_encode_wchar.c
index 764988f..cf0a5f6 100644
--- a/src/iconv_encode_wchar.c
+++ b/src/iconv_encode_wchar.c
@@ -1,7 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
  */
 /**
  * \file
diff --git a/src/icu_I18N.c b/src/icu_I18N.c
index bdfe5a6..0bbd010 100644
--- a/src/icu_I18N.c
+++ b/src/icu_I18N.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: icu_I18N.c,v 1.22 2007-12-17 11:23:16 adam Exp $
  */
 
 #if HAVE_CONFIG_H
diff --git a/src/ill-get.c b/src/ill-get.c
index 87f9d6c..6885ad4 100644
--- a/src/ill-get.c
+++ b/src/ill-get.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ill-get.c,v 1.6 2007-01-03 08:42:15 adam Exp $
  */
 
 /**
diff --git a/src/initopt.c b/src/initopt.c
index d1cd75e..d3228b2 100644
--- a/src/initopt.c
+++ b/src/initopt.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: initopt.c,v 1.7 2007-01-03 08:42:15 adam Exp $
  */
 
 /**
diff --git a/src/iso5428.c b/src/iso5428.c
index de8044b..752f9c8 100644
--- a/src/iso5428.c
+++ b/src/iso5428.c
@@ -1,7 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
  */
 /**
  * \file
diff --git a/src/libxml2_error.c b/src/libxml2_error.c
index e5b5ce0..41d9284 100644
--- a/src/libxml2_error.c
+++ b/src/libxml2_error.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: libxml2_error.c,v 1.4 2007-02-23 10:15:01 adam Exp $
  */
 /**
  * \file libxml2_error.c
diff --git a/src/log.c b/src/log.c
index 93a2555..47464fe 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: log.c,v 1.55 2008-02-18 16:44:48 adam Exp $
  */
 
 /**
diff --git a/src/logrpn.c b/src/logrpn.c
index 9972020..7521b09 100644
--- a/src/logrpn.c
+++ b/src/logrpn.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * All rights reserved.
- *
- * $Id: logrpn.c,v 1.18 2007-05-08 08:22:36 adam Exp $
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
  */
 
 /**
diff --git a/src/marc_read_iso2709.c b/src/marc_read_iso2709.c
index cf3f0aa..fd02c64 100644
--- a/src/marc_read_iso2709.c
+++ b/src/marc_read_iso2709.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: marc_read_iso2709.c,v 1.2 2007-01-03 08:42:15 adam Exp $
  */
 
 /**
diff --git a/src/marc_read_line.c b/src/marc_read_line.c
index 2d204ef..b3bbe80 100644
--- a/src/marc_read_line.c
+++ b/src/marc_read_line.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: marc_read_line.c,v 1.6 2007-03-18 13:00:37 adam Exp $
  */
 
 /**
diff --git a/src/marc_read_xml.c b/src/marc_read_xml.c
index 31a718b..c4b2190 100644
--- a/src/marc_read_xml.c
+++ b/src/marc_read_xml.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: marc_read_xml.c,v 1.4 2007-12-17 20:59:30 adam Exp $
  */
 
 /**
diff --git a/src/marcdisp.c b/src/marcdisp.c
index d3c6c92..06a4afe 100644
--- a/src/marcdisp.c
+++ b/src/marcdisp.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: marcdisp.c,v 1.54 2008-01-30 19:59:02 adam Exp $
  */
 
 /**
diff --git a/src/match_glob.c b/src/match_glob.c
index 3430883..7700f65 100644
--- a/src/match_glob.c
+++ b/src/match_glob.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: match_glob.c,v 1.1 2007-10-24 13:50:02 adam Exp $
  */
 
 /**
diff --git a/src/matchstr.c b/src/matchstr.c
index 3a319d3..b078150 100644
--- a/src/matchstr.c
+++ b/src/matchstr.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: matchstr.c,v 1.7 2007-01-03 08:42:15 adam Exp $
  */
 
 /**
diff --git a/src/mime.c b/src/mime.c
index 67c7b8f..5a515c3 100644
--- a/src/mime.c
+++ b/src/mime.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: mime.c,v 1.4 2007-05-06 20:12:20 adam Exp $
  */
 
 /** \file mime.c
diff --git a/src/mime.h b/src/mime.h
index ffb35bb..f749bed 100644
--- a/src/mime.h
+++ b/src/mime.h
@@ -1,8 +1,28 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * See the file LICENSE for details.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
  *
- * $Id: mime.h,v 1.4 2007-01-03 08:42:15 adam Exp $
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Index Data nor the names of its contributors
+ *       may be used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /** \file mime.h
diff --git a/src/mutex.c b/src/mutex.c
index b2c8c49..3491f83 100644
--- a/src/mutex.c
+++ b/src/mutex.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: mutex.c,v 1.1 2007-04-17 20:26:18 adam Exp $
  */
 
 /**
diff --git a/src/nmem.c b/src/nmem.c
index 9ad8c28..ff34165 100644
--- a/src/nmem.c
+++ b/src/nmem.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: nmem.c,v 1.30 2007-04-17 20:26:18 adam Exp $
  */
 
 /**
diff --git a/src/nmemsdup.c b/src/nmemsdup.c
index 95f182c..0fe7373 100644
--- a/src/nmemsdup.c
+++ b/src/nmemsdup.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: nmemsdup.c,v 1.11 2007-05-06 20:12:20 adam Exp $
  */
 
 /**
diff --git a/src/odr-priv.h b/src/odr-priv.h
index 7d5cfee..bf74065 100644
--- a/src/odr-priv.h
+++ b/src/odr-priv.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2008, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/odr.c b/src/odr.c
index beb2986..1ad9c4a 100644
--- a/src/odr.c
+++ b/src/odr.c
@@ -1,9 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr.c,v 1.16 2007-03-19 21:08:13 adam Exp $
- *
  */
 
 /**
diff --git a/src/odr_any.c b/src/odr_any.c
index 3d190d9..12c2f94 100644
--- a/src/odr_any.c
+++ b/src/odr_any.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_any.c,v 1.6 2007-01-03 08:42:15 adam Exp $
  */
 
 /**
diff --git a/src/odr_bit.c b/src/odr_bit.c
index 2622281..599893e 100644
--- a/src/odr_bit.c
+++ b/src/odr_bit.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_bit.c,v 1.7 2007-03-19 21:08:13 adam Exp $
  */
 
 /**
diff --git a/src/odr_bool.c b/src/odr_bool.c
index 7c9279e..2eaa2ea 100644
--- a/src/odr_bool.c
+++ b/src/odr_bool.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_bool.c,v 1.7 2007-03-19 21:08:13 adam Exp $
  */
 
 /**
diff --git a/src/odr_choice.c b/src/odr_choice.c
index b3744ca..30a0631 100644
--- a/src/odr_choice.c
+++ b/src/odr_choice.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_choice.c,v 1.8 2007-03-19 21:08:13 adam Exp $
  */
 
 /**
diff --git a/src/odr_cons.c b/src/odr_cons.c
index 2f88087..b047edc 100644
--- a/src/odr_cons.c
+++ b/src/odr_cons.c
@@ -1,9 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_cons.c,v 1.9 2007-03-19 21:08:13 adam Exp $
- *
  */
 
 /**
diff --git a/src/odr_enum.c b/src/odr_enum.c
index d994c70..535e80b 100644
--- a/src/odr_enum.c
+++ b/src/odr_enum.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_enum.c,v 1.7 2007-03-19 21:08:13 adam Exp $
  */
 /**
  * \file odr_enum.c
diff --git a/src/odr_int.c b/src/odr_int.c
index 8c4b158..68663b5 100644
--- a/src/odr_int.c
+++ b/src/odr_int.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_int.c,v 1.7 2007-03-19 21:08:13 adam Exp $
  */
 /**
  * \file odr_int.c
diff --git a/src/odr_mem.c b/src/odr_mem.c
index 314361e..c970f6b 100644
--- a/src/odr_mem.c
+++ b/src/odr_mem.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_mem.c,v 1.12 2007-09-11 08:35:42 adam Exp $
  */
 /**
  * \file odr_mem.c
diff --git a/src/odr_null.c b/src/odr_null.c
index e3a8ab8..6272449 100644
--- a/src/odr_null.c
+++ b/src/odr_null.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_null.c,v 1.8 2007-03-19 21:08:13 adam Exp $
  */
 /**
  * \file odr_null.c
diff --git a/src/odr_oct.c b/src/odr_oct.c
index 5dd02bb..2ddd491 100644
--- a/src/odr_oct.c
+++ b/src/odr_oct.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_oct.c,v 1.13 2007-05-21 11:51:01 adam Exp $
  */
 /**
  * \file odr_oct.c
diff --git a/src/odr_oid.c b/src/odr_oid.c
index a9dc76c..cb725e2 100644
--- a/src/odr_oid.c
+++ b/src/odr_oid.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_oid.c,v 1.11 2007-05-08 08:22:36 adam Exp $
  */
 /**
  * \file odr_oid.c
diff --git a/src/odr_seq.c b/src/odr_seq.c
index b9413e7..577dbae 100644
--- a/src/odr_seq.c
+++ b/src/odr_seq.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_seq.c,v 1.7 2007-03-19 21:08:13 adam Exp $
  */
 /**
  * \file odr_seq.c
diff --git a/src/odr_tag.c b/src/odr_tag.c
index ba83507..b3a6c99 100644
--- a/src/odr_tag.c
+++ b/src/odr_tag.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_tag.c,v 1.7 2007-03-19 21:08:13 adam Exp $
  */
 /**
  * \file odr_tag.c
diff --git a/src/odr_use.c b/src/odr_use.c
index 1dc27f3..65f0295 100644
--- a/src/odr_use.c
+++ b/src/odr_use.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_use.c,v 1.5 2007-01-03 08:42:15 adam Exp $
  */
 /**
  * \file odr_use.c
diff --git a/src/odr_util.c b/src/odr_util.c
index b42ee79..20009c1 100644
--- a/src/odr_util.c
+++ b/src/odr_util.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_util.c,v 1.13 2007-05-08 08:22:36 adam Exp $
  */
 /**
  * \file odr_util.c
diff --git a/src/oid_db.c b/src/oid_db.c
index 60d3e54..104ff93 100644
--- a/src/oid_db.c
+++ b/src/oid_db.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: oid_db.c,v 1.10 2007-11-30 11:42:04 adam Exp $
  */
 
 /**
diff --git a/src/oid_util.c b/src/oid_util.c
index c630ebf..0975d3a 100644
--- a/src/oid_util.c
+++ b/src/oid_util.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: oid_util.c,v 1.4 2007-05-08 08:22:36 adam Exp $
  */
 
 /**
diff --git a/src/opacdisp.c b/src/opacdisp.c
index f8e89ca..e16d643 100644
--- a/src/opacdisp.c
+++ b/src/opacdisp.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: opacdisp.c,v 1.10 2008-01-30 20:00:55 adam Exp $
  */
 /**
  * \file opacdisp.c
diff --git a/src/options.c b/src/options.c
index e66b13e..35f4e6f 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: options.c,v 1.7 2008-02-20 10:03:42 adam Exp $
  */
 /**
  * \file options.c
diff --git a/src/otherinfo.c b/src/otherinfo.c
index de6e94f..802c10c 100644
--- a/src/otherinfo.c
+++ b/src/otherinfo.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: otherinfo.c,v 1.8 2007-05-08 08:22:36 adam Exp $
  */
 /**
  * \file otherinfo.c
diff --git a/src/poll.c b/src/poll.c
index 4c76605..9c24f1e 100644
--- a/src/poll.c
+++ b/src/poll.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: poll.c,v 1.5 2008-01-21 13:09:07 adam Exp $
  */
 /**
  * \file 
diff --git a/src/pquery.c b/src/pquery.c
index dcb0cb5..23d7b64 100644
--- a/src/pquery.c
+++ b/src/pquery.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: pquery.c,v 1.12 2007-05-08 08:22:36 adam Exp $
  */
 /**
  * \file pquery.c
diff --git a/src/prt-ext.c b/src/prt-ext.c
index 3770d36..84234ed 100644
--- a/src/prt-ext.c
+++ b/src/prt-ext.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: prt-ext.c,v 1.13 2007-05-08 08:22:36 adam Exp $
  */
 
 /**
diff --git a/src/query-charset.c b/src/query-charset.c
index 049d1e7..94a1901 100644
--- a/src/query-charset.c
+++ b/src/query-charset.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * All rights reserved.
- *
- * $Id: query-charset.c,v 1.3 2007-05-03 22:20:45 adam Exp $
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
  */
 
 /** \file query-charset.c
diff --git a/src/querytowrbuf.c b/src/querytowrbuf.c
index 2cfd081..3a0847a 100644
--- a/src/querytowrbuf.c
+++ b/src/querytowrbuf.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * All rights reserved.
- *
- * $Id: querytowrbuf.c,v 1.11 2007-05-08 08:22:36 adam Exp $
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
  */
 
 /** \file querytowrbuf.c
diff --git a/src/readconf.c b/src/readconf.c
index 28a21bd..60f7486 100644
--- a/src/readconf.c
+++ b/src/readconf.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * All rights reserved.
- *
- * $Id: readconf.c,v 1.7 2007-01-03 08:42:15 adam Exp $
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
  */
 
 /**
diff --git a/src/record_conv.c b/src/record_conv.c
index 592f497..372e827 100644
--- a/src/record_conv.c
+++ b/src/record_conv.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2005-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: record_conv.c,v 1.17 2007-12-16 11:08:51 adam Exp $
  */
 /**
  * \file record_conv.c
diff --git a/src/requestq.c b/src/requestq.c
index 1a264a7..7b06a39 100644
--- a/src/requestq.c
+++ b/src/requestq.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: requestq.c,v 1.5 2007-01-03 08:42:15 adam Exp $
  */
 /**
  * \file requestq.c
diff --git a/src/retrieval.c b/src/retrieval.c
index 724ff25..eabdfec 100644
--- a/src/retrieval.c
+++ b/src/retrieval.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2005-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: retrieval.c,v 1.22 2008-01-25 16:28:26 adam Exp $
  */
 /**
  * \file retrieval.c
diff --git a/src/service.c b/src/service.c
index 7ed3770..ac938dd 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1,8 +1,6 @@
-/*
- * NT Service interface Utility.
- *  Based on code written by
- *     Chas Woodfield, Fretwell Downing Informatics.
- * $Id: service.c,v 1.5 2007-01-03 08:42:15 adam Exp $
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
  */
 
 /**
diff --git a/src/service.h b/src/service.h
index f137b67..6cc5543 100644
--- a/src/service.h
+++ b/src/service.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2008, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/seshigh.c b/src/seshigh.c
index 7c01886..a0d79fa 100644
--- a/src/seshigh.c
+++ b/src/seshigh.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: seshigh.c,v 1.128 2007-09-11 08:37:53 adam Exp $
  */
 /**
  * \file seshigh.c
diff --git a/src/session.h b/src/session.h
index 21e986f..faa8601 100644
--- a/src/session.h
+++ b/src/session.h
@@ -1,8 +1,28 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * See the file LICENSE for details.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Index Data nor the names of its contributors
+ *       may be used to endorse or promote products derived from this
+ *       software without specific prior written permission.
  *
- * $Id: session.h,v 1.15 2007-08-13 16:46:19 mike Exp $
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
  * \file session.h
diff --git a/src/siconv.c b/src/siconv.c
index e0f3514..b6bcf0e 100644
--- a/src/siconv.c
+++ b/src/siconv.c
@@ -1,5 +1,5 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
  */
 /**
diff --git a/src/snprintf.c b/src/snprintf.c
index e69cf9c..0221f97 100644
--- a/src/snprintf.c
+++ b/src/snprintf.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: snprintf.c,v 1.2 2007-02-26 14:24:00 adam Exp $
  */
 /**
  * \file snprintf.c
diff --git a/src/soap.c b/src/soap.c
index 3b47dcf..5dbd490 100644
--- a/src/soap.c
+++ b/src/soap.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: soap.c,v 1.18 2007-05-06 20:12:20 adam Exp $
  */
 /**
  * \file soap.c
diff --git a/src/sortspec.c b/src/sortspec.c
index 8d9272e..2bed2a5 100644
--- a/src/sortspec.c
+++ b/src/sortspec.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: sortspec.c,v 1.10 2007-04-16 21:53:09 adam Exp $
  */
 /**
  * \file sortspec.c
diff --git a/src/srw.c b/src/srw.c
index 93037e9..6cd8224 100644
--- a/src/srw.c
+++ b/src/srw.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: srw.c,v 1.58 2007-09-09 05:54:45 adam Exp $
  */
 /**
  * \file srw.c
diff --git a/src/srwutil.c b/src/srwutil.c
index a3459fe..7d1da02 100644
--- a/src/srwutil.c
+++ b/src/srwutil.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: srwutil.c,v 1.65 2008-01-28 09:51:02 adam Exp $
  */
 /**
  * \file srwutil.c
diff --git a/src/statserv.c b/src/statserv.c
index 63a5efb..b20b670 100644
--- a/src/statserv.c
+++ b/src/statserv.c
@@ -1,11 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * NT threaded server code by
- *   Chas Woodfield, Fretwell Downing Informatics.
- *
- * $Id: statserv.c,v 1.52 2007-11-12 08:57:45 adam Exp $
  */
 
 /**
diff --git a/src/tcpdchk.c b/src/tcpdchk.c
index 1a9d786..d19f8f6 100644
--- a/src/tcpdchk.c
+++ b/src/tcpdchk.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tcpdchk.c,v 1.9 2007-01-03 08:42:15 adam Exp $
  */
 /**
  * \file tcpdchk.c
diff --git a/src/tcpip.c b/src/tcpip.c
index ee80c6b..b992319 100644
--- a/src/tcpip.c
+++ b/src/tcpip.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tcpip.c,v 1.41 2008-01-21 13:34:34 adam Exp $
  */
 /**
  * \file tcpip.c
diff --git a/src/test.c b/src/test.c
index 7beefb1..d1471dd 100644
--- a/src/test.c
+++ b/src/test.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: test.c,v 1.12 2007-01-03 08:42:15 adam Exp $
  */
 
 /** \file test.c
diff --git a/src/timing.c b/src/timing.c
index d26ab69..6a3bb13 100644
--- a/src/timing.c
+++ b/src/timing.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: timing.c,v 1.6 2007-06-06 16:32:34 adam Exp $
  */
 
 /**
diff --git a/src/tokenizer.c b/src/tokenizer.c
index 96438d6..27e48be 100644
--- a/src/tokenizer.c
+++ b/src/tokenizer.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tokenizer.c,v 1.4 2007-05-16 10:47:49 adam Exp $
  */
 
 /**
diff --git a/src/tpath.c b/src/tpath.c
index c5b804b..d4eb5b5 100644
--- a/src/tpath.c
+++ b/src/tpath.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tpath.c,v 1.13 2007-01-03 08:42:15 adam Exp $
  */
 /**
  * \file tpath.c
diff --git a/src/ucs4.c b/src/ucs4.c
index 43e9f84..d298224 100644
--- a/src/ucs4.c
+++ b/src/ucs4.c
@@ -1,7 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
  */
 /**
  * \file
diff --git a/src/unix.c b/src/unix.c
index 41b3bc6..5d6cad1 100644
--- a/src/unix.c
+++ b/src/unix.c
@@ -1,9 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: unix.c,v 1.20 2007-10-09 06:00:56 adam Exp $
- * UNIX socket COMSTACK. By Morten Bogeskov.
  */
 /**
  * \file unix.c
diff --git a/src/utf8.c b/src/utf8.c
index 37ee04c..42515ca 100644
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -1,7 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
  */
 /**
  * \file
diff --git a/src/version.c b/src/version.c
index 0b5256d..003c709 100644
--- a/src/version.c
+++ b/src/version.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: version.c,v 1.6 2007-01-13 08:57:47 adam Exp $
  */
 
 /**
diff --git a/src/waislen.c b/src/waislen.c
index fc9a9c7..5557bb2 100644
--- a/src/waislen.c
+++ b/src/waislen.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: waislen.c,v 1.6 2007-10-09 06:00:56 adam Exp $
  */
 /**
  * \file waislen.c
diff --git a/src/wrbuf.c b/src/wrbuf.c
index 2e8c4f7..e80f98a 100644
--- a/src/wrbuf.c
+++ b/src/wrbuf.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: wrbuf.c,v 1.23 2008-01-30 19:58:25 adam Exp $
  */
 
 /**
diff --git a/src/xcqlutil.c b/src/xcqlutil.c
index 99327c5..da6976a 100644
--- a/src/xcqlutil.c
+++ b/src/xcqlutil.c
@@ -1,11 +1,7 @@
-/* $Id: xcqlutil.c,v 1.9 2008-01-06 16:22:02 adam Exp $
-   Copyright (C) 1995-2007, Index Data ApS
-   Index Data Aps
-
-This file is part of the YAZ toolkit.
-
-See the file LICENSE.
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 /**
  * \file xcqlutil.c
diff --git a/src/xmalloc.c b/src/xmalloc.c
index 8ef1d8f..d5d6dad 100644
--- a/src/xmalloc.c
+++ b/src/xmalloc.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * All rights reserved.
- *
- * $Id: xmalloc.c,v 1.9 2007-01-03 08:42:15 adam Exp $
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
  */
 /**
  * \file xmalloc.c
diff --git a/src/xmlerror.c b/src/xmlerror.c
index 70bd639..067ef25 100644
--- a/src/xmlerror.c
+++ b/src/xmlerror.c
@@ -1,6 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
- * All rights reserved.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
  */
 
 /** \file
diff --git a/src/xmlquery.c b/src/xmlquery.c
index b3a3f84..1c73920 100644
--- a/src/xmlquery.c
+++ b/src/xmlquery.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
- * All rights reserved.
- *
- * $Id: xmlquery.c,v 1.15 2007-05-06 20:12:20 adam Exp $
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
  */
 
 /** \file xmlquery.c
diff --git a/src/yaz-ccl.c b/src/yaz-ccl.c
index 8fe39c8..8eef9af 100644
--- a/src/yaz-ccl.c
+++ b/src/yaz-ccl.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: yaz-ccl.c,v 1.6 2007-03-19 14:40:07 adam Exp $
  */
 /**
  * \file yaz-ccl.c
diff --git a/src/zgdu.c b/src/zgdu.c
index f79bc9b..1986589 100644
--- a/src/zgdu.c
+++ b/src/zgdu.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: zgdu.c,v 1.19 2007-01-11 10:55:57 adam Exp $
  */
 
 /**
diff --git a/src/zget.c b/src/zget.c
index 156bfd9..f40dfde 100644
--- a/src/zget.c
+++ b/src/zget.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: zget.c,v 1.15 2007-05-06 20:12:20 adam Exp $
  */
 /**
  * \file zget.c
diff --git a/src/zoom-c.c b/src/zoom-c.c
index 34f4c60..b59c14a 100644
--- a/src/zoom-c.c
+++ b/src/zoom-c.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: zoom-c.c,v 1.154 2008-01-28 09:51:02 adam Exp $
  */
 /**
  * \file zoom-c.c
diff --git a/src/zoom-opt.c b/src/zoom-opt.c
index 42cc577..3b72785 100644
--- a/src/zoom-opt.c
+++ b/src/zoom-opt.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: zoom-opt.c,v 1.9 2008-01-07 17:32:49 adam Exp $
  */
 /**
  * \file zoom-opt.c
diff --git a/src/zoom-p.h b/src/zoom-p.h
index 39b13c9..c2125a1 100644
--- a/src/zoom-p.h
+++ b/src/zoom-p.h
@@ -1,8 +1,28 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
- * See the file LICENSE for details.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Index Data nor the names of its contributors
+ *       may be used to endorse or promote products derived from this
+ *       software without specific prior written permission.
  *
- * $Id: zoom-p.h,v 1.25 2007-09-11 08:40:28 adam Exp $
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
  * \file zoom-p.h
diff --git a/src/zoom-socket.c b/src/zoom-socket.c
index 2d9d686..c83deea 100644
--- a/src/zoom-socket.c
+++ b/src/zoom-socket.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: zoom-socket.c,v 1.8 2007-11-30 11:44:47 adam Exp $
  */
 /**
  * \file zoom-socket.c
diff --git a/test/tst_comstack.c b/test/tst_comstack.c
index 4c2ed58..016d897 100644
--- a/test/tst_comstack.c
+++ b/test/tst_comstack.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tst_comstack.c,v 1.2 2007-10-09 06:00:56 adam Exp $
  */
 
 #include <stdlib.h>
diff --git a/test/tst_filepath.c b/test/tst_filepath.c
index 9f023a0..82da9f1 100644
--- a/test/tst_filepath.c
+++ b/test/tst_filepath.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tst_filepath.c,v 1.2 2007-01-03 08:42:16 adam Exp $
  */
 
 #if HAVE_CONFIG_H
diff --git a/test/tst_icu_I18N.c b/test/tst_icu_I18N.c
index 4bef665..f5e3e76 100644
--- a/test/tst_icu_I18N.c
+++ b/test/tst_icu_I18N.c
@@ -1,9 +1,6 @@
-/*
- * Copyright (C) 2005-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tst_icu_I18N.c,v 1.15 2007-11-12 11:11:16 adam Exp $
- *
  */
 
 /* DO NOT EDIT THIS FILE IF YOUR EDITOR DOES NOT SUPPORT UTF-8 */
diff --git a/test/tst_match_glob.c b/test/tst_match_glob.c
index dab3efc..4279681 100644
--- a/test/tst_match_glob.c
+++ b/test/tst_match_glob.c
@@ -1,24 +1,7 @@
-/* $Id: tst_match_glob.c,v 1.1 2007-10-24 13:50:03 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-This file is part of the Zebra server.
-
-Zebra 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, or (at your option) any later
-version.
-
-Zebra 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 St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 #include <yaz/test.h>
 #include <yaz/match_glob.h>
diff --git a/test/tst_oid.c b/test/tst_oid.c
index fb23b7e..c3005cd 100644
--- a/test/tst_oid.c
+++ b/test/tst_oid.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tst_oid.c,v 1.1 2007-06-24 19:27:12 adam Exp $
  */
 
 #include <stdlib.h>
diff --git a/test/tst_query_charset.c b/test/tst_query_charset.c
index 439a478..97af417 100644
--- a/test/tst_query_charset.c
+++ b/test/tst_query_charset.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tst_query_charset.c,v 1.2 2007-04-30 08:29:08 adam Exp $
  */
 
 #include <stdlib.h>
diff --git a/test/tst_record_conv.c b/test/tst_record_conv.c
index 609b61c..ac81620 100644
--- a/test/tst_record_conv.c
+++ b/test/tst_record_conv.c
@@ -1,9 +1,6 @@
-/*
- * Copyright (C) 2005-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tst_record_conv.c,v 1.16 2007-03-20 21:37:32 adam Exp $
- *
  */
 #include <yaz/record_conv.h>
 #include <yaz/test.h>
diff --git a/test/tst_retrieval.c b/test/tst_retrieval.c
index 8ed48ea..cb561e4 100644
--- a/test/tst_retrieval.c
+++ b/test/tst_retrieval.c
@@ -1,9 +1,6 @@
-/*
- * Copyright (C) 2005-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tst_retrieval.c,v 1.10 2007-03-19 14:40:07 adam Exp $
- *
  */
 #include <yaz/retrieval.h>
 #include <yaz/test.h>
diff --git a/test/tst_timing.c b/test/tst_timing.c
index 84d19be..f7f20fc 100644
--- a/test/tst_timing.c
+++ b/test/tst_timing.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tst_timing.c,v 1.3 2007-01-05 14:05:55 adam Exp $
  */
 
 #include <stdlib.h>
diff --git a/test/tst_tpath.c b/test/tst_tpath.c
index e951b98..b0a82c8 100644
--- a/test/tst_tpath.c
+++ b/test/tst_tpath.c
@@ -1,9 +1,6 @@
-/*
- * Copyright (C) 2005-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tst_tpath.c,v 1.3 2007-01-03 08:42:16 adam Exp $
- *
  */
 #include <yaz/tpath.h>
 #include <yaz/test.h>
diff --git a/test/tstccl.c b/test/tstccl.c
index 95975cc..daf2fb6 100644
--- a/test/tstccl.c
+++ b/test/tstccl.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstccl.c,v 1.17 2007-04-27 09:48:28 adam Exp $
  */
 
 /* CCL test */
diff --git a/test/tsticonv.c b/test/tsticonv.c
index c5184d7..200c5b9 100644
--- a/test/tsticonv.c
+++ b/test/tsticonv.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tsticonv.c,v 1.35 2008-03-12 08:53:28 adam Exp $
  */
 
 #if HAVE_CONFIG_H
diff --git a/test/tstlog.c b/test/tstlog.c
index 2fcacaf..529c346 100644
--- a/test/tstlog.c
+++ b/test/tstlog.c
@@ -1,9 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstlog.c,v 1.14 2007-06-05 06:40:28 adam Exp $
- *
  */
 #include <stdio.h>
 #include <string.h>
diff --git a/test/tstlogthread.c b/test/tstlogthread.c
index b35da02..9125cf3 100644
--- a/test/tstlogthread.c
+++ b/test/tstlogthread.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (c) 1998-2007, Index Data.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- * 
- * $Id: tstlogthread.c,v 1.6 2007-04-18 11:50:47 mike Exp $
  */
 
 #if HAVE_CONFIG_H
diff --git a/test/tstmatchstr.c b/test/tstmatchstr.c
index 9d75eb1..8beb6e2 100644
--- a/test/tstmatchstr.c
+++ b/test/tstmatchstr.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstmatchstr.c,v 1.6 2007-01-03 08:42:16 adam Exp $
  */
 
 #include <stdio.h>
diff --git a/test/tstnmem.c b/test/tstnmem.c
index 4d51ed7..aeda13a 100644
--- a/test/tstnmem.c
+++ b/test/tstnmem.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstnmem.c,v 1.8 2007-04-17 20:26:18 adam Exp $
  */
 
 #if HAVE_CONFIG_H
diff --git a/test/tstodr.c b/test/tstodr.c
index b57c656..99cef61 100644
--- a/test/tstodr.c
+++ b/test/tstodr.c
@@ -1,9 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstodr.c,v 1.12 2007-08-13 16:23:30 mike Exp $
- *
  */
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/test/tstodrstack.c b/test/tstodrstack.c
index f6349bc..01060cd 100644
--- a/test/tstodrstack.c
+++ b/test/tstodrstack.c
@@ -1,9 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstodrstack.c,v 1.6 2007-01-03 08:42:16 adam Exp $
- *
  */
 #include <stdlib.h>
 #include <yaz/pquery.h>
diff --git a/test/tstpquery.c b/test/tstpquery.c
index 82fbd30..ef4b43a 100644
--- a/test/tstpquery.c
+++ b/test/tstpquery.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstpquery.c,v 1.5 2007-03-19 14:40:07 adam Exp $
  */
 
 #include <stdlib.h>
diff --git a/test/tstsoap1.c b/test/tstsoap1.c
index fa57214..6d6654f 100644
--- a/test/tstsoap1.c
+++ b/test/tstsoap1.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstsoap1.c,v 1.9 2007-01-03 08:42:16 adam Exp $
  */
 
 #include <stdlib.h>
diff --git a/test/tstsoap2.c b/test/tstsoap2.c
index 30e613e..b0d2455 100644
--- a/test/tstsoap2.c
+++ b/test/tstsoap2.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstsoap2.c,v 1.6 2007-01-03 08:42:16 adam Exp $
  */
 
 #include <stdlib.h>
diff --git a/test/tstwrbuf.c b/test/tstwrbuf.c
index 52e2fbf..79e5388 100644
--- a/test/tstwrbuf.c
+++ b/test/tstwrbuf.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstwrbuf.c,v 1.7 2007-03-19 14:40:07 adam Exp $
  */
 
 #include <stdlib.h>
diff --git a/test/tstxmlquery.c b/test/tstxmlquery.c
index 0857804..6548774 100644
--- a/test/tstxmlquery.c
+++ b/test/tstxmlquery.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tstxmlquery.c,v 1.16 2007-03-19 22:17:41 adam Exp $
  */
 
 #include <stdlib.h>
diff --git a/util/benchmark.c b/util/benchmark.c
index 0119dc8..bc94ffd 100644
--- a/util/benchmark.c
+++ b/util/benchmark.c
@@ -1,14 +1,6 @@
-/* $Id: benchmark.c,v 1.10 2007-01-03 08:42:16 adam Exp $
- * Copyright (C) 1995-2007, Index Data ApS
- *
- * This file is part of the YAZ toolkit.
- *
- * See the file LICENSE.
- *
- * This is an elementary benchmarker for server performance.  It works
- * by repeatedly connecting to, seaching in and retrieving from the
- * specified server, and keeps statistics about the minimum, maximum
- * and average times for each operation.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
  */
 
 #include <stdlib.h>
diff --git a/util/cclsh.c b/util/cclsh.c
index 322d515..bc9f4b5 100644
--- a/util/cclsh.c
+++ b/util/cclsh.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: cclsh.c,v 1.9 2008-01-09 21:32:28 adam Exp $
  */
 
 #include <stdio.h>
diff --git a/util/cql2pqf.c b/util/cql2pqf.c
index 4faab79..ac2a457 100644
--- a/util/cql2pqf.c
+++ b/util/cql2pqf.c
@@ -1,11 +1,7 @@
-/* $Id: cql2pqf.c,v 1.9 2007-01-03 08:42:16 adam Exp $
-   Copyright (C) 1995-2007, Index Data ApS
-   Index Data Aps
-
-This file is part of the YAZ toolkit.
-
-See the file LICENSE.
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/util/cql2xcql.c b/util/cql2xcql.c
index 7a3b07f..cee2646 100644
--- a/util/cql2xcql.c
+++ b/util/cql2xcql.c
@@ -1,11 +1,7 @@
-/* $Id: cql2xcql.c,v 1.8 2007-01-03 08:42:16 adam Exp $
-   Copyright (C) 1995-2007, Index Data ApS
-   Index Data Aps
-
-This file is part of the YAZ toolkit.
-
-See the file LICENSE.
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/util/marcdump.c b/util/marcdump.c
index cb72a84..ed2096a 100644
--- a/util/marcdump.c
+++ b/util/marcdump.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: marcdump.c,v 1.55 2007-12-18 21:13:06 adam Exp $
  */
 
 #define _FILE_OFFSET_BITS 64
diff --git a/util/srwtst.c b/util/srwtst.c
index 31a362e..7de077c 100644
--- a/util/srwtst.c
+++ b/util/srwtst.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: srwtst.c,v 1.8 2007-05-06 20:12:20 adam Exp $
  */
 
 #include <stdlib.h>
diff --git a/util/yaz-icu.c b/util/yaz-icu.c
index 4f0368e..30d9048 100644
--- a/util/yaz-icu.c
+++ b/util/yaz-icu.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: yaz-icu.c,v 1.16 2008-01-14 22:58:06 adam Exp $
  */
 
 #if HAVE_CONFIG_H
diff --git a/util/yaz-illclient.c b/util/yaz-illclient.c
index b65c9e6..791cf56 100644
--- a/util/yaz-illclient.c
+++ b/util/yaz-illclient.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2006, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: yaz-illclient.c,v 1.9 2007-11-30 11:44:47 adam Exp $
  */
 
 /* WARNING - This is work in progress - not at all ready */
diff --git a/util/yaz-xmlquery.c b/util/yaz-xmlquery.c
index c4c9a4d..b40ddaf 100644
--- a/util/yaz-xmlquery.c
+++ b/util/yaz-xmlquery.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: yaz-xmlquery.c,v 1.9 2007-05-06 20:12:20 adam Exp $
  */
 
 #include <stdlib.h>
diff --git a/util/yaziconv.c b/util/yaziconv.c
index 72dd075..9f7f797 100644
--- a/util/yaziconv.c
+++ b/util/yaziconv.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: yaziconv.c,v 1.9 2007-05-25 16:19:46 marc Exp $
  */
 
 #if HAVE_CONFIG_H
diff --git a/zoom/zoom-benchmark.c b/zoom/zoom-benchmark.c
index 229f3cd..589c7df 100644
--- a/zoom/zoom-benchmark.c
+++ b/zoom/zoom-benchmark.c
@@ -1,7 +1,6 @@
-/*
- * $Id: zoom-benchmark.c,v 1.20 2007-05-06 20:35:43 adam Exp $
- *
- * Asynchronous multi-target client doing search and piggyback retrieval
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
  */
 
 #include <stdio.h>
diff --git a/zoom/zoom-bug-641.c b/zoom/zoom-bug-641.c
index 1009a34..66b6d60 100644
--- a/zoom/zoom-bug-641.c
+++ b/zoom/zoom-bug-641.c
@@ -1,8 +1,7 @@
-/* $Id: zoom-bug-641.c,v 1.3 2007-05-06 20:12:21 adam Exp $  */
-
-/** \file zoom-bug641.c
-    \brief Program to illustrate bug 641
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/zoom/zoom-ka.c b/zoom/zoom-ka.c
index 13fa4c6..c53473e 100644
--- a/zoom/zoom-ka.c
+++ b/zoom/zoom-ka.c
@@ -1,8 +1,7 @@
-/* $Id: zoom-ka.c,v 1.2 2007-01-03 08:42:17 adam Exp $  */
-
-/** \file zoom-ka.c
-    \brief Test ZOOM Keepalive / reconnect
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 3bd5fe4..f575294 100644
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: zoomsh.c,v 1.50 2007-09-11 15:16:20 adam Exp $
  */
 
 /** \file zoomsh.c
diff --git a/zoom/zoomtst1.c b/zoom/zoomtst1.c
index b3dae58..e879d19 100644
--- a/zoom/zoomtst1.c
+++ b/zoom/zoomtst1.c
@@ -1,8 +1,7 @@
-/* $Id: zoomtst1.c,v 1.6 2007-01-03 08:42:17 adam Exp $  */
-
-/** \file zoomtst1.c
-    \brief Synchronous single-target client doing search (but no retrieval)
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/zoom/zoomtst10.c b/zoom/zoomtst10.c
index a02c199..e770d7a 100644
--- a/zoom/zoomtst10.c
+++ b/zoom/zoomtst10.c
@@ -1,8 +1,7 @@
-/* $Id: zoomtst10.c,v 1.4 2007-01-03 08:42:17 adam Exp $  */
-
-/** \file zoomtst10.c
-    \brief Synchronous single-target search using CCL conversion
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/zoom/zoomtst11.c b/zoom/zoomtst11.c
index 942e2a9..40bca1b 100644
--- a/zoom/zoomtst11.c
+++ b/zoom/zoomtst11.c
@@ -1,8 +1,7 @@
-/* $Id: zoomtst11.c,v 1.2 2007-03-07 13:12:42 adam Exp $  */
-
-/** \file zoomtst11.c
-    \brief Asynchronous single-target which tests event/error handling
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/zoom/zoomtst2.c b/zoom/zoomtst2.c
index 43aeaff..b9a00a4 100644
--- a/zoom/zoomtst2.c
+++ b/zoom/zoomtst2.c
@@ -1,8 +1,7 @@
-/* $Id: zoomtst2.c,v 1.9 2007-01-03 08:42:17 adam Exp $  */
-
-/** \file zoomtst2.c
-    \brief Asynchronous single-target client performing search (no retrieval)
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/zoom/zoomtst3.c b/zoom/zoomtst3.c
index 98f797c..8873db8 100644
--- a/zoom/zoomtst3.c
+++ b/zoom/zoomtst3.c
@@ -1,10 +1,7 @@
-/* $Id: zoomtst3.c,v 1.13 2007-01-10 13:25:46 adam Exp $  */
-
-/** \file zoomtst3.c
-    \brief Asynchronous multi-target client
-    
-    Performs search and piggyback retrieval of records
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/zoom/zoomtst4.c b/zoom/zoomtst4.c
index a9bf85c..510802e 100644
--- a/zoom/zoomtst4.c
+++ b/zoom/zoomtst4.c
@@ -1,11 +1,7 @@
-/* $Id: zoomtst4.c,v 1.10 2007-01-03 08:42:17 adam Exp $  */
-
-/** \file zoomtst4.c
-    \brief Asynchronous multi-target client with separate present
-    
-    Asynchronous multi-target going through proxy doing search and retrieve
-    using present.
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/zoom/zoomtst5.c b/zoom/zoomtst5.c
index c88b762..0203670 100644
--- a/zoom/zoomtst5.c
+++ b/zoom/zoomtst5.c
@@ -1,10 +1,7 @@
-/* $Id: zoomtst5.c,v 1.12 2007-01-03 08:42:17 adam Exp $  */
-
-/** \file zoomtst5.c
-    \brief Asynchronous multi-target client with sort
-    
-    Asynchronous multi-target client doing search, sort and present
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/zoom/zoomtst6.c b/zoom/zoomtst6.c
index 891a419..931e399 100644
--- a/zoom/zoomtst6.c
+++ b/zoom/zoomtst6.c
@@ -1,8 +1,7 @@
-/* $Id: zoomtst6.c,v 1.13 2007-01-03 08:42:17 adam Exp $  */
-
-/** \file zoomtst6.c
-    \brief Asynchronous multi-target client with two searches
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 #include <stdio.h>
 #include <yaz/nmem.h>
diff --git a/zoom/zoomtst7.c b/zoom/zoomtst7.c
index 235b470..7ded3df 100644
--- a/zoom/zoomtst7.c
+++ b/zoom/zoomtst7.c
@@ -1,8 +1,7 @@
-/* $Id: zoomtst7.c,v 1.19 2007-04-17 20:26:19 adam Exp $  */
-
-/** \file zoomtst7.c
-    \brief Mix of operations
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/zoom/zoomtst8.c b/zoom/zoomtst8.c
index 40c8f90..f818e40 100644
--- a/zoom/zoomtst8.c
+++ b/zoom/zoomtst8.c
@@ -1,8 +1,7 @@
-/* $Id: zoomtst8.c,v 1.8 2007-03-21 11:27:47 adam Exp $  */
-
-/** \file zoomtst8.c
-    \brief Asynchronous multi-target client doing scan
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/zoom/zoomtst9.c b/zoom/zoomtst9.c
index fd01158..db1840b 100644
--- a/zoom/zoomtst9.c
+++ b/zoom/zoomtst9.c
@@ -1,8 +1,7 @@
-/* $Id: zoomtst9.c,v 1.5 2007-01-03 08:42:17 adam Exp $  */
-
-/** \file zoomtst9.c
-    \brief Extended Service Update
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
+ * See the file LICENSE for details.
+ */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/ztest/read-grs.c b/ztest/read-grs.c
index 1821de5..ed806cf 100644
--- a/ztest/read-grs.c
+++ b/ztest/read-grs.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: read-grs.c,v 1.14 2007-01-03 08:42:18 adam Exp $
  */
 
 /*
diff --git a/ztest/read-marc.c b/ztest/read-marc.c
index 9388048..cecbabc 100644
--- a/ztest/read-marc.c
+++ b/ztest/read-marc.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: read-marc.c,v 1.10 2007-05-06 20:12:22 adam Exp $
  */
 
 /*
diff --git a/ztest/ztest.c b/ztest/ztest.c
index 650236e..bf8e82a 100644
--- a/ztest/ztest.c
+++ b/ztest/ztest.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ztest.c,v 1.95 2007-08-14 12:22:51 adam Exp $
  */
 
 /*