------------------------------------------------------------
revno: 13552
revision-id: squid3@treenet.co.nz-20140826015827-iy8huhgkn1u8ptio
parent: squid3@treenet.co.nz-20140825154704-f1bfi4d74i94joul
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Mon 2014-08-25 18:58:27 -0700
message:
  Boilerplate: update authorship claims
  
  * Robert Collins actually gave permission to update a long time back.
  
  * Duane Wessels permission to update now granted.
  
  * UCSD authorship claims being left in place with CREDITS entry.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140826015827-iy8huhgkn1u8ptio
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: f35c8fe306b21e35c12cbe86b1ac27511d6b466c
# timestamp: 2014-08-26 02:57:00 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20140825154704-\
#   f1bfi4d74i94joul
# 
# Begin patch
=== modified file 'compat/assert.h'
--- compat/assert.h	2014-08-25 14:08:02 +0000
+++ compat/assert.h	2014-08-26 01:58:27 +0000
@@ -6,10 +6,6 @@
  * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
-/*
- * AUTHOR: Duane Wessels
- */
-
 #ifndef SQUID_ASSERT_H
 #define SQUID_ASSERT_H
 

=== modified file 'compat/xstrerror.cc'
--- compat/xstrerror.cc	2014-08-25 14:08:02 +0000
+++ compat/xstrerror.cc	2014-08-26 01:58:27 +0000
@@ -6,10 +6,6 @@
  * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
-/*
- * AUTHOR: Duane Wessels
- */
-
 #include "squid.h"
 #include "compat/xstrerror.h"
 

=== modified file 'include/rfc1035.h'
--- include/rfc1035.h	2014-08-25 15:47:04 +0000
+++ include/rfc1035.h	2014-08-26 01:58:27 +0000
@@ -6,10 +6,6 @@
  * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
-/*
- * AUTHOR: Duane Wessels
- */
-
 #ifndef SQUID_RFC1035_H
 #define SQUID_RFC1035_H
 

=== modified file 'include/rfc2617.h'
--- include/rfc2617.h	2014-08-25 15:47:04 +0000
+++ include/rfc2617.h	2014-08-26 01:58:27 +0000
@@ -20,10 +20,6 @@
  * to prevent squid knowing the users password (idea suggested in RFC 2617).
  */
 
-/*
- * AUTHOR: RFC 2617 & Robert Collins
- */
-
 #ifndef SQUID_RFC2617_H
 #define SQUID_RFC2617_H
 

=== modified file 'scripts/boiler-mgr.pl'
--- scripts/boiler-mgr.pl	2014-08-25 14:01:56 +0000
+++ scripts/boiler-mgr.pl	2014-08-26 01:58:27 +0000
@@ -69,6 +69,10 @@
 
 # We have persmission to move these frequent claims to CONTRIBUTORS.
 my $reClaimsOkToMove = qr{
+	Robert.Collins|<robertc\@squid-cache.org>|
+
+	Duane.Wessels|
+
 	Francesco.Chemolli|<kinkie\@squid-cache.org>|<kinkie\@kame.usr.dsi.unimi.it>|
 
 	Amos.Jeffries|<amosjeffries\@squid-cache.org>|<squid3\@treenet.co.nz>|
@@ -78,16 +82,6 @@
 	Henrik.Nordstrom|<henrik\@henriknordstrom.net>|
 	MARA.Systems.AB|
 }xi;
-# XXX: We have not gotten permission for some of the entries yet:
-#
-#	Robert.Collins|<robertc\@squid-cache.org>|
-#
-#	Guido Serassio|<serassio\@squid-cache.org>|
-#
-#	Duane Wessels|
-#
-#	the.Regents.of.the.University.of
-
 
 # inspirations are not copyright claims but should be preserved
 my $reInspiration = qr/^[\s*]*(inspired by previous work.*?)$/mi;