From a17e589046176122e528740f91a38bb00e284518 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 1 Jan 2005 22:14:33 +0000 Subject: [PATCH] Adjust a few more copyright notices to match the format expected by the src/tools/copyright script. --- configure | 4 ++-- configure.in | 4 ++-- doc/src/FAQ/FAQ.html | 5 ++--- doc/src/FAQ/FAQ_brazilian.html | 6 +++--- doc/src/FAQ/FAQ_czech.html | 4 ++-- doc/src/FAQ/FAQ_farsi.html | 2 +- doc/src/FAQ/FAQ_french.html | 5 ++--- doc/src/FAQ/FAQ_german.html | 5 ++--- doc/src/FAQ/FAQ_polish.html | 5 ++--- doc/src/FAQ/FAQ_russian.html | 5 ++--- doc/src/FAQ/FAQ_turkish.html | 7 ++++--- src/backend/po/nb.po | 2 +- src/bin/pg_controldata/po/nb.po | 2 +- src/bin/pg_dump/po/nb.po | 2 +- src/bin/pg_resetxlog/po/nb.po | 2 +- src/bin/psql/po/nb.po | 2 +- src/interfaces/libpq/po/nb.po | 2 +- src/port/win32ver.rc | 2 +- 18 files changed, 31 insertions(+), 35 deletions(-) diff --git a/configure b/configure index cd95f9dc4f..b946e96948 100755 --- 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 1f1d91ec72..3a18ce8289 100644 --- 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 e6abc362fc..0599ee3971 100644 --- a/doc/src/FAQ/FAQ.html +++ b/doc/src/FAQ/FAQ.html @@ -203,9 +203,8 @@

PostgreSQL Data Base Management System

-

Portions copyright (c) 1996-2004, PostgreSQL Global Development - Group Portions Copyright (c) 1994-6 Regents of the University of - California

+

Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group + Portions Copyright (c) 1994-6 Regents of the University of California

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 6160839de6..33a64c7662 100644 --- a/doc/src/FAQ/FAQ_brazilian.html +++ b/doc/src/FAQ/FAQ_brazilian.html @@ -162,9 +162,9 @@

PostgreSQL Sistema de Gerência de Banco de Dados

-

Portions copyright (c) 1996-2004, PostgreSQL Global Development - Group Portions Copyright (c) 1994-6 Regents of the University of - California

+

Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group + Portions Copyright (c) 1994-6 Regents of the University of California

+

Permissão de uso, cópia, modificação e distribuição desse software e sua documentação para qualquer propó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 59806e7487..cb91c8eb90 100644 --- a/doc/src/FAQ/FAQ_czech.html +++ b/doc/src/FAQ/FAQ_czech.html @@ -163,8 +163,8 @@

PostgreSQL je pøedmìtem následujících autorských práv:

-

Dílèí copyright (c) 1996-2004, PostgreSQL Global Development Group - Dílèí copyright (c) 1994-6, Regents of the University of California

+

Dílèí Copyright (c) 1996-2005, PostgreSQL Global Development Group + Dílèí Copyright (c) 1994-6, Regents of the University of California

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 5284297fb6..71f6f40b7c 100644 --- a/doc/src/FAQ/FAQ_farsi.html +++ b/doc/src/FAQ/FAQ_farsi.html @@ -277,7 +277,7 @@ Michael Stonebrake در دانشگا

PostgreSQL تحت قانون كپي رايت زير قرار دارد:

PostgreSQL Data Base Management System

-

Portions copyright (c) 1996-2004, PostgreSQL Global Development Group +

Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group Portions Copyright (c) 1994-6 Regents of the University of California

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 cbed0789e2..0436774159 100644 --- a/doc/src/FAQ/FAQ_french.html +++ b/doc/src/FAQ/FAQ_french.html @@ -193,9 +193,8 @@

PostgreSQL Data Base Management System

-

Portions copyright (c) 1996-2004, PostgreSQL Global Development - Group Portions Copyright (c) 1994-6 Regents of the University of - California

+

Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group + Portions Copyright (c) 1994-6 Regents of the University of California

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 868f60116e..6b8c605f59 100644 --- 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).

PostgreSQL Data Base Management System

-

Portions copyright (c) 1996-2004, PostgreSQL Global Development - Group Portions Copyright (c) 1994-6 Regents of the University of - California

+

Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group + Portions Copyright (c) 1994-6 Regents of the University of California

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 85e04fbaf7..a92b90d313 100644 --- a/doc/src/FAQ/FAQ_polish.html +++ b/doc/src/FAQ/FAQ_polish.html @@ -213,9 +213,8 @@

PostgreSQL Data Base Management System

-

Portions copyright (c) 1996-2002, PostgreSQL Global Development - Group Portions Copyright (c) 1994-6 Regents of the University of - California

+

Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group + Portions Copyright (c) 1994-6 Regents of the University of California

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 1c5e80145e..b3f058d90c 100644 --- a/doc/src/FAQ/FAQ_russian.html +++ b/doc/src/FAQ/FAQ_russian.html @@ -201,9 +201,8 @@

óÉÓÔÅÍÁ õÐÒÁ×ÌÅÎÉÑ âÁÚÁÍÉ äÁÎÎÙÈ PostgreSQL

-

Portions copyright (c) 1996-2004, PostgreSQL Global Development - Group Portions Copyright (c) 1994-6 Regents of the University of - California

+

Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group + Portions Copyright (c) 1994-6 Regents of the University of California

ðÒÅÄÏÓÔÁ×ÌÑÀÔÓÑ ÐÒÁ×Á ÎÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ, ËÏÐÉÒÏ×ÁÎÉÅ, ÉÚÍÅÎÅÎÉÅ É ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÅ ÄÁÎÎÏÇÏ ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ É ÅÇÏ ÄÏËÕÍÅÎÔÁÃÉÉ diff --git a/doc/src/FAQ/FAQ_turkish.html b/doc/src/FAQ/FAQ_turkish.html index 1280f31536..e0921f6497 100644 --- a/doc/src/FAQ/FAQ_turkish.html +++ b/doc/src/FAQ/FAQ_turkish.html @@ -158,9 +158,10 @@ adreslerinde g

1.2) PostgreSQL'in haklarý nedir?

PostgreSQL Data Base Management System

-

Portions copyright (c) 1996-2002, PostgreSQL Global Development - Group Portions Copyright (c) 1994-6 Regents of the University of - California

+ +

Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group + Portions Copyright (c) 1994-6 Regents of the University of California

+

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 d684adfe05..da592200c7 100644 --- 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 , 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 4dafbaec73..91ded231a8 100644 --- 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 , 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 49d55c6c44..fa3edeaed0 100644 --- 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 , 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 45c0dd8c6d..fa49547006 100644 --- 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 , 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 d47a94565a..da4ae9f3a6 100644 --- 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 , 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 bf5e025f0c..f0a339fb2c 100644 --- 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 , 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 a34ca360a3..3c1c232e76 100644 --- 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