Adjust a few more copyright notices to match the format expected by

the src/tools/copyright script.

diff --git a/configure b/configure
index cd95f9dc4f0847b77fc0062ae034be44e2c7ebc4..b946e96948b83a7f0d9f55460535b36aa9a430b9 100755 (executable)
--- a/configure
+++ b/configure
@@ -9,7 +9,7 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# Copyright 2005 PostgreSQL Global Development Group
+# Copyright (c) 1996-2005, PostgreSQL Global Development Group
 
 if expr a : '\(a\)' >/dev/null 2>&1; then
   as_expr=expr
@@ -963,7 +963,7 @@ Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright 2005 PostgreSQL Global Development Group
+Copyright (c) 1996-2005, PostgreSQL Global Development Group
 _ACEOF
   exit 0
 fi

diff --git a/configure.in b/configure.in
index 1f1d91ec725812663dd09268a5d8f2f70641495b..3a18ce8289f797ba39e28a5f01961939dfa13575 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.394 2004/12/31 21:58:46 pgsql Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.395 2005/01/01 22:14:26 tgl Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -20,7 +20,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 AC_INIT([PostgreSQL], [8.0.0rc3], [pgsql-bugs@postgresql.org])
 
 AC_PREREQ(2.53)
-AC_COPYRIGHT([Copyright 2005 PostgreSQL Global Development Group])
+AC_COPYRIGHT([Copyright (c) 1996-2005, PostgreSQL Global Development Group])
 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
 AC_CONFIG_AUX_DIR(config)
 AC_PREFIX_DEFAULT(/usr/local/pgsql)

diff --git a/doc/src/FAQ/FAQ.html b/doc/src/FAQ/FAQ.html
index e6abc362fc1ec0d513b0beca04f2180e28fdf22f..0599ee397121f6439fb57b954405ad2b07d9d71f 100644 (file)
--- a/doc/src/FAQ/FAQ.html
+++ b/doc/src/FAQ/FAQ.html
@@ -203,9 +203,8 @@
 
     <P>PostgreSQL Data Base Management System</P>
 
-    <P>Portions copyright (c) 1996-2004, PostgreSQL Global Development
-    Group Portions Copyright (c) 1994-6 Regents of the University of
-    California</P>
+    <P>Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
+    Portions Copyright (c) 1994-6 Regents of the University of California</P>
 
     <P>Permission to use, copy, modify, and distribute this software
     and its documentation for any purpose, without fee, and without a

diff --git a/doc/src/FAQ/FAQ_brazilian.html b/doc/src/FAQ/FAQ_brazilian.html
index 6160839de6f0daddcfee69da26f04c9ef694a064..33a64c766296de6dad20f3e834ffa28cacb5766e 100644 (file)
--- a/doc/src/FAQ/FAQ_brazilian.html
+++ b/doc/src/FAQ/FAQ_brazilian.html
@@ -162,9 +162,9 @@
 
     <P>PostgreSQL Sistema de Ger&ecirc;ncia de Banco de Dados</P>
 
-    <P>Portions copyright (c) 1996-2004, PostgreSQL Global Development
-    Group Portions Copyright (c) 1994-6 Regents of the University of
-    California</P>
+    <P>Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
+    Portions Copyright (c) 1994-6 Regents of the University of California</P>
+
     <P>Permiss&atilde;o de uso, c&oacute;pia, modifica&ccedil;&atilde;o
     e distribui&ccedil;&atilde;o desse software e sua documenta&ccedil;&atilde;o
     para qualquer prop&oacute;sito, sem taxa, e sem um acordo escrito

diff --git a/doc/src/FAQ/FAQ_czech.html b/doc/src/FAQ/FAQ_czech.html
index 59806e7487415e0fdfdffd052f95a983547657b7..cb91c8eb90e2c1cd9ab74963336bf1dfbb7501aa 100644 (file)
--- a/doc/src/FAQ/FAQ_czech.html
+++ b/doc/src/FAQ/FAQ_czech.html
@@ -163,8 +163,8 @@
 
    <P>PostgreSQL je pøedmìtem následujících autorských práv:</P>
 
-   <P>Dílèí copyright (c) 1996-2004, PostgreSQL Global Development Group
-   Dílèí copyright (c) 1994-6, Regents of the University of California</P>
+   <P>Dílèí Copyright (c) 1996-2005, PostgreSQL Global Development Group
+   Dílèí Copyright (c) 1994-6, Regents of the University of California</P>
 
    <P>Udìluje se oprávnìní k u¾ití, rozmno¾ování, provádìní úprav a
    roz¹iøování tohoto softwaru a dokumentace k nìmu, pro jakékoli úèely,

diff --git a/doc/src/FAQ/FAQ_farsi.html b/doc/src/FAQ/FAQ_farsi.html
index 5284297fb666df62c7e841ba40d614e0936211c3..71f6f40b7cb035d7ba231a74a19ea3dacd15fe21 100644 (file)
--- a/doc/src/FAQ/FAQ_farsi.html
+++ b/doc/src/FAQ/FAQ_farsi.html
@@ -277,7 +277,7 @@ Michael Stonebrake در دانشگا&#16
 <p dir="rtl"><font face="Tahoma"><span lang="en-us">PostgreSQL</span> &#1578;&#1581;&#1578; &#1602;&#1575;&#1606;&#1608;&#1606; 
 &#1603;&#1662;&#1610; &#1585;&#1575;&#1610;&#1578; &#1586;&#1610;&#1585; &#1602;&#1585;&#1575;&#1585; &#1583;&#1575;&#1585;&#1583;:</font></p>
 <P dir="ltr"><font face="Tahoma">PostgreSQL Data Base Management System</font></P>
-<P dir="ltr"><font face="Tahoma">Portions copyright (c) 1996-2004, PostgreSQL Global Development Group 
+<P dir="ltr"><font face="Tahoma">Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group 
 Portions Copyright (c) 1994-6 Regents of the University of California</font></P>
 <P dir="ltr"><font face="Tahoma">Permission to use, copy, modify, and distribute this software and its 
 documentation for any purpose, without fee, and without a written agreement is 

diff --git a/doc/src/FAQ/FAQ_french.html b/doc/src/FAQ/FAQ_french.html
index cbed0789e22cb752008830c2eb835e4e8464adf8..0436774159b75ff46cc811161179746c1746669d 100644 (file)
--- a/doc/src/FAQ/FAQ_french.html
+++ b/doc/src/FAQ/FAQ_french.html
@@ -193,9 +193,8 @@
 
     <P>PostgreSQL Data Base Management System</P>
 
-    <P>Portions copyright (c) 1996-2004, PostgreSQL Global Development
-    Group Portions Copyright (c) 1994-6 Regents of the University of
-    California</P>
+    <P>Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
+    Portions Copyright (c) 1994-6 Regents of the University of California</P>
 
     <P>Permission to use, copy, modify, and distribute this software
     and its documentation for any purpose, without fee, and without a

diff --git a/doc/src/FAQ/FAQ_german.html b/doc/src/FAQ/FAQ_german.html
index 868f60116e39910c877c8810dc37a8af9de1f684..6b8c605f5924d74a8483d6f089bc11c231f5f30c 100644 (file)
--- a/doc/src/FAQ/FAQ_german.html
+++ b/doc/src/FAQ/FAQ_german.html
@@ -164,9 +164,8 @@ href="mailto:pgman@candle.pha.pa.us">pgman@candle.pha.pa.us</a>).</p>
 
     <p>PostgreSQL Data Base Management System</p>
 
-    <p>Portions copyright (c) 1996-2004, PostgreSQL Global Development
-    Group Portions Copyright (c) 1994-6 Regents of the University of
-    California</P>
+    <P>Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
+    Portions Copyright (c) 1994-6 Regents of the University of California</P>
 
     <p>Permission to use, copy, modify, and distribute this software
     and its documentation for any purpose, without fee, and without a

diff --git a/doc/src/FAQ/FAQ_polish.html b/doc/src/FAQ/FAQ_polish.html
index 85e04fbaf75c3b4f3038ac0beabcc6c76b3995b8..a92b90d313694d8f48516b2fcce7f8d5f73a8076 100644 (file)
--- a/doc/src/FAQ/FAQ_polish.html
+++ b/doc/src/FAQ/FAQ_polish.html
@@ -213,9 +213,8 @@
 
     <P>PostgreSQL Data Base Management System</P>
 
-    <P>Portions copyright (c) 1996-2002, PostgreSQL Global Development
-    Group Portions Copyright (c) 1994-6 Regents of the University of
-    California</P>
+    <P>Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
+    Portions Copyright (c) 1994-6 Regents of the University of California</P>
 
     <P>Permission to use, copy, modify, and distribute this software
     and its documentation for any purpose, without fee, and without a

diff --git a/doc/src/FAQ/FAQ_russian.html b/doc/src/FAQ/FAQ_russian.html
index 1c5e80145e63401cb5bbee91d4ae1f54c49185de..b3f058d90c357555471695e686b4bab02224c536 100644 (file)
--- a/doc/src/FAQ/FAQ_russian.html
+++ b/doc/src/FAQ/FAQ_russian.html
@@ -201,9 +201,8 @@
 
     <P>óÉÓÔÅÍÁ õÐÒÁ×ÌÅÎÉÑ âÁÚÁÍÉ äÁÎÎÙÈ PostgreSQL</P>
 
-    <P>Portions copyright (c) 1996-2004, PostgreSQL Global Development
-    Group Portions Copyright (c) 1994-6 Regents of the University of
-    California</P>
+    <P>Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
+    Portions Copyright (c) 1994-6 Regents of the University of California</P>
 
     <P>ðÒÅÄÏÓÔÁ×ÌÑÀÔÓÑ ÐÒÁ×Á ÎÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ, ËÏÐÉÒÏ×ÁÎÉÅ, ÉÚÍÅÎÅÎÉÅ
     É ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÅ ÄÁÎÎÏÇÏ ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ É ÅÇÏ ÄÏËÕÍÅÎÔÁÃÉÉ

diff --git a/doc/src/FAQ/FAQ_turkish.html b/doc/src/FAQ/FAQ_turkish.html
index 1280f31536f8e0a529b61c6d663886889dfc510a..e0921f64970c7acedab8ef9fcfd6520fb8556b83 100644 (file)
--- a/doc/src/FAQ/FAQ_turkish.html
+++ b/doc/src/FAQ/FAQ_turkish.html
@@ -158,9 +158,10 @@ adreslerinde g
                
                <h4><a name="1.2">1.2</a>) PostgreSQL'in haklarý nedir?</h4>
                <p>PostgreSQL Data Base Management System</p>
-               <p>Portions copyright (c) 1996-2002, PostgreSQL Global Development
-               Group Portions Copyright (c) 1994-6 Regents of the University of
-               California</p>
+
+                <P>Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
+                Portions Copyright (c) 1994-6 Regents of the University of California</P>
+
                <p>Permission to use, copy, modify, and distribute this software
                and its documentation for any purpose, without fee, and without a
                written agreement is hereby granted, provided that the above

diff --git a/src/backend/po/nb.po b/src/backend/po/nb.po
index d684adfe05908fb1c4450c1a5a4060e68992925d..da592200c7bf6fcde3a0752407b3fb9b45a0de2e 100644 (file)
--- a/src/backend/po/nb.po
+++ b/src/backend/po/nb.po
@@ -1,5 +1,5 @@
 # Norwegian bokmål translation of messages for PostgreSQL (postgres).
-# Copyright (C) 2003 The PostgreSQL Global Development Group.
+# Copyright (c) 2003-2005, PostgreSQL Global Development Group
 # Trond Endrestøl <trond@ramstind.gtf.ol.no>, 2003.
 #
 # In the translator's comments for each message below, these initials

diff --git a/src/bin/pg_controldata/po/nb.po b/src/bin/pg_controldata/po/nb.po
index 4dafbaec739e7d1a5d5bcad56ceecaba6a8a8772..91ded231a8df26a367a02550fcfd347bd36a9e33 100644 (file)
--- a/src/bin/pg_controldata/po/nb.po
+++ b/src/bin/pg_controldata/po/nb.po
@@ -1,5 +1,5 @@
 # Norwegian bokmål translation of messages for PostgreSQL (pg_controldata).
-# Copyright (C) 2003 The PostgreSQL Global Development Group.
+# Copyright (c) 2003-2005, PostgreSQL Global Development Group
 # Trond Endrestøl <trond@ramstind.gtf.ol.no>, 2003.
 #
 # In the translator's comments for each message below, these initials

diff --git a/src/bin/pg_dump/po/nb.po b/src/bin/pg_dump/po/nb.po
index 49d55c6c4479944380830ae5b4323dc70568b8e1..fa3edeaed03594990c0d96b2acbdb0e5e1f044cc 100644 (file)
--- a/src/bin/pg_dump/po/nb.po
+++ b/src/bin/pg_dump/po/nb.po
@@ -1,5 +1,5 @@
 # Norwegian bokmål translation of messages for PostgreSQL (pg_dump).
-# Copyright (C) 2003 The PostgreSQL Global Development Group.
+# Copyright (c) 2003-2005, PostgreSQL Global Development Group
 # Trond Endrestøl <trond@ramstind.gtf.ol.no>, 2003.
 #
 # In the translator's comments for each message below, these initials

diff --git a/src/bin/pg_resetxlog/po/nb.po b/src/bin/pg_resetxlog/po/nb.po
index 45c0dd8c6dfb36ea757704b01726f0a928100f66..fa49547006af738beadbc635ecaa9c5d7a097af4 100644 (file)
--- a/src/bin/pg_resetxlog/po/nb.po
+++ b/src/bin/pg_resetxlog/po/nb.po
@@ -1,5 +1,5 @@
 # Norwegian bokmål translation of messages for PostgreSQL (pg_resetxlog).
-# Copyright (C) 2003 The PostgreSQL Global Development Group.
+# Copyright (c) 2003-2005, PostgreSQL Global Development Group
 # Trond Endrestøl <trond@ramstind.gtf.ol.no>, 2003.
 #
 # In the translator's comments for each message below, these initials

diff --git a/src/bin/psql/po/nb.po b/src/bin/psql/po/nb.po
index d47a94565a98cff8790746c3d87a6179f759ebfa..da4ae9f3a677a0a518c6826e992956c9600faca8 100644 (file)
--- a/src/bin/psql/po/nb.po
+++ b/src/bin/psql/po/nb.po
@@ -1,5 +1,5 @@
 # Norwegian bokmål translation of messages for PostgreSQL (psql).
-# Copyright (C) 2003 The PostgreSQL Global Development Group.
+# Copyright (c) 2003-2005, PostgreSQL Global Development Group
 # Trond Endrestøl <trond@ramstind.gtf.ol.no>, 2003.
 #
 # In the translator's comments for each message below, these initials

diff --git a/src/interfaces/libpq/po/nb.po b/src/interfaces/libpq/po/nb.po
index bf5e025f0cc675af64e51f1182b675eccad50d70..f0a339fb2c9e34a87bedbf6ca61844fb5d7434b2 100644 (file)
--- a/src/interfaces/libpq/po/nb.po
+++ b/src/interfaces/libpq/po/nb.po
@@ -1,5 +1,5 @@
 # Norwegian bokmål translation of messages for PostgreSQL (libpq).
-# Copyright (C) 2003 The PostgreSQL Global Development Group.
+# Copyright (c) 2003-2005, PostgreSQL Global Development Group
 # Trond Endrestøl <trond@ramstind.gtf.ol.no>, 2003.
 #
 # In the translator's comments for each message below, these initials

diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc
index a34ca360a3dea163f464c76c2bad6833948971eb..3c1c232e76d54ad9472b28ff2282102b6735c3b5 100644 (file)
--- a/src/port/win32ver.rc
+++ b/src/port/win32ver.rc
@@ -17,7 +17,7 @@ BEGIN
    VALUE "CompanyName",      "PostgreSQL Global Development Group"
    VALUE "FileDescription",  FILEDESC
    VALUE "FileVersion",      PG_VERSION
-   VALUE "LegalCopyright", "Portions Copyright (C) 1996-2005 PostgreSQL Global Development Group. Portions Copyright (C) 1994, Regents of the University of California."
+   VALUE "LegalCopyright", "Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group. Portions Copyright (c) 1994, Regents of the University of California."
    VALUE "ProductName",      "PostgreSQL"
    VALUE "ProductVersion",   PG_VERSION
   END