- quilt/mail.in: Remove the Recipient-* and Replace-* headers

  used internally from the resulting emails; not sure how that
  was missed so far.

7 files changed, 69 insertions, 11 deletions

diff --git a/po/de.po b/po/de.po
index 859c0c7..cfb98e8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1335,6 +1335,21 @@ msgstr "Anzeigename `%s' enthält eine unvollständige Klammerung\n"
 msgid "Delivery address `%s' is invalid\n"
 msgstr "Zustelladresse `%s' ist ungültig\n"
 
+#: quilt/scripts/parse-patch.in:50
+#, perl-format
+msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
+msgstr ""
+
+#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
+#, fuzzy, perl-format
+msgid "File %s disappeared!\n"
+msgstr "Datei %s ist unverändert\\n"
+
+#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
+#, fuzzy, perl-format
+msgid "Failed to rename %s to %s: %s\n"
+msgstr "Umbenennen von %s auf %s: %s\n"
+
 #: quilt/scripts/patchfns.in:483 quilt/scripts/patchfns.in:495
 msgid "No patches in series\\n"
 msgstr "Keine Patches in der series-Datei\\n"
diff --git a/po/fr.po b/po/fr.po
index 6cae876..78c0f30 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1348,6 +1348,21 @@ msgstr "Le nom `%s' est mal parenth�s�\n"
 msgid "Delivery address `%s' is invalid\n"
 msgstr "L'adresse de destination `%s' est invalide\n"
 
+#: quilt/scripts/parse-patch.in:50
+#, perl-format
+msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
+msgstr "USAGE : %s {-s|-u} section fichier [< remplacement]\n"
+
+#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
+#, perl-format
+msgid "File %s disappeared!\n"
+msgstr "Le fichier %s a disparu !\n"
+
+#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
+#, perl-format
+msgid "Failed to rename %s to %s: %s\n"
+msgstr "Impossible de renommer %s en %s : %s\n"
+
 #: quilt/scripts/patchfns.in:483 quilt/scripts/patchfns.in:495
 msgid "No patches in series\\n"
 msgstr "Aucun patch dans la s�rie\\n"
@@ -1602,12 +1617,3 @@ msgstr ""
 
 #~ msgid "File %s removed from patch %s\\n"
 #~ msgstr "Le fichier %s a �t� enlev� du patch %s.\\n"
-
-#~ msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-#~ msgstr "USAGE : %s {-s|-u} section fichier [< remplacement]\n"
-
-#~ msgid "File %s disappeared!\n"
-#~ msgstr "Le fichier %s a disparu !\n"
-
-#~ msgid "Failed to rename %s to %s: %s\n"
-#~ msgstr "Impossible de renommer %s en %s : %s\n"
diff --git a/po/ja.po b/po/ja.po
index 210556a..5d4e3a9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1305,6 +1305,21 @@ msgstr "表示用の名前 `%s' が対にならない括弧を含んでいます
 msgid "Delivery address `%s' is invalid\n"
 msgstr "配送先のアドレス `%s' が不正です\n"
 
+#: quilt/scripts/parse-patch.in:50
+#, perl-format
+msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
+msgstr ""
+
+#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
+#, fuzzy, perl-format
+msgid "File %s disappeared!\n"
+msgstr "パッチ %s に変更はありません\\n"
+
+#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
+#, fuzzy, perl-format
+msgid "Failed to rename %s to %s: %s\n"
+msgstr "%s から %s へ名前を変更しました: %s\n"
+
 #: quilt/scripts/patchfns.in:483 quilt/scripts/patchfns.in:495
 msgid "No patches in series\\n"
 msgstr "シリーズに登録されているパッチがありません\\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index 727dc57..3aed9d3 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -904,6 +904,21 @@ msgstr ""
 msgid "Delivery address `%s' is invalid\n"
 msgstr ""
 
+#: quilt/scripts/parse-patch.in:50
+#, perl-format
+msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
+msgstr ""
+
+#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
+#, perl-format
+msgid "File %s disappeared!\n"
+msgstr ""
+
+#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
+#, perl-format
+msgid "Failed to rename %s to %s: %s\n"
+msgstr ""
+
 #: quilt/scripts/patchfns.in:483 quilt/scripts/patchfns.in:495
 msgid "No patches in series\\n"
 msgstr ""
diff --git a/quilt.changes b/quilt.changes
index 3f2b77a..4161baa 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Nov  5 17:25:49 CET 2007 - agruen@suse.de
+
+- quilt/mail.in: Remove the Recipient-* and Replace-* headers
+  used internally from the resulting emails; not sure how that
+  was missed so far.
+
+-------------------------------------------------------------------
 Tue Oct 30 00:24:20 CET 2007 - agruen@suse.de
 
 - Fix `make snapshot'.
diff --git a/quilt/mail.in b/quilt/mail.in
index 44c1638..2f14521 100644
--- a/quilt/mail.in
+++ b/quilt/mail.in
@@ -569,7 +569,7 @@ for patch in "${patches[@]}"; do
 		references_header $introduction
 		echo "Content-Disposition: inline; filename=$patch"
 		awk '
-		    !in_body && tolower($0) ~ /^(Recipient|Replace)-.*:/ \
+		    !in_body && tolower($0) ~ /^(recipient|replace)-.*:/ \
 		    		{ next }
 		    /^$/	{ in_body = 1 }
 				{ print }
diff --git a/test/mail.test b/test/mail.test
index a761175..ffb35f5 100644
--- a/test/mail.test
+++ b/test/mail.test
@@ -68,7 +68,7 @@
 
 	$ ls patches/ > series
 	$ quilt mail --mbox mbox --prefix "test" --subject "This is a test" -m "Message"
-	$ sed -nre "s/^(From [^ ]*).*/\\1/p" -e "/^Subject:/p" -e "/^To:/p" -e "/^Cc:/p" -e "/^ /p" mbox
+	$ sed -nre "s/^(From [^ ]*).*/\\1/p" -e "/^Subject:/p" -e "/^To:/p" -e "/^Cc:/p" -e "/^ /p" -e "/^Replace-.*:/p" -e "/^Recipient-.*:/p" mbox
 	> From a@b.c
 	> Subject: [test 0/6] This is a test
 	> From a@b.c