Run updated copyright.pl on HEAD and 9.2 trees, updating the psql

bmomjian · bmomjian · commit 81aa2a5d1ca8 · 2012-07-06T12:28:18.000-04:00
\copyright output to 2012.

Backpatch to 9.2.
diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
@@ -275,7 +275,7 @@
  * schemapg.h
  *    Schema_pg_xxx macros for use by relcache.c
  *
- * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
diff --git a/src/backend/utils/Gen_fmgrtab.pl b/src/backend/utils/Gen_fmgrtab.pl
@@ -101,7 +101,7 @@
  * These macros can be used to avoid a catalog lookup when a specific
  * fmgr-callable function needs to be referenced.
  *
- * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -136,7 +136,7 @@
  * fmgrtab.c
  *    The function manager's table of internal functions.
  *
- * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
@@ -435,7 +435,7 @@ print_copyright(void)
 	puts(
 		 "PostgreSQL Database Management System\n"
 		 "(formerly known as Postgres, then as Postgres95)\n\n"
-		 "Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group\n\n"
+		 "Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group\n\n"
 		 "Portions Copyright (c) 1994, The Regents of the University of California\n\n"
 	"Permission to use, copy, modify, and distribute this software and its\n"
 		 "documentation for any purpose, without fee, and without a written agreement\n"
diff --git a/src/tools/copyright.pl b/src/tools/copyright.pl
@@ -61,5 +61,7 @@ sub wanted
 }
 
 print
-"Manually update doc/src/sgml/legal.sgml and src/interfaces/libpq/libpq.rc.in too\n";
+"Manually update doc/src/sgml/legal.sgml and src/interfaces/libpq/libpq.rc.in too.\n";
+print
+"Also update ./COPYRIGHT and doc/src/sgml/legal.sgml in all back branches.\n";
 

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@`
`275`	`275`	`* schemapg.h`
`276`	`276`	`* Schema_pg_xxx macros for use by relcache.c`
`277`	`277`	`*`
`278`		`- * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group`
	`278`	`+ * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group`
`279`	`279`	`* Portions Copyright (c) 1994, Regents of the University of California`
`280`	`280`	`*`
`281`	`281`	`* NOTES`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@`
`101`	`101`	`* These macros can be used to avoid a catalog lookup when a specific`
`102`	`102`	`* fmgr-callable function needs to be referenced.`
`103`	`103`	`*`
`104`		`- * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group`
	`104`	`+ * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group`
`105`	`105`	`* Portions Copyright (c) 1994, Regents of the University of California`
`106`	`106`	`*`
`107`	`107`	`* NOTES`
`@@ -136,7 +136,7 @@`
`136`	`136`	`* fmgrtab.c`
`137`	`137`	`* The function manager's table of internal functions.`
`138`	`138`	`*`
`139`		`- * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group`
	`139`	`+ * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group`
`140`	`140`	`* Portions Copyright (c) 1994, Regents of the University of California`
`141`	`141`	`*`
`142`	`142`	`* NOTES`
Original file line number	Diff line number	Diff line change
`@@ -61,5 +61,7 @@ sub wanted`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`print`
`64`		`-"Manually update doc/src/sgml/legal.sgml and src/interfaces/libpq/libpq.rc.in too\n";`
	`64`	`+"Manually update doc/src/sgml/legal.sgml and src/interfaces/libpq/libpq.rc.in too.\n";`
	`65`	`+print`
	`66`	`+"Also update ./COPYRIGHT and doc/src/sgml/legal.sgml in all back branches.\n";`
`65`	`67`