changeset 12892:81072b472b9d

bootstrap: support non-FSF copyright holder Allow non-FSF projects, like libvirt, to make full use of bootstrap. * build-aux/bootstrap (COPYRIGHT_HOLDER, with_gettext): Allow bootstrap.conf override of COPYRIGHT_HOLDER. (MSGID_BUGS_ADDRESS): Allow URL rather than email. Signed-off-by: Eric Blake <eblake@redhat.com>
author Eric Blake <eblake@redhat.com>
date Mon, 22 Feb 2010 15:28:38 -0700
parents 14b06bec418c
children 1e998663ea99
files ChangeLog build-aux/bootstrap
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Feb 22 12:13:22 2010 -0700
+++ b/ChangeLog	Mon Feb 22 15:28:38 2010 -0700
@@ -1,5 +1,10 @@
 2010-02-22  Eric Blake  <eblake@redhat.com>
 
+	bootstrap: support non-FSF copyright holder
+	* build-aux/bootstrap (COPYRIGHT_HOLDER, with_gettext): Allow
+	bootstrap.conf override of COPYRIGHT_HOLDER.
+	(MSGID_BUGS_ADDRESS): Allow URL rather than email.
+
 	bootstrap: interoperate with gettext 0.14.1
 	* build-aux/bootstrap (slurp): Fix typo when using older gettext.
 
--- a/build-aux/bootstrap	Mon Feb 22 12:13:22 2010 -0700
+++ b/build-aux/bootstrap	Mon Feb 22 15:28:38 2010 -0700
@@ -133,7 +133,8 @@
  --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
 '
 
-# Package bug report address for gettext files
+# Package bug report address and copyright holder for gettext files
+COPYRIGHT_HOLDER='Free Software Foundation, Inc.'
 MSGID_BUGS_ADDRESS=bug-$package@gnu.org
 
 # Files we don't want to import.
@@ -786,7 +787,8 @@
   rm -f po/Makevars
   sed '
     /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
-    /^MSGID_BUGS_ADDRESS *=/s/=.*/= '"$MSGID_BUGS_ADDRESS"'/
+    /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/
+    /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'|
     /^XGETTEXT_OPTIONS *=/{
       s/$/ \\/
       a\