- Rewrite spec2series to return what the new `quilt setup' needs,

  and rename it to inspect.
- `quilt setup': Rewrite so that it supports multiple archives
  per spec file. Always make the patches directory a symlink to
  the original patch files instead of copying the patches.
- Update German translation.

4 files changed, 40 insertions, 119 deletions

diff --git a/po/Makefile b/po/Makefile
index 935a617..b1d4450 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,7 +1,7 @@
 QUILT_IN :=   add applied delete diff files import new next patches \
               pop previous push refresh remove series setup top unapplied \
 	      fold fork snapshot edit
-SCRIPTS_IN := apatch rpatch patchfns spec2series patchfns
+SCRIPTS_IN := apatch rpatch patchfns inspect patchfns
 # scripts/parse-patch is perl based
 
 # LINGUAS = ...
diff --git a/po/de.po b/po/de.po
index 03daf65..028686d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -763,76 +763,36 @@ msgstr ""
 "-v\tAusführlichere, benutzerfreundliche Ausgabe."
 
 #: ../quilt/setup.in:27
-msgid "Usage: quilt setup [-d sourcedir] {seriesfile|specfile}"
-msgstr "Verwendung: quilt setup [-d quellvz.] {seriesdatei|specdatei}"
+msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}"
+msgstr "Verwendung: quilt setup [-d pfad-prefix] [-v] {spec-datei|series-datei}"
 
 #: ../quilt/setup.in:30
 msgid ""
 "\n"
-"Initializes a source tree from a patch series file.  The patch series\n"
-"file must contain the name of the relevant tar archive, in addition to\n"
-"the list of patches.\n"
+"Initializes a source tree from an rpm spec file or a quilt series file.\n"
 "\n"
-"-d\tThe directory that contains the archives and patches. Defaults\n"
-"\tto the directory of the series/spec file.\n"
+"-d\toptional path prefix (sub-directory).\n"
 "\n"
-"-l\tMake the patches directory a symbolic link. If a series file is\n"
-"\tspecified, also create a symlink to the series file."
+"-v\tverbose debug output."
 msgstr ""
 "\n"
-"Initialisiere einen Quellbaum aus einer series-Datei. Die series-Datei\n"
-"muss den Namen der entsprechenden Tar-Archive und die Liste der Patches\n"
-"enthalten.\n"
+"Initialisiere einen Quellbaum aus einer rpm spec-Datei oder einer quilt series-Datei.\n"
 "\n"
-"-d\tVerzeichnis, das Archive und Patches enthält. Vorgabewert ist das\n"
-"Verzeichnis, das die series/spec-Datei enthält.\n"
+"-d\tOptionaler Pfad-Präfix (Unterverzeichnis).\n"
 "\n"
-"-l\tErzeuge eine Verknüpfung für das patches-Vezeichnis. Falls eine\n"
-"series-Datei angegeben wird, erzeuge eine Verknüpfung auf diese Datei."
+"-v\tAusführliche Ausgabe."
 
-#: ../quilt/setup.in:111
-msgid "Series file $series_file not found"
-msgstr "Seriendatei $series_file nicht gefunden"
+#: ../quilt/setup.in:95
+msgid "Directory $prefix$dir/$QUILT_PATCHES exists"
+msgstr "Verzeichnis $prefix$dir/$QUILT_PATCHES existiert"
 
-#: ../quilt/setup.in:137
-msgid "Reading sources from $arg"
-msgstr "Quellen werden von $arg gelesen"
+#: ../quilt/setup.in:100
+msgid "File $prefix$dir/series exists"
+msgstr "Datei $prefix$dir/series existiert"
 
-#: ../quilt/setup.in:141
-msgid "Unpacking archive $source/$arg"
-msgstr "Entpacke Archiv source/$arg"
-
-#: ../quilt/setup.in:151
-msgid "Directory $packagedir exists already."
-msgstr "Verzeichnis $packagedir existiert bereits."
-
-#: ../quilt/setup.in:156
-msgid "File $packagedir exists."
-msgstr "Datei $packagedir existiert."
-
-#: ../quilt/setup.in:171
-msgid "Creating link to patches directory $arg"
-msgstr "Erzeuge Verknüpfung auf Patch-Verzeichnis $arg"
-
-#: ../quilt/setup.in:175
-msgid "Copying patch $source/$arg"
-msgstr "Kopiere Patch $source/$arg"
-
-#: ../quilt/setup.in:188
-msgid "File $packagedir/series exists; will not override."
-msgstr "Datei $packagedir/series existiert und wird nicht überschrieben."
-
-#: ../quilt/setup.in:195 ../quilt/setup.in:209
-msgid "Copying series file"
-msgstr "Kopiere series-Datei"
-
-#: ../quilt/setup.in:205
-msgid "Creating link to series file $arg"
-msgstr "Erzeuge Verknüpfung zur series-Datei"
-
-#: ../quilt/setup.in:240
-msgid "Directory $packagedir set up."
-msgstr "Verzeichnis $packagedir aufgebaut."
+#: ../quilt/setup.in:149
+msgid "Unpacking archive $arg1"
+msgstr "Entpacke Archiv $arg1"
 
 #: ../quilt/snapshot.in:22
 msgid "Usage: quilt snapshot [-d]"
@@ -934,7 +894,3 @@ msgstr "Patch $patch scheint leer zu sein, entfernt"
 #: ../scripts/rpatch.in:131
 msgid "Removing $patch"
 msgstr "Entferne $patch"
-
-#: ../scripts/spec2series.in:100 ../scripts/spec2series.in:192
-msgid " done"
-msgstr " fertig"
diff --git a/po/fr.po b/po/fr.po
index d3257d1..2d9abfb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -385,7 +385,8 @@ msgstr ""
 
 #: ../quilt/import.in:73
 msgid "Option \\`-n' can only be used when importing a single patch"
-msgstr "L'option « -n » ne peut être utilisé que lors de l'import d'un seul patch."
+msgstr ""
+"L'option « -n » ne peut être utilisé que lors de l'import d'un seul patch."
 
 #: ../quilt/import.in:90
 msgid "Patch $patch is applied."
@@ -518,10 +519,12 @@ msgid ""
 msgstr ""
 "\n"
 "Retire un ou plusieurs patches de la pile. Si aucun argument n'est\n"
-"spécifié, le patch au sommet est retiré. Si un nombre est passé en argument,\n"
+"spécifié, le patch au sommet est retiré. Si un nombre est passé en "
+"argument,\n"
 "cela indique la quantité de patchs à retirer. Si un nom de patch est\n"
 "spécifié, il est retiré ainsi que tous ceux placés avant lui dans la\n"
-"série. Le nom des patchs peut contenir le préfix patches/ de façon à pouvoir\n"
+"série. Le nom des patchs peut contenir le préfix patches/ de façon à "
+"pouvoir\n"
 "profiter de la complétion sur le nom de fichier.\n"
 "\n"
 "-a\tRetire tous les patches de la série.\n"
@@ -604,10 +607,12 @@ msgid ""
 msgstr ""
 "\n"
 "Applique un ou plusieurs patches de la série.  Si aucun argument n'est\n"
-"spécifié, le prochain patch est appliqué. Si un nombre est passé en argument,\n"
+"spécifié, le prochain patch est appliqué. Si un nombre est passé en "
+"argument,\n"
 "cela indique la quantité de patchs à appliquer. Si un nom de patch est\n"
 "spécifié, il est appliqué ainsi que tous ceux placés avant lui dans la\n"
-"série. Le nom des patchs peut contenir le préfix patches/ de façon à pouvoir\n"
+"série. Le nom des patchs peut contenir le préfix patches/ de façon à "
+"pouvoir\n"
 "profiter de la complétion sur le nom de fichier.\n"
 "\n"
 "-a\tApplique tous les patches de la série.\n"
@@ -778,7 +783,7 @@ msgstr ""
 
 #: ../quilt/setup.in:27
 #, fuzzy
-msgid "Usage: quilt setup [-d sourcedir] [-v] specfile"
+msgid "Usage: quilt setup [-d path-prefix] [-v] specfile"
 msgstr ""
 "Usage : quilt setup [-d répertoire_source] {fichier_séries|fichier_spec}"
 
@@ -801,7 +806,7 @@ msgstr ""
 msgid "File $prefix$dir/series exists"
 msgstr "Le fichier $packagedir existe."
 
-#: ../quilt/setup.in:123
+#: ../quilt/setup.in:148
 #, fuzzy
 msgid "Unpacking archive $arg1"
 msgstr "Désarchivage depuis $source/$arg"
diff --git a/po/quilt.pot b/po/quilt.pot
index fb3c613..7fc6705 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -564,65 +564,29 @@ msgid ""
 msgstr ""
 
 #: ../quilt/setup.in:27
-msgid "Usage: quilt setup [-d sourcedir] {seriesfile|specfile}"
+msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}"
 msgstr ""
 
 #: ../quilt/setup.in:30
 msgid ""
 "\n"
-"Initializes a source tree from a patch series file.  The patch series\n"
-"file must contain the name of the relevant tar archive, in addition to\n"
-"the list of patches.\n"
+"Initializes a source tree from an rpm spec file or a quilt series file.\n"
 "\n"
-"-d\tThe directory that contains the archives and patches. Defaults\n"
-"\tto the directory of the series/spec file.\n"
+"-d\toptional path prefix (sub-directory).\n"
 "\n"
-"-l\tMake the patches directory a symbolic link. If a series file is\n"
-"\tspecified, also create a symlink to the series file."
+"-v\tverbose debug output."
 msgstr ""
 
-#: ../quilt/setup.in:111
-msgid "Series file $series_file not found"
+#: ../quilt/setup.in:95
+msgid "Directory $prefix$dir/$QUILT_PATCHES exists"
 msgstr ""
 
-#: ../quilt/setup.in:137
-msgid "Reading sources from $arg"
+#: ../quilt/setup.in:100
+msgid "File $prefix$dir/series exists"
 msgstr ""
 
-#: ../quilt/setup.in:141
-msgid "Unpacking archive $source/$arg"
-msgstr ""
-
-#: ../quilt/setup.in:151
-msgid "Directory $packagedir exists already."
-msgstr ""
-
-#: ../quilt/setup.in:156
-msgid "File $packagedir exists."
-msgstr ""
-
-#: ../quilt/setup.in:171
-msgid "Creating link to patches directory $arg"
-msgstr ""
-
-#: ../quilt/setup.in:175
-msgid "Copying patch $source/$arg"
-msgstr ""
-
-#: ../quilt/setup.in:188
-msgid "File $packagedir/series exists; will not override."
-msgstr ""
-
-#: ../quilt/setup.in:195 ../quilt/setup.in:209
-msgid "Copying series file"
-msgstr ""
-
-#: ../quilt/setup.in:205
-msgid "Creating link to series file $arg"
-msgstr ""
-
-#: ../quilt/setup.in:240
-msgid "Directory $packagedir set up."
+#: ../quilt/setup.in:149
+msgid "Unpacking archive $arg1"
 msgstr ""
 
 #: ../quilt/snapshot.in:22
@@ -711,7 +675,3 @@ msgstr ""
 #: ../scripts/rpatch.in:131
 msgid "Removing $patch"
 msgstr ""
-
-#: ../scripts/spec2series.in:100 ../scripts/spec2series.in:192
-msgid " done"
-msgstr ""