- quilt setup: replace the --path argument with --sourcedir for

  specifying the location of the package sources. Pass the source
  dir to inspect as well. Fix a test suite bug for quilt setup.
  Minor cosmetic changes.
- Fix a quilt mail test suite bug: specify a dummy --sender in
  test.quiltrc.

4 files changed, 64 insertions, 54 deletions

diff --git a/po/de.po b/po/de.po
index 8231a8c..d0e24df 100644
--- a/po/de.po
+++ b/po/de.po
@@ -330,11 +330,11 @@ msgstr "Patch %s ist nicht vor Patch %s angewandt\\n"
 msgid "File %s is not being modified\\n"
 msgstr "Datei %s wird nicht verändert.\\n"
 
-#: quilt/diff.in:346 quilt/refresh.in:228
+#: quilt/diff.in:345 quilt/refresh.in:228
 msgid "Diff failed, aborting\\n"
 msgstr "Diff fehlgeschlagen, Abbruch.\\n"
 
-#: quilt/diff.in:353
+#: quilt/diff.in:352
 msgid "Warning: more recent patches modify files in patch %s\\n"
 msgstr "Warnung: später angewandte Patches verändern Dateien von %s\\n"
 
@@ -1422,22 +1422,23 @@ msgstr "Verzeichnis %s existiert\\n"
 msgid "File %s exists\\n"
 msgstr "Datei %s existiert\\n"
 
-#: quilt/setup.in:93
+#: quilt/setup.in:75
 msgid ""
-"Usage: quilt setup [-d path-prefix] [-v] [--path dir1:dir2] {specfile|"
+"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] {specfile|"
 "seriesfile}\\n"
 msgstr ""
-"Verwendung: quilt setup [-d pfad-präfix] [-v] [--path pfad:pfad] {spec-datei|"
-"series-datei}\\n"
+"Verwendung: quilt setup [-d pfad-präfix] [-v] [--sourcedir verzeichnis] "
+"{spec-datei|series-datei}\\n"
 
-#: quilt/setup.in:96
+#: quilt/setup.in:78
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
 "\n"
-"-d\tOptional path prefix.\n"
+"-d\tOptional path prefix for the resulting source tree.\n"
 "\n"
-"--path\tDirectories to search when looking for tarballs. Defaults to \\`.'.\n"
+"--sourcedir\n"
+"\tDirectory that contains the package sources. Defaults to \\`.'.\n"
 "\n"
 "-v\tVerbose debug output.\n"
 msgstr ""
@@ -1445,28 +1446,28 @@ msgstr ""
 "Initialisiere einen Quellbaum aus einer rpm spec-Datei oder einer quilt "
 "series-Datei.\n"
 "\n"
-"-d\tOptionaler Pfad-Präfix.\n"
+"-d\tOptionaler Pfad-Präfix für den erzeugten Quellbaum.\n"
 "\n"
-"--path\tVerzeichnisse, in denen nach tar-Archiven gesucht wird. Wenn nicht\n"
-"\tanders angegeben, wird \\`.' durchsucht.\n"
+"--sourcedir\n"
+"\tVerzeichnis, das die Paketquellen enthält. (Default: \\`.'.)\n"
 "\n"
 "-v\tAusführliche Ausgabe.\n"
 
-#: quilt/setup.in:158
+#: quilt/setup.in:143
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "Der %%prep-Abschnitt von %s ist fehlgeschlagen; die Ergebnisse sind "
 "möglicherweise unvollständig\\n"
 
-#: quilt/setup.in:161
+#: quilt/setup.in:146
 msgid "The -v option will show rpm's output\\n"
 msgstr "Die Option -v zeigt die Ausgaben von rpm an\\n"
 
-#: quilt/setup.in:197
-msgid "File %s not found in search path\\n"
-msgstr "Datei %s nicht im Suchpfad gefunden\\n"
+#: quilt/setup.in:183
+msgid "File %s not found\\n"
+msgstr "Datei %s nicht gefunden\\n"
 
-#: quilt/setup.in:200
+#: quilt/setup.in:186
 msgid "Unpacking archive %s\\n"
 msgstr "Entpacke Archiv %s\\n"
 
diff --git a/po/fr.po b/po/fr.po
index fdce864..be56fe8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -332,11 +332,11 @@ msgstr "Le patch %s n'est pas appliqu� avant %s\\n."
 msgid "File %s is not being modified\\n"
 msgstr "Le fichier %s n'est pas modifi�.\\n"
 
-#: quilt/diff.in:346 quilt/refresh.in:228
+#: quilt/diff.in:345 quilt/refresh.in:228
 msgid "Diff failed, aborting\\n"
 msgstr "Le diff a �chou�. Abandon.\\n"
 
-#: quilt/diff.in:353
+#: quilt/diff.in:352
 msgid "Warning: more recent patches modify files in patch %s\\n"
 msgstr "Attention: un patch plus recent modifie des fichiers communs � %s\\n"
 
@@ -1435,22 +1435,25 @@ msgstr "Le r�pertoire %s existe\\n"
 msgid "File %s exists\\n"
 msgstr "Le fichier %s existe\\n"
 
-#: quilt/setup.in:93
+#: quilt/setup.in:75
+#, fuzzy
 msgid ""
-"Usage: quilt setup [-d path-prefix] [-v] [--path dir1:dir2] {specfile|"
+"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] {specfile|"
 "seriesfile}\\n"
 msgstr ""
 "Usage : quilt setup [-d r�pertoire_source] [-v] [--path r�p1:r�p2] "
 "{fichier_spec|fichier_s�ries}\\n"
 
-#: quilt/setup.in:96
+#: quilt/setup.in:78
+#, fuzzy
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
 "\n"
-"-d\tOptional path prefix.\n"
+"-d\tOptional path prefix for the resulting source tree.\n"
 "\n"
-"--path\tDirectories to search when looking for tarballs. Defaults to \\`.'.\n"
+"--sourcedir\n"
+"\tDirectory that contains the package sources. Defaults to \\`.'.\n"
 "\n"
 "-v\tVerbose debug output.\n"
 msgstr ""
@@ -1465,20 +1468,21 @@ msgstr ""
 "\n"
 "-v\tAffichage verbeux pour le debug.\n"
 
-#: quilt/setup.in:158
+#: quilt/setup.in:143
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "La section %%prep de %s a �chou� ; les r�sultats sont peut-�tre incomplets\\n"
 
-#: quilt/setup.in:161
+#: quilt/setup.in:146
 msgid "The -v option will show rpm's output\\n"
 msgstr "L'option -v montre les affichages de rpm\\\\n"
 
-#: quilt/setup.in:197
-msgid "File %s not found in search path\\n"
+#: quilt/setup.in:183
+#, fuzzy
+msgid "File %s not found\\n"
 msgstr "Le fichier %s est introuvable dans le chemin de recherche\\n"
 
-#: quilt/setup.in:200
+#: quilt/setup.in:186
 msgid "Unpacking archive %s\\n"
 msgstr "D�sarchivage de %s\\n"
 
diff --git a/po/ja.po b/po/ja.po
index 80e8b85..3b93df4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -320,11 +320,11 @@ msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n"
 msgid "File %s is not being modified\\n"
 msgstr "ファイル %s は変更されていません\\n"
 
-#: quilt/diff.in:346 quilt/refresh.in:228
+#: quilt/diff.in:345 quilt/refresh.in:228
 msgid "Diff failed, aborting\\n"
 msgstr "差分に失敗しました。異常終了します\\n"
 
-#: quilt/diff.in:353
+#: quilt/diff.in:352
 msgid "Warning: more recent patches modify files in patch %s\\n"
 msgstr "警告: 最近のパッチが、パッチ %s 内のファイルを変更しています\\n"
 
@@ -1394,22 +1394,25 @@ msgstr "ディレクトリ %s は、すでに存在します\\n"
 msgid "File %s exists\\n"
 msgstr "ファイル %s は、すでに存在します\\n"
 
-#: quilt/setup.in:93
+#: quilt/setup.in:75
+#, fuzzy
 msgid ""
-"Usage: quilt setup [-d path-prefix] [-v] [--path dir1:dir2] {specfile|"
+"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] {specfile|"
 "seriesfile}\\n"
 msgstr ""
 "使い方: quilt setup [-d path-prefix] [-v] [--path ディレクトリ1:ディレクトリ"
 "2] {specファイル|seriesファイル}\\n"
 
-#: quilt/setup.in:96
+#: quilt/setup.in:78
+#, fuzzy
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
 "\n"
-"-d\tOptional path prefix.\n"
+"-d\tOptional path prefix for the resulting source tree.\n"
 "\n"
-"--path\tDirectories to search when looking for tarballs. Defaults to \\`.'.\n"
+"--sourcedir\n"
+"\tDirectory that contains the package sources. Defaults to \\`.'.\n"
 "\n"
 "-v\tVerbose debug output.\n"
 msgstr ""
@@ -1423,21 +1426,22 @@ msgstr ""
 "\n"
 "-v\t詳細なデバッグ表示\n"
 
-#: quilt/setup.in:158
+#: quilt/setup.in:143
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "%%prepセクションの解析に失敗しました。完全に作業が完了していない場合がありま"
 "す\\n"
 
-#: quilt/setup.in:161
+#: quilt/setup.in:146
 msgid "The -v option will show rpm's output\\n"
 msgstr "-vオプションを使って、rpmの出力を表示できます"
 
-#: quilt/setup.in:197
-msgid "File %s not found in search path\\n"
+#: quilt/setup.in:183
+#, fuzzy
+msgid "File %s not found\\n"
 msgstr "ファイル %s は、サーチパス内にありません\\n"
 
-#: quilt/setup.in:200
+#: quilt/setup.in:186
 msgid "Unpacking archive %s\\n"
 msgstr "アーカイブ %s を展開しています\\n"
 
diff --git a/po/quilt.pot b/po/quilt.pot
index 618984a..1de726e 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -214,11 +214,11 @@ msgstr ""
 msgid "File %s is not being modified\\n"
 msgstr ""
 
-#: quilt/diff.in:346 quilt/refresh.in:228
+#: quilt/diff.in:345 quilt/refresh.in:228
 msgid "Diff failed, aborting\\n"
 msgstr ""
 
-#: quilt/diff.in:353
+#: quilt/diff.in:352
 msgid "Warning: more recent patches modify files in patch %s\\n"
 msgstr ""
 
@@ -983,37 +983,38 @@ msgstr ""
 msgid "File %s exists\\n"
 msgstr ""
 
-#: quilt/setup.in:93
+#: quilt/setup.in:75
 msgid ""
-"Usage: quilt setup [-d path-prefix] [-v] [--path dir1:dir2] {specfile|"
+"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] {specfile|"
 "seriesfile}\\n"
 msgstr ""
 
-#: quilt/setup.in:96
+#: quilt/setup.in:78
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
 "\n"
-"-d\tOptional path prefix.\n"
+"-d\tOptional path prefix for the resulting source tree.\n"
 "\n"
-"--path\tDirectories to search when looking for tarballs. Defaults to \\`.'.\n"
+"--sourcedir\n"
+"\tDirectory that contains the package sources. Defaults to \\`.'.\n"
 "\n"
 "-v\tVerbose debug output.\n"
 msgstr ""
 
-#: quilt/setup.in:158
+#: quilt/setup.in:143
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 
-#: quilt/setup.in:161
+#: quilt/setup.in:146
 msgid "The -v option will show rpm's output\\n"
 msgstr ""
 
-#: quilt/setup.in:197
-msgid "File %s not found in search path\\n"
+#: quilt/setup.in:183
+msgid "File %s not found\\n"
 msgstr ""
 
-#: quilt/setup.in:200
+#: quilt/setup.in:186
 msgid "Unpacking archive %s\\n"
 msgstr ""