Updated copyright headers. Omit CVS IDs.

diff --git a/README b/README
index 9920d5d..4b24bcb 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,5 @@
 YAZ proxy - A Z39.50/SRU proxy.
 
 YAZ proxy - A Z39.50/SRU proxy.
 

-$Id: README,v 1.6 2006-06-14 10:12:23 adam Exp $
-

 Introduction
 ------------
 
 Introduction
 ------------
 

diff --git a/buildconf.sh b/buildconf.sh
index aa4288b..d71be7a 100755 (executable)
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
 #!/bin/sh

-# $Id: buildconf.sh,v 1.12 2006-05-26 19:57:35 adam Exp $

 
 test -d config || mkdir config
 if test -d m4/.git -a -d doc/common/.git; then
 
 test -d config || mkdir config
 if test -d m4/.git -a -d doc/common/.git; then

diff --git a/configure.ac b/configure.ac
index 7671bfd..eaa499b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,5 @@
-dnl yazproxy, Index Data 1994-2008
+dnl This file is part of YAZ proxy

 dnl See the file LICENSE for details.
 dnl See the file LICENSE for details.

-dnl $Id: configure.ac,v 1.20 2008-02-22 14:59:57 adam Exp $

 AC_PREREQ(2.60)
 AC_INIT([yazproxy],[1.3.3],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_PREREQ(2.60)
 AC_INIT([yazproxy],[1.3.3],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2d56e46..e0c3f66 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,3 @@
-## $Id: Makefile.am,v 1.18 2007-07-10 09:42:09 adam Exp $

 SUBDIRS = common
 
 XMLFILES = \
 SUBDIRS = common
 
 XMLFILES = \

diff --git a/doc/entities.ent b/doc/entities.ent
index d4b8dfa..e198635 100644 (file)
--- a/doc/entities.ent
+++ b/doc/entities.ent
@@ -1,4 +1,3 @@
-<!-- $Id: entities.ent,v 1.1 2006-05-26 19:59:58 adam Exp $ -->

 <!ENTITY chap-introduction SYSTEM "introduction.xml">
 <!ENTITY chap-installation SYSTEM "installation.xml">
 <!ENTITY chap-using SYSTEM "using.xml">
 <!ENTITY chap-introduction SYSTEM "introduction.xml">
 <!ENTITY chap-installation SYSTEM "installation.xml">
 <!ENTITY chap-using SYSTEM "using.xml">

diff --git a/doc/installation.xml b/doc/installation.xml
index e45f355..364e4fd 100644 (file)
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -1,5 +1,4 @@
 <chapter id="installation">
 <chapter id="installation">

-  <!-- $Id: installation.xml,v 1.12 2006-06-14 10:12:26 adam Exp $ -->

   <title>Installation</title>
   <para>
    You need a C++ compiler to compile and use YAZ proxy.
   <title>Installation</title>
   <para>
    You need a C++ compiler to compile and use YAZ proxy.

diff --git a/doc/introduction.xml b/doc/introduction.xml
index b67101b..04536cc 100644 (file)
--- a/doc/introduction.xml
+++ b/doc/introduction.xml
@@ -1,4 +1,3 @@
-<!-- $Id: introduction.xml,v 1.9 2006-06-14 10:12:26 adam Exp $ -->

  <chapter id="introduction"><title>Introduction</title>
   <para>
    The <ulink url="&url.yazproxy;">YAZ Proxy</ulink> is
  <chapter id="introduction"><title>Introduction</title>
   <para>
    The <ulink url="&url.yazproxy;">YAZ Proxy</ulink> is

diff --git a/doc/license.xml b/doc/license.xml
index 8be8e0c..2f70c64 100644 (file)
--- a/doc/license.xml
+++ b/doc/license.xml
@@ -1,11 +1,10 @@
-<!-- $Id: license.xml,v 1.3 2004-04-15 12:04:01 adam Exp $ -->

  <appendix id="license"><title>License</title>
   
   <section id="gpl"><title>GPL</title>
    
    <para>
     YAZ Proxy,
  <appendix id="license"><title>License</title>
   
   <section id="gpl"><title>GPL</title>
    
    <para>
     YAZ Proxy,

-    Copyright &copy; 1999-2004 Index Data ApS.
+    Copyright &copy; 1998-2008 Index Data.

    </para>
    
    <para>
    </para>
    
    <para>

@@ -25,8 +24,8 @@
    <para>
     You should have received a copy of the GNU General Public License
     along with YAZ Proxy; see the file LICENSE.proxy.  If not, write to the
    <para>
     You should have received a copy of the GNU General Public License
     along with YAZ Proxy; see the file LICENSE.proxy.  If not, write to the

-    Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-    02111-1307, USA.
+    Free Software Foundation,
+    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

    </para>
    
    <screen>
    </para>
    
    <screen>

@@ -34,7 +33,7 @@
                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.

-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

diff --git a/doc/local.ent.in b/doc/local.ent.in
index 5ba670c..22cfcf2 100644 (file)
--- a/doc/local.ent.in
+++ b/doc/local.ent.in
@@ -1,3 +1,2 @@
-<!-- $Id: local.ent.in,v 1.1 2006-06-02 08:53:23 adam Exp $ -->

 <!ENTITY version "@VERSION@">
 <!ENTITY prefix "@prefix@">
 <!ENTITY version "@VERSION@">
 <!ENTITY prefix "@prefix@">

diff --git a/doc/reference.xml b/doc/reference.xml
index bb0f5e0..98315f6 100644 (file)
--- a/doc/reference.xml
+++ b/doc/reference.xml
@@ -843,7 +843,6 @@
    <screen><![CDATA[
 <?xml version="1.0"?>
 <!-- XML Schema for YAZ proxy config file.
    <screen><![CDATA[
 <?xml version="1.0"?>
 <!-- XML Schema for YAZ proxy config file.

-    $Id: reference.xml,v 1.20 2006-06-14 10:12:26 adam Exp $

 -->
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
 -->
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"

diff --git a/doc/using.xml b/doc/using.xml
index 0dd2e3d..c2d09b6 100644 (file)
--- a/doc/using.xml
+++ b/doc/using.xml
@@ -186,7 +186,6 @@
    </para>
     <screen><![CDATA[
 <?xml version="1.0"?>
    </para>
     <screen><![CDATA[
 <?xml version="1.0"?>

-<!-- $Id: using.xml,v 1.7 2006-06-14 10:12:26 adam Exp $ -->

 <proxy xmlns="http://indexdata.dk/yazproxy/schema/0.9/">
   <target name="bagel">
     <url>indexdata.dk</url>
 <proxy xmlns="http://indexdata.dk/yazproxy/schema/0.9/">
   <target name="bagel">
     <url>indexdata.dk</url>

diff --git a/doc/yaz-proxy-man.xml b/doc/yaz-proxy-man.xml
index 31f13b8..84b2e60 100644 (file)
--- a/doc/yaz-proxy-man.xml
+++ b/doc/yaz-proxy-man.xml
@@ -3,7 +3,6 @@
 [
      <!ENTITY yaz-proxy-ref SYSTEM "yaz-proxy-ref.xml">
 ]>
 [
      <!ENTITY yaz-proxy-ref SYSTEM "yaz-proxy-ref.xml">
 ]>

-<!-- $Id: yaz-proxy-man.xml,v 1.2 2006-05-26 19:57:35 adam Exp $ -->

 <refentry id="yazproxy">
   &yaz-proxy-ref;
  <refsect1><title>SEE ALSO</title>
 <refentry id="yazproxy">
   &yaz-proxy-ref;
  <refsect1><title>SEE ALSO</title>

diff --git a/doc/yazproxy.xml b/doc/yazproxy.xml
index 45d8738..0230ba2 100644 (file)
--- a/doc/yazproxy.xml
+++ b/doc/yazproxy.xml
@@ -9,7 +9,6 @@
      <!ENTITY % idcommon SYSTEM "common/common.ent">
      %idcommon;
 ]>
      <!ENTITY % idcommon SYSTEM "common/common.ent">
      %idcommon;
 ]>

-<!-- $Id: yazproxy.xml,v 1.3 2007-05-22 11:12:01 adam Exp $ -->

 <book id="yazproxy">
  <bookinfo>
   <title>YAZ proxy User's Guide and Reference</title>
 <book id="yazproxy">
  <bookinfo>
   <title>YAZ proxy User's Guide and Reference</title>

@@ -30,7 +29,6 @@
     This manual covers version &version;.
     </simpara>
    <simpara>
     This manual covers version &version;.
     </simpara>
    <simpara>

-    CVS ID: $Id: yazproxy.xml,v 1.3 2007-05-22 11:12:01 adam Exp $

    </simpara>
    <simpara>
     <inlinemediaobject>
    </simpara>
    <simpara>
     <inlinemediaobject>

diff --git a/etc/MARC21slim2MODS.xsl b/etc/MARC21slim2MODS.xsl
index ff35524..955a498 100644 (file)
--- a/etc/MARC21slim2MODS.xsl
+++ b/etc/MARC21slim2MODS.xsl
@@ -1870,4 +1870,4 @@
 <metaInformation>\r
 <scenarios ><scenario default="yes" name="modstst2" userelativepaths="yes" externalpreview="no" url="..\..\..\..\..\..\marcxml\modstst2.xml" htmlbaseurl="" outputurl="" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="no" name="modstest" userelativepaths="yes" externalpreview="no" url="..\..\..\..\..\..\marcxml\modstest.xml" htmlbaseurl="" outputurl="" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="no" name="Scenario1" userelativepaths="yes" externalpreview="no" url="..\..\..\..\..\..\marcxml\t.xml" htmlbaseurl="" outputurl="" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/></scenarios><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>\r
 </metaInformation>\r
 <metaInformation>\r
 <scenarios ><scenario default="yes" name="modstst2" userelativepaths="yes" externalpreview="no" url="..\..\..\..\..\..\marcxml\modstst2.xml" htmlbaseurl="" outputurl="" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="no" name="modstest" userelativepaths="yes" externalpreview="no" url="..\..\..\..\..\..\marcxml\modstest.xml" htmlbaseurl="" outputurl="" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="no" name="Scenario1" userelativepaths="yes" externalpreview="no" url="..\..\..\..\..\..\marcxml\t.xml" htmlbaseurl="" outputurl="" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/></scenarios><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>\r
 </metaInformation>\r

--->
\ No newline at end of file
+-->

diff --git a/etc/MARC21slim2MODS3.xsl b/etc/MARC21slim2MODS3.xsl
index 9820e81..09c3ab3 100644 (file)
--- a/etc/MARC21slim2MODS3.xsl
+++ b/etc/MARC21slim2MODS3.xsl
@@ -2651,4 +2651,4 @@ Added Log Comment
 <metaInformation>
 <scenarios ><scenario default="no" name="Apr 02 Test" userelativepaths="yes" externalpreview="no" url="..\test_files\v3.xml" htmlbaseurl="" outputurl="..\..\..\temp\x.xml" processortype="xalan" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="no" name="v3Test1" userelativepaths="yes" externalpreview="no" url="..\test_files\v3.xml" htmlbaseurl="" outputurl="..\test_files\modsv3Converted.xml" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="yes" name="Scenario1" userelativepaths="yes" externalpreview="no" url="..\..\..\..\..\..\..\..\..\ckeith\DESKTOP\test.xml" htmlbaseurl="" outputurl="" processortype="xalan" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/></scenarios><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>
 </metaInformation>
 <metaInformation>
 <scenarios ><scenario default="no" name="Apr 02 Test" userelativepaths="yes" externalpreview="no" url="..\test_files\v3.xml" htmlbaseurl="" outputurl="..\..\..\temp\x.xml" processortype="xalan" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="no" name="v3Test1" userelativepaths="yes" externalpreview="no" url="..\test_files\v3.xml" htmlbaseurl="" outputurl="..\test_files\modsv3Converted.xml" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="yes" name="Scenario1" userelativepaths="yes" externalpreview="no" url="..\..\..\..\..\..\..\..\..\ckeith\DESKTOP\test.xml" htmlbaseurl="" outputurl="" processortype="xalan" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/></scenarios><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>
 </metaInformation>

--->
\ No newline at end of file
+-->

diff --git a/etc/MARC21slim2RDFDC.xsl b/etc/MARC21slim2RDFDC.xsl
index 2e81677..06afea4 100644 (file)
--- a/etc/MARC21slim2RDFDC.xsl
+++ b/etc/MARC21slim2RDFDC.xsl
@@ -194,4 +194,4 @@
 <metaInformation>\r
 <scenarios ><scenario default="no" name="MODS Website Samples" userelativepaths="yes" externalpreview="no" url="..\xml\MARC21slim\modswebsitesamples.xml" htmlbaseurl="" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="no" name="Ray Charles" userelativepaths="yes" externalpreview="no" url="..\xml\MARC21slim\raycharles.xml" htmlbaseurl="" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="yes" name="s6" userelativepaths="yes" externalpreview="no" url="..\ifla\sally6.xml" htmlbaseurl="" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="no" name="s7" userelativepaths="yes" externalpreview="no" url="..\ifla\sally7.xml" htmlbaseurl="" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="no" name="s12" userelativepaths="yes" externalpreview="no" url="..\ifla\sally12.xml" htmlbaseurl="" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/></scenarios><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>\r
 </metaInformation>\r
 <metaInformation>\r
 <scenarios ><scenario default="no" name="MODS Website Samples" userelativepaths="yes" externalpreview="no" url="..\xml\MARC21slim\modswebsitesamples.xml" htmlbaseurl="" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="no" name="Ray Charles" userelativepaths="yes" externalpreview="no" url="..\xml\MARC21slim\raycharles.xml" htmlbaseurl="" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="yes" name="s6" userelativepaths="yes" externalpreview="no" url="..\ifla\sally6.xml" htmlbaseurl="" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="no" name="s7" userelativepaths="yes" externalpreview="no" url="..\ifla\sally7.xml" htmlbaseurl="" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/><scenario default="no" name="s12" userelativepaths="yes" externalpreview="no" url="..\ifla\sally12.xml" htmlbaseurl="" processortype="internal" commandline="" additionalpath="" additionalclasspath="" postprocessortype="none" postprocesscommandline="" postprocessadditionalpath="" postprocessgeneratedext=""/></scenarios><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>\r
 </metaInformation>\r

--->
\ No newline at end of file
+-->

diff --git a/etc/MARC21slimUtils.xsl b/etc/MARC21slimUtils.xsl
index acfe598..5f3cce3 100644 (file)
--- a/etc/MARC21slimUtils.xsl
+++ b/etc/MARC21slimUtils.xsl
@@ -62,4 +62,4 @@
 <metaInformation>\r
 <scenarios/><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>\r
 </metaInformation>\r
 <metaInformation>\r
 <scenarios/><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>\r
 </metaInformation>\r

--->
\ No newline at end of file
+-->

diff --git a/etc/Makefile.am b/etc/Makefile.am
index 7d73ff5..1fae05a 100644 (file)
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,4 +1,3 @@
-# $Id: Makefile.am,v 1.8 2007-10-08 11:47:20 adam Exp $

 
 proxydatadir=$(datadir)/yazproxy
 proxydata_DATA = \
 
 proxydatadir=$(datadir)/yazproxy
 proxydata_DATA = \

diff --git a/etc/config-mafi2ma.xml b/etc/config-mafi2ma.xml
index 4934aae..6b75594 100644 (file)
--- a/etc/config-mafi2ma.xml
+++ b/etc/config-mafi2ma.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>

-<!-- $Id: config-mafi2ma.xml,v 1.2 2004-12-06 08:00:28 adam Exp $ -->

 <proxy xmlns="http://indexdata.dk/yazproxy/schema/0.8/"
  xmlns:xi="http://www.w3.org/2001/XInclude"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 <proxy xmlns="http://indexdata.dk/yazproxy/schema/0.8/"
  xmlns:xi="http://www.w3.org/2001/XInclude"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

diff --git a/etc/config-modules.xml b/etc/config-modules.xml
index 91aef13..bdfccae 100644 (file)
--- a/etc/config-modules.xml
+++ b/etc/config-modules.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>

-<!-- $Id: config-modules.xml,v 1.3 2006-06-09 09:35:13 adam Exp $ -->

 <!-- 
    Config that uses modules 
 -->
 <!-- 
    Config that uses modules 
 -->

diff --git a/etc/config.xml b/etc/config.xml
index 3c84edb..3ed025b 100644 (file)
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>

-<!-- $Id: config.xml,v 1.21 2007-10-08 11:47:20 adam Exp $ -->

 <proxy xmlns="http://indexdata.dk/yazproxy/schema/0.9/"
  xmlns:xi="http://www.w3.org/2001/XInclude"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 <proxy xmlns="http://indexdata.dk/yazproxy/schema/0.9/"
  xmlns:xi="http://www.w3.org/2001/XInclude"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

diff --git a/etc/fennica.xml b/etc/fennica.xml
index 06ec7ce..57e3dd6 100644 (file)
--- a/etc/fennica.xml
+++ b/etc/fennica.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>

-<!-- $Id: fennica.xml,v 1.4 2004-08-13 13:54:51 adam Exp $ -->

 <proxy xmlns="http://indexdata.dk/yazproxy/schema/0.8/"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://indexdata.dk/yazproxy/schema/0.8/ yazproxy.xsd"
 <proxy xmlns="http://indexdata.dk/yazproxy/schema/0.8/"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://indexdata.dk/yazproxy/schema/0.8/ yazproxy.xsd"

diff --git a/etc/helka.sh b/etc/helka.sh
index e90c974..550ec8c 100755 (executable)
--- a/etc/helka.sh
+++ b/etc/helka.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
 #!/bin/sh

-# $Id: helka.sh,v 1.1 2004-10-12 19:20:04 adam Exp $

 # YAZ proxy start/stop init.d script.
 
 # Config/DB
 # YAZ proxy start/stop init.d script.
 
 # Config/DB

diff --git a/etc/helka.xml b/etc/helka.xml
index b34e0cf..9f85ec4 100644 (file)
--- a/etc/helka.xml
+++ b/etc/helka.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>

-<!-- $Id: helka.xml,v 1.2 2004-10-12 19:19:42 adam Exp $ -->

 <proxy xmlns="http://indexdata.dk/yazproxy/schema/0.8/"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://indexdata.dk/yazproxy/schema/0.8/ yazproxy.xsd"
 <proxy xmlns="http://indexdata.dk/yazproxy/schema/0.8/"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://indexdata.dk/yazproxy/schema/0.8/ yazproxy.xsd"

diff --git a/etc/pqf.properties b/etc/pqf.properties
index d925b7c..2a9d764 100644 (file)
--- a/etc/pqf.properties
+++ b/etc/pqf.properties
@@ -1,5 +1,3 @@
-# $Id: pqf.properties,v 1.1 2004-04-11 11:36:54 adam Exp $
-#

 # Propeties file to drive org.z3950.zing.cql.CQLNode's toPQF()
 # back-end and the YAZ CQL-to-PQF converter.  This specifies the
 # interpretation of various CQL indexes, relations, etc. in terms
 # Propeties file to drive org.z3950.zing.cql.CQLNode's toPQF()
 # back-end and the YAZ CQL-to-PQF converter.  This specifies the
 # interpretation of various CQL indexes, relations, etc. in terms

diff --git a/etc/voyager.xml b/etc/voyager.xml
index 1e9bbcb..f7c5f85 100644 (file)
--- a/etc/voyager.xml
+++ b/etc/voyager.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>

-<!-- $Id: voyager.xml,v 1.8 2006-04-06 17:23:14 adam Exp $ -->

 <proxy xmlns="http://indexdata.dk/yazproxy/schema/0.9/"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://indexdata.dk/yazproxy/schema/0.9/ yazproxy.xsd"
 <proxy xmlns="http://indexdata.dk/yazproxy/schema/0.9/"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://indexdata.dk/yazproxy/schema/0.9/ yazproxy.xsd"

diff --git a/etc/yazproxy.xsd b/etc/yazproxy.xsd
index a75be50..f271252 100644 (file)
--- a/etc/yazproxy.xsd
+++ b/etc/yazproxy.xsd
@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>

-<!-- XML Schema for YAZ proxy config file.
-    $Id: yazproxy.xsd,v 1.10 2006-03-30 10:35:14 adam Exp $
--->
+<!-- XML Schema for YAZ proxy config file.  -->

 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:exp="http://explain.z3950.org/dtd/2.0/"
 <xs:schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:exp="http://explain.z3950.org/dtd/2.0/"

diff --git a/etc/yazproxyctl.sh b/etc/yazproxyctl.sh
index ff116e1..2712e0d 100755 (executable)
--- a/etc/yazproxyctl.sh
+++ b/etc/yazproxyctl.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
 #!/bin/sh

-# $Id: yazproxyctl.sh,v 1.3 2006-04-04 20:52:04 adam Exp $

 # YAZ proxy start/stop init.d script.
 #
 PATH=/usr/local/bin:/bin:/usr/bin
 # YAZ proxy start/stop init.d script.
 #
 PATH=/usr/local/bin:/bin:/usr/bin

diff --git a/include/yazproxy/bw.h b/include/yazproxy/bw.h
index 227b0ff..2356689 100644 (file)
--- a/include/yazproxy/bw.h
+++ b/include/yazproxy/bw.h
@@ -1,7 +1,5 @@
-/* $Id: bw.h,v 1.5 2006-03-30 10:35:15 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,10 +12,9 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/

 
 #ifndef YAZPROXY_YAZ_BW_H
 #define YAZPROXY_YAZ_BW_H
 
 #ifndef YAZPROXY_YAZ_BW_H
 #define YAZPROXY_YAZ_BW_H

diff --git a/include/yazproxy/limit-connect.h b/include/yazproxy/limit-connect.h
index a557502..928ab1e 100644 (file)
--- a/include/yazproxy/limit-connect.h
+++ b/include/yazproxy/limit-connect.h
@@ -1,7 +1,5 @@
-/* $Id: limit-connect.h,v 1.3 2006-04-06 16:25:21 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,10 +12,9 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/

 
 #ifndef YAZPROXY_LIMIT_CONNECT_H
 #define YAZPROXY_LIMIT_CONNECT_H
 
 #ifndef YAZPROXY_LIMIT_CONNECT_H
 #define YAZPROXY_LIMIT_CONNECT_H

diff --git a/include/yazproxy/module.h b/include/yazproxy/module.h
index 5769d8c..70ff1a3 100644 (file)
--- a/include/yazproxy/module.h
+++ b/include/yazproxy/module.h
@@ -1,7 +1,5 @@
-/* $Id: module.h,v 1.7 2006-03-30 10:33:06 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,10 +12,9 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/

 
 #ifndef YAZ_PROXY_MODULE_H
 #define YAZ_PROXY_MODULE_H_INCLUDED
 
 #ifndef YAZ_PROXY_MODULE_H
 #define YAZ_PROXY_MODULE_H_INCLUDED

diff --git a/include/yazproxy/proxy.h b/include/yazproxy/proxy.h
index 0357948..172df42 100644 (file)
--- a/include/yazproxy/proxy.h
+++ b/include/yazproxy/proxy.h
@@ -1,7 +1,5 @@
-/* $Id: proxy.h,v 1.39 2007-05-08 12:05:08 adam Exp $
-   Copyright (c) 1998-2007, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,10 +12,9 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/

 
 #ifndef YAZ_PROXY_H_INCLUDED
 #define YAZ_PROXY_H_INCLUDED
 
 #ifndef YAZ_PROXY_H_INCLUDED
 #define YAZ_PROXY_H_INCLUDED

diff --git a/src/Makefile.am b/src/Makefile.am
index 27fe508..5b66760 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,3 @@
-## $Id: Makefile.am,v 1.17 2007-10-29 11:14:57 adam Exp $
-

 AM_CXXFLAGS = -I$(srcdir)/../include $(YAZPPINC) $(USEMARCONINC)
 
 lib_LTLIBRARIES = libyazproxy.la
 AM_CXXFLAGS = -I$(srcdir)/../include $(YAZPPINC) $(USEMARCONINC)
 
 lib_LTLIBRARIES = libyazproxy.la

diff --git a/src/cdetails.cpp b/src/cdetails.cpp
index bce92dd..72f20a8 100644 (file)
--- a/src/cdetails.cpp
+++ b/src/cdetails.cpp
@@ -1,3 +1,20 @@
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data
+
+YAZ proxy 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.
+
+YAZ proxy 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
+*/

 #include <stdlib.h>
 #include <stdio.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 

diff --git a/src/charset-converter.cpp b/src/charset-converter.cpp
index 8ff1145..4d21765 100644 (file)
--- a/src/charset-converter.cpp
+++ b/src/charset-converter.cpp
@@ -1,7 +1,5 @@
-/* $Id: charset-converter.cpp,v 1.7 2007-12-27 10:44:49 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,10 +12,9 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/

 
 #include <yaz/log.h>
 #include <yaz/proto.h>
 
 #include <yaz/log.h>
 #include <yaz/proto.h>

diff --git a/src/limit-connect.cpp b/src/limit-connect.cpp
index 270d567..12391db 100644 (file)
--- a/src/limit-connect.cpp
+++ b/src/limit-connect.cpp
@@ -1,7 +1,5 @@
-/* $Id: limit-connect.cpp,v 1.2 2006-04-06 16:25:21 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,9 +12,8 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */
 
 #include <yazproxy/limit-connect.h>
 */
 
 #include <yazproxy/limit-connect.h>

diff --git a/src/mod_helsinki.cpp b/src/mod_helsinki.cpp
index af6b211..23c3d40 100644 (file)
--- a/src/mod_helsinki.cpp
+++ b/src/mod_helsinki.cpp
@@ -1,7 +1,5 @@
-/* $Id: mod_helsinki.cpp,v 1.4 2007-10-08 08:14:02 adam Exp $
-   Copyright (c) 1998-2005, Index Data.
-
-This file is part of the yaz-proxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,10 +12,9 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/

 
 #include <string.h>
 #include <stdio.h>
 
 #include <string.h>
 #include <stdio.h>

diff --git a/src/mod_sample.cpp b/src/mod_sample.cpp
index c115c80..9546271 100644 (file)
--- a/src/mod_sample.cpp
+++ b/src/mod_sample.cpp
@@ -1,7 +1,5 @@
-/* $Id: mod_sample.cpp,v 1.7 2006-07-06 11:50:26 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,10 +12,9 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/

 
 #include <string.h>
 #include <stdio.h>
 
 #include <string.h>
 #include <stdio.h>

diff --git a/src/modules.cpp b/src/modules.cpp
index bb80df4..dee13e0 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -1,7 +1,5 @@
-/* $Id: modules.cpp,v 1.7 2006-03-30 10:32:16 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,10 +12,9 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/

 
 #include <string.h>
 #if HAVE_DLFCN_H
 
 #include <string.h>
 #if HAVE_DLFCN_H

diff --git a/src/msg-thread.cpp b/src/msg-thread.cpp
index 2c36163..14bdfcc 100644 (file)
--- a/src/msg-thread.cpp
+++ b/src/msg-thread.cpp
@@ -1,7 +1,5 @@
-/* $Id: msg-thread.cpp,v 1.14 2006-03-30 14:16:34 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,10 +12,9 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/

 
 #if YAZ_POSIX_THREADS
 #include <pthread.h>
 
 #if YAZ_POSIX_THREADS
 #include <pthread.h>

diff --git a/src/msg-thread.h b/src/msg-thread.h
index a8f17ec..fed7a62 100644 (file)
--- a/src/msg-thread.h
+++ b/src/msg-thread.h
@@ -1,7 +1,5 @@
-/* $Id: msg-thread.h,v 1.11 2006-03-30 14:16:34 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,10 +12,9 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/

 
 #include <yazpp/socket-observer.h>
 #include <yaz/yconfig.h>
 
 #include <yazpp/socket-observer.h>
 #include <yaz/yconfig.h>

diff --git a/src/proxyp.h b/src/proxyp.h
index 0296b87..203bf7a 100644 (file)
--- a/src/proxyp.h
+++ b/src/proxyp.h
@@ -1,7 +1,5 @@
-/* $Id: proxyp.h,v 1.19 2006-07-06 11:50:26 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,10 +12,9 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/

 
 #if YAZ_HAVE_XSLT
 #include <libxml/parser.h>
 
 #if YAZ_HAVE_XSLT
 #include <libxml/parser.h>

diff --git a/src/t-server.cpp b/src/t-server.cpp
index e91049b..55adea8 100644 (file)
--- a/src/t-server.cpp
+++ b/src/t-server.cpp
@@ -1,9 +1,20 @@
-/*
- * Copyright (c) 2005, Index Data.
- * See the file LICENSE for details.
- * 
- * $Id: t-server.cpp,v 1.9 2006-03-30 14:19:19 adam Exp $
- */
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data
+
+YAZ proxy 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.
+
+YAZ proxy 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
+*/

 
 #include <stdlib.h>
 #include <pthread.h>
 
 #include <stdlib.h>
 #include <pthread.h>

diff --git a/src/tstthreads.cpp b/src/tstthreads.cpp
index ac78157..23ccb6f 100644 (file)
--- a/src/tstthreads.cpp
+++ b/src/tstthreads.cpp
@@ -1,7 +1,5 @@
-/* $Id: tstthreads.cpp,v 1.11 2006-03-30 14:19:19 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,10 +12,9 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/

 
 #include <stdlib.h>
 #include <ctype.h>
 
 #include <stdlib.h>
 #include <ctype.h>

diff --git a/src/yaz-bw.cpp b/src/yaz-bw.cpp
index 5b7b4a2..26121d2 100644 (file)
--- a/src/yaz-bw.cpp
+++ b/src/yaz-bw.cpp
@@ -1,7 +1,5 @@
-/* $Id: yaz-bw.cpp,v 1.8 2006-03-30 10:32:42 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,10 +12,9 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/

 
 #include <time.h>
 #include <yaz/log.h>
 
 #include <time.h>
 #include <yaz/log.h>

diff --git a/src/yaz-proxy-config.cpp b/src/yaz-proxy-config.cpp
index 7fe6204..990799a 100644 (file)
--- a/src/yaz-proxy-config.cpp
+++ b/src/yaz-proxy-config.cpp
@@ -1,7 +1,5 @@
-/* $Id: yaz-proxy-config.cpp,v 1.37 2007-05-08 12:05:09 adam Exp $
-   Copyright (c) 1998-2007, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,10 +12,9 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/

 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index 88b106a..d53d10d 100644 (file)
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -1,7 +1,5 @@
-/* $Id: yaz-proxy-main.cpp,v 1.22 2008-02-21 09:33:23 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,10 +12,9 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/

 
 #include <signal.h>
 #if HAVE_UNISTD_H
 
 #include <signal.h>
 #if HAVE_UNISTD_H

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index 926d5b4..948838d 100644 (file)
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -1,7 +1,5 @@
-/* $Id: yaz-proxy.cpp,v 1.78 2008-02-21 09:33:23 adam Exp $
-   Copyright (c) 1998-2008, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,10 +12,9 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/

 
 #ifdef WIN32
 #define HAVE_SYS_STAT_H 1
 
 #ifdef WIN32
 #define HAVE_SYS_STAT_H 1

diff --git a/src/yaz-usemarcon.cpp b/src/yaz-usemarcon.cpp
index a815f7b..e8021fb 100644 (file)
--- a/src/yaz-usemarcon.cpp
+++ b/src/yaz-usemarcon.cpp
@@ -1,7 +1,5 @@
-/* $Id: yaz-usemarcon.cpp,v 1.3 2006-03-30 10:31:37 adam Exp $
-   Copyright (c) 1998-2006, Index Data.
-
-This file is part of the yazproxy.
+/* This file is part of YAZ proxy
+   Copyright (C) 1998-2008 Index Data

 
 YAZ proxy 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
 
 YAZ proxy 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

@@ -14,10 +12,9 @@ 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
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/

 
 #include <yaz/log.h>
 #include "proxyp.h"
 
 #include <yaz/log.h>
 #include "proxyp.h"

diff --git a/win/makefile b/win/makefile
index 0664be3..6ab1166 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,5 @@
-# Copyright (C) 1999-2006, Index Data ApS
+# Copyright (C) 1998-2008 Index Data

 # All rights reserved.
 # All rights reserved.

-# $Id: makefile,v 1.14 2008-02-21 10:16:51 adam Exp $

 
 ###########################################################
 ############### Parameters 
 
 ###########################################################
 ############### Parameters