Updated AUTHORS and copyright info for becommands/html.py.

Also adjusted update_copyright.sh to ignore Gianluca's temporary use
of
  gianluca <gian@galactica>
since he's now using
  Gianluca Montecchi <gian@grys.it>
on becommands/html.py.

2 files changed, 23 insertions, 19 deletions

diff --git a/becommands/html.py b/becommands/html.py
index 3acf973..deb968e 100644
--- a/becommands/html.py
+++ b/becommands/html.py
@@ -1,18 +1,19 @@
-# Copyright (C) 2005-2009
+# Copyright (C) 2009 Gianluca Montecchi <gian@grys.it>
+#                    W. Trevor King <wking@drexel.edu>
 #
-#    This program 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 of the License, or
-#    (at your option) any later version.
+# This program 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 of the License, or
+# (at your option) any later version.
 #
-#    This program 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.
+# This program 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
 """Generate a static HTML dump of the current repository status"""
 from libbe import cmdutil, bugdir, bug
 #from html_data import *
diff --git a/update_copyright.sh b/update_copyright.sh
index 28eb0e0..84a5913 100755
--- a/update_copyright.sh
+++ b/update_copyright.sh
@@ -59,7 +59,7 @@ ESCAPED_TEXT=`echo "$COPYRIGHT_TEXT" | awk '{printf("%s\\\\n", $0)}' | sed "$SED
 
 # adjust the AUTHORS file
 AUTHORS=`bzr log | grep '^ *committer\|^ *author' | cut -d: -f2 | sed 's/ <.*//;s/^ *//' | sort | uniq`
-AUTHORS=`echo "$AUTHORS" | grep -v 'j\^\|wking\|John Doe'` # remove non-names
+AUTHORS=`echo "$AUTHORS" | grep -v 'j\^\|wking\|John Doe\|gianluca'` # remove non-names
 echo "Bugs Everywhere was written by:" > AUTHORS
 echo "$AUTHORS" >> AUTHORS
 
@@ -99,6 +99,12 @@ do
     # Tweak the author list to make up for problems in the bzr
     # history, change of email address, etc.
     
+    # Consolidate Chris Ball
+    GREP_OUT=`echo "$AUTHORS" | grep 'Chris Ball <cjb@laptop.org>'`
+    if [ -n "$GREP_OUT" ]; then
+	AUTHORS=`echo "$AUTHORS" | grep -v '^Chris Ball <cjb@thunk.printf.net>$'`
+    fi
+
     # Consolidate Aaron Bentley
     AUTHORS=`echo "$AUTHORS" | sed 's/<abentley@panoramicfeedback.com>/and Panometrics, Inc./'`
     GREP_OUT=`echo "$AUTHORS" | grep 'Aaron Bentley and Panometrics, Inc.'`
@@ -113,15 +119,12 @@ do
 	AUTHORS=`echo "$AUTHORS" | grep -v '^Ben Finney <benf@cybersource.com.au>$'`
     fi
 
-    # Consolidate Chris Ball
-    GREP_OUT=`echo "$AUTHORS" | grep 'Chris Ball <cjb@laptop.org>'`
-    if [ -n "$GREP_OUT" ]; then
-	AUTHORS=`echo "$AUTHORS" | grep -v '^Chris Ball <cjb@thunk.printf.net>$'`
-    fi
-
     # Consolidate Trevor King
     AUTHORS=`echo "$AUTHORS" | grep -v "wking <wking@mjolnir>"`
 
+    # Consolidate Gianluca Montecchi
+    AUTHORS=`echo "$AUTHORS" | grep -v "gianluca"`
+
     # Sort again...
     AUTHORS=`echo "$AUTHORS" | sort | uniq`