From 48133118071a26950840fe33326c09130955c35e Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones@redhat.com>
Date: Wed, 12 May 2010 14:19:50 +0100
Subject: [PATCH] po: Don't generate po/Makevars file and include Perl keywords
 (RHBZ#559963).

I don't see a reason to autogenerate po/Makevars, and in the
earlier commit which changed this file to being autogenerated
we accidentally lost the special Perl keywords, copyright notice
and bug reporting address.  Fix all of that.

This partially reverts commit febff9d2a35c4f40abbaf8943146476bdeac671e.
---
 .gitignore  |  1 -
 bootstrap   | 13 -------------
 po/Makevars | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 po/Makevars

diff --git a/.gitignore b/.gitignore
index 25948fc..ae273d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -190,7 +190,6 @@ po/stamp-it
 po/stamp-po
 po/LINGUAS
 po/Makefile.in.in
-po/Makevars
 po/Rules-quot
 po/boldquot.sed
 po/en@boldquot.header
diff --git a/bootstrap b/bootstrap
index 349cf1c..c2507fc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -38,19 +38,6 @@ autopoint --force
 # (or worse out-of-date) macro directory.
 libtoolize --copy --install
 
-# Create gettext configuration.
-echo "$0: Creating po/Makevars from po/Makevars.template ..."
-rm -f po/Makevars
-sed '
-  /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
-  /^MSGID_BUGS_ADDRESS *=/s/=.*/= '"$MSGID_BUGS_ADDRESS"'/
-  /^XGETTEXT_OPTIONS *=/{
-    s/$/ \\/
-    a\
-        '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
-  }
-' po/Makevars.template >po/Makevars
-
 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 <$gnulib_tool || exit
 
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..828a614
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,43 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+# --keyword=__ etc are for Perl code using perl-libintl.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=__ --keyword=__x \
+         $${end_of_xgettext_options+}
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Red Hat Inc.
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = https://bugzilla.redhat.com/enter_bug.cgi?component=libguestfs&product=Virtualization+Tools
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES = 
-- 
1.8.3.1