From 73d2de1f10719972e108c857e1f7e8b80a5a4e0d Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Sat, 12 Jun 2004 01:32:02 +0000 Subject: - Fix another upgrade bug: The series file may optionally contain a strip level argument (-pN) which must be stripped off when determining the patch name. - A minor correction in the doumentation; some whitespace fixes. - Translation update. --- bin/quilt.in | 2 +- debian/control | 2 +- doc/main.tex | 4 +-- doc/quilt.1.in | 4 +-- po/de.po | 88 +++++++++++++++++++++++++++++++++----------------------- po/fr.po | 16 ++++++----- po/quilt.pot | 8 +++--- quilt.changes | 14 +++++++-- quilt/diff.in | 2 +- quilt/refresh.in | 4 +-- quilt/upgrade.in | 2 +- 11 files changed, 87 insertions(+), 59 deletions(-) diff --git a/bin/quilt.in b/bin/quilt.in index 3be2f0a..4956cbd 100644 --- a/bin/quilt.in +++ b/bin/quilt.in @@ -28,7 +28,7 @@ Common options to all commands: --trace Runs the command in bash trace mode (-x). For internal debugging. - + --quiltrc file Use the specified configuration file instead of ~/.quiltrc. See pdf documentation for details about its possible content." diff --git a/debian/control b/debian/control index e576269..7d3f405 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Description: Tool to work with series of patches designed by and for linux kernel hackers (Andrew Morton, from the -mm branch, is the original author), and its main use by the current upstream maintainer is to manage the (hundreds of) patches against the kernel made - for the Suse distribution. + for the SUSE distribution. . This package completely integrates into the CDBS, allowing maintainers using this new paradigm for their packaging script to benefit of the quilt diff --git a/doc/main.tex b/doc/main.tex index c2df857..2a02cce 100644 --- a/doc/main.tex +++ b/doc/main.tex @@ -222,8 +222,8 @@ work/ -+- ... | |- patch1.diff | +- ... +- .pc/ -+- applied-patches - |- patch1/ -+- ... - |- patch2/ -+- ... + |- patch1.diff/ -+- ... + |- patch2.diff/ -+- ... +- ... \end{Verbatim} \end{small} diff --git a/doc/quilt.1.in b/doc/quilt.1.in index f46f394..6233689 100644 --- a/doc/quilt.1.in +++ b/doc/quilt.1.in @@ -107,8 +107,8 @@ no longer needed, so there is no need to clean up manually. | | |- patch1.diff | | +- ... | +- .pc/ -+- applied-patches - | |- patch1/ -+- ... - | |- patch2/ -+- ... + | |- patch1.diff/ -+- ... + | |- patch2.diff/ -+- ... | +- ... .fi diff --git a/po/de.po b/po/de.po index c6219f6..dbe8b40 100644 --- a/po/de.po +++ b/po/de.po @@ -26,7 +26,7 @@ msgid "" "\n" "--trace\n" "\tRuns the command in bash trace mode (-x). For internal debugging.\n" -"\t\n" +"\n" "--quiltrc file\n" "\tUse the specified configuration file instead of ~/.quiltrc. \n" "\tSee pdf documentation for details about its possible content." @@ -36,7 +36,7 @@ msgstr "" "\n" "--trace\n" "\tFührt die Kommandos im bash Trace-Modus (-x) aus. Für Debugging.\n" -"\t\n" +"\n" "--quiltrc datei\n" "\tVerwende die angegebene Konfigrationsdatei statt ~/.quiltrc.\n" "\tSiehe die pdf-Dokumentation für mögliche Einstellungen." @@ -65,20 +65,20 @@ msgstr "" "-p patch\n" "\tDer Patch, zu dem die Dateien hinzugefügt werden sollen." -#: ../quilt/add.in:54 ../quilt/diff.in:112 ../quilt/diff.in:123 +#: ../quilt/add.in:54 ../quilt/diff.in:116 ../quilt/diff.in:127 #: ../quilt/remove.in:52 msgid "Patch $2 is not in series" msgstr "Patch $2 ist in der series-Datei nicht enthalten" -#: ../quilt/add.in:75 ../quilt/applied.in:72 ../quilt/refresh.in:100 +#: ../quilt/add.in:75 ../quilt/applied.in:72 ../quilt/refresh.in:106 #: ../quilt/remove.in:73 msgid "Patch $patch is not applied" msgstr "Patch $patch ist nicht angewandt" -#: ../quilt/add.in:82 ../quilt/delete.in:67 ../quilt/diff.in:168 +#: ../quilt/add.in:82 ../quilt/delete.in:67 ../quilt/diff.in:174 #: ../quilt/files.in:75 ../quilt/fold.in:78 ../quilt/fork.in:64 #: ../quilt/pop.in:181 ../quilt/push.in:179 ../quilt/push.in:215 -#: ../quilt/refresh.in:107 ../quilt/remove.in:80 +#: ../quilt/refresh.in:113 ../quilt/remove.in:80 msgid "No patches applied" msgstr "Keine Patches angewandt" @@ -186,7 +186,11 @@ msgid "" "\n" "--diff=utility\n" "\tUse the specified utility for generating the diff. The utility\n" -"\tis invoked with the original and new file name as arguments." +"\tis invoked with the original and new file name as arguments.\n" +"\n" +"--no-timestamps\n" +"\tDo not include file timestamps in patch headers (as if\n" +" QUILT_DIFF_NO_TIMESTAMPS were set to yes)." msgstr "" "\n" "Erzeugt ein Diff der angegebenen Dateien im obersten oder angegebenen\n" @@ -213,58 +217,62 @@ msgstr "" "--diff=programm\n" "\tVerwendet das angegebene Programm, um den Patch zu generieren. Das " "Programm wird mit dem Dateinamen der ursprünglichen und der neuenDatei " -"aufgerufen." +"aufgerufen.\n" +"\n" +"--no-timestamps\n" +"\tKeine Zeitstempel in Patches angeben (wie QUILT_DIFF_NO_TIMESTAMPS in" +"~/.quiltrc)." -#: ../quilt/diff.in:153 +#: ../quilt/diff.in:159 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined." msgstr "" "Die Optionen \\`-c patch', \\`--snapshot', und \\`-z' können nicht " "kombiniert werden." -#: ../quilt/diff.in:161 +#: ../quilt/diff.in:167 msgid "Patch $last_patch is not applied" msgstr "Patch $last_patch ist nicht angewandt" -#: ../quilt/diff.in:179 +#: ../quilt/diff.in:185 msgid "" "Cannot diff patches with -p$opt_strip_level, please specify -p0 or -p1 " "instead" msgstr "" "Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden." -#: ../quilt/diff.in:213 +#: ../quilt/diff.in:219 msgid "Patch $first_patch not applied before $last_patch." msgstr "Patch $first_patch ist nicht vor Patch $last_patch angewandt." -#: ../quilt/diff.in:247 +#: ../quilt/diff.in:253 msgid "Cannot change into $QUILT_PC/$last_patch" msgstr "Kann nicht in Verzeichnis $QUILT_PC/$last_patch wechseln." -#: ../quilt/diff.in:253 ../scripts/rpatch.in:62 +#: ../quilt/diff.in:259 ../scripts/rpatch.in:62 msgid "Failed to copy files to temporary directory" msgstr "Konnte Dateien nicht in ein temporäres Verzeichnis kopieren" -#: ../quilt/diff.in:264 +#: ../quilt/diff.in:270 msgid "Cannot change to temporary directory" msgstr "Kann nicht in temporäres Verzeichnis wechseln" -#: ../quilt/diff.in:283 ../scripts/rpatch.in:85 +#: ../quilt/diff.in:289 ../scripts/rpatch.in:85 msgid "Failed to patch temporary files" msgstr "Konnte temporäre Dateien nicht patchen" -#: ../quilt/diff.in:289 +#: ../quilt/diff.in:295 msgid "Cannot change to source directory" msgstr "Kann nicht in Quellverzeichnis wechseln" -#: ../quilt/diff.in:307 +#: ../quilt/diff.in:313 msgid "File $file is not being modified." msgstr "Datei $file wird nicht verändert." -#: ../quilt/diff.in:326 ../quilt/refresh.in:139 +#: ../quilt/diff.in:332 ../quilt/refresh.in:145 msgid "Diff failed, aborting." msgstr "Diff fehlgeschlagen, Abbruch." -#: ../quilt/diff.in:333 +#: ../quilt/diff.in:339 msgid "More recent patches modify files in $last_patch." msgstr "Später angewandte Patches verändern Dateien von $last_patch." @@ -659,8 +667,8 @@ msgid "File series fully applied, ends at patch $top" msgstr "series-Datei vollständig angewandt, endet in Patch $top" #: ../quilt/refresh.in:22 -msgid "Usage: quilt refresh [-p n] [-f] [patch]" -msgstr "Verwendung: quilt refresh [-p n] [-f] [patch]" +msgid "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [patch]" +msgstr "Verwendung: quilt refresh [-p n] [-f] --no-timestamps] [patch]" #: ../quilt/refresh.in:26 msgid "" @@ -678,9 +686,13 @@ msgid "" "patch.\n" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 supported).\n" -"\t\n" +"\n" "-f\tForce refresh, even if more recent patches modify\n" -"\tsome of the same files." +"\tsome of the same files.\n" +"\n" +"--no-timestamps\n" +"\tDo not include file timestamps in patch headers (as if\n" +" QUILT_DIFF_NO_TIMESTAMPS were set to yes)." msgstr "" "\n" "Frischt den obersten oder angegebenen Patch auf. Dokumentation in der\n" @@ -697,15 +709,18 @@ msgstr "" "Auffrischen berücksichtigt.\n" "\n" "-p n\tErzeugt einen -p n Patch (n=0 oder n=1 werden unterstützt).\n" -"\t\n" +"\n" "-f\tAuffrischen erzwingen, selbst wenn Patches über dem angegebenen Patch\n" -"\teinige der selben Dateien verändern." +"\teinige der selben Dateien verändern.\n" +"--no-timestamps\n" +"\tKeine Zeitstempel in Patches angeben (wie QUILT_DIFF_NO_TIMESTAMPS in" +"~/.quiltrc)." -#: ../quilt/refresh.in:95 +#: ../quilt/refresh.in:101 msgid "Patch $opt_patch is not in series" msgstr "Patch $opt_patch in series-Datei nicht gefunden" -#: ../quilt/refresh.in:118 +#: ../quilt/refresh.in:124 msgid "" "Cannot refresh patches with -p$opt_strip_level, please specify -p0 or -p1 " "instead" @@ -713,21 +728,21 @@ msgstr "" "Kann Patches mit Level -p$opt_strip_level nicht auffrischen, bitte -p0 oder -" "p1 angeben" -#: ../quilt/refresh.in:145 +#: ../quilt/refresh.in:151 msgid "More recent patches modify files in $patch. Enforce refresh with -f." msgstr "" "Später angewandte Patches verändern Dateien von $patch. Auffrischen mit -f " "erzwingen." -#: ../quilt/refresh.in:152 +#: ../quilt/refresh.in:158 msgid "Nothing in patch $patch" msgstr "Patch $patch is leer" -#: ../quilt/refresh.in:177 +#: ../quilt/refresh.in:183 msgid "Patch $patch is unchanged" msgstr "Patch $patch ist unverändert." -#: ../quilt/refresh.in:191 +#: ../quilt/refresh.in:197 msgid "Refreshed patch $patch" msgstr "Patch $patch aufgefrischt." @@ -765,8 +780,8 @@ msgid "File $SUBDIR$file removed from patch $patch" msgstr "Datei $SUBDIR$file aus Patch $patch entfernt." #: ../quilt/series.in:22 -msgid "Usage: quilt series [-v]" -msgstr "Verwendung: quilt series [-v]" +msgid "Usage: quilt series [-n] [-v]" +msgstr "Verwendung: quilt series [-n] [-v]" #: ../quilt/series.in:25 msgid "" @@ -830,7 +845,7 @@ msgid "" "popping patches. A diff against the tree at the moment of the\n" "snapshot can be generated with \\`quilt diff --snapshot'.\n" "\n" -"-d\tRemove current snapshot." +"-d\tOnly remove current snapshot." msgstr "" "\n" "Erzeuge einen Snapshot des aktuellen Zustands des Quellbaums. Danach kann\n" @@ -838,7 +853,8 @@ msgstr "" "Hinzufügen und Entfernen von Patches. Ein Patch zwischen dem Quellbaum\n" "zum Zeitpunkt des Snapshots und dem aktuellen Zustand kann mit\n" "\\`quilt diff --snapshot' erzeugt werden.\n" -"-d\tEntferne den aktuellen Snapshot." +"\n" +"-d\tEntferne lediglich den aktuellen Snapshot." #: ../quilt/top.in:22 msgid "Usage: quilt top" diff --git a/po/fr.po b/po/fr.po index b402937..864095d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -27,7 +27,7 @@ msgid "" "\n" "--trace\n" "\tRuns the command in bash trace mode (-x). For internal debugging.\n" -"\t\n" +"\n" "--quiltrc file\n" "\tUse the specified configuration file instead of ~/.quiltrc. \n" "\tSee pdf documentation for details about its possible content." @@ -37,7 +37,7 @@ msgstr "" "\n" "--trace\n" "\tLance la commande en mode trace de bash (-x). Pour le debug interne.\n" -"\t\n" +"\n" "--quiltrc fichier\n" "\tUtilise le fichier de configuration spécifié au lieu de ~/.quiltrc.\n" "\tVoir la documentation pdf pour plus de détail sur son contenu \n" @@ -188,7 +188,7 @@ msgid "" "--diff=utility\n" "\tUse the specified utility for generating the diff. The utility\n" "\tis invoked with the original and new file name as arguments.\n" -"\t\n" +"\n" "--no-timestamps\n" "\tDo not include file timestamps in patch headers (as if\n" " QUILT_DIFF_NO_TIMESTAMPS were set to yes)." @@ -700,10 +700,10 @@ msgid "" "patch.\n" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 supported).\n" -"\t\n" +"\n" "-f\tForce refresh, even if more recent patches modify\n" "\tsome of the same files.\n" -"\t\n" +"\n" "--no-timestamps\n" "\tDo not include file timestamps in patch headers (as if\n" " QUILT_DIFF_NO_TIMESTAMPS were set to yes)." @@ -863,9 +863,11 @@ msgid "" "-d\tOnly remove current snapshot." msgstr "" "\n" -"Prend un instantané de l'état courant du répertoire de travail. Après cela, \n" +"Prend un instantané de l'état courant du répertoire de travail. Après " +"cela, \n" "il reste possible de travailler normalement avec quilt en poussant et en \n" -"retirant des patches. Un différentiel entre l'arbre au moment de l'instantané \n" +"retirant des patches. Un différentiel entre l'arbre au moment de " +"l'instantané \n" "et son état courant peut être généré avec `quilt diff --snapshot'.\n" "\n" "-d\tSupprime l'instantané actuel et termine." diff --git a/po/quilt.pot b/po/quilt.pot index a865ec7..edacf2f 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -13,7 +13,7 @@ msgid "" "\n" "--trace\n" "\tRuns the command in bash trace mode (-x). For internal debugging.\n" -"\t\n" +"\n" "--quiltrc file\n" "\tUse the specified configuration file instead of ~/.quiltrc. \n" "\tSee pdf documentation for details about its possible content." @@ -145,7 +145,7 @@ msgid "" "--diff=utility\n" "\tUse the specified utility for generating the diff. The utility\n" "\tis invoked with the original and new file name as arguments.\n" -"\t\n" +"\n" "--no-timestamps\n" "\tDo not include file timestamps in patch headers (as if\n" " QUILT_DIFF_NO_TIMESTAMPS were set to yes)." @@ -509,10 +509,10 @@ msgid "" "patch.\n" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 supported).\n" -"\t\n" +"\n" "-f\tForce refresh, even if more recent patches modify\n" "\tsome of the same files.\n" -"\t\n" +"\n" "--no-timestamps\n" "\tDo not include file timestamps in patch headers (as if\n" " QUILT_DIFF_NO_TIMESTAMPS were set to yes)." diff --git a/quilt.changes b/quilt.changes index d7ca653..338917e 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,9 +1,19 @@ +------------------------------------------------------------------- +Sat Jun 12 03:03:46 CEST 2004 - agruen@suse.de + +- Fix another upgrade bug: The series file may optionally contain + a strip level argument (-pN) which must be stripped off when + determining the patch name. +- A minor correction in the doumentation; some whitespace fixes. +- Translation update. + +------------------------------------------------------------------- Fri Jun 11 00:43:07 PDT 2004 - mquinson@tuxfamily.org - Fix the man page generation - Add a --no-timestamps option to diff and refresh doing what - QUILT_NO_DIFF_TIMESTAMPS does. This should make more visible a feature - I was about reimplementing ;) + QUILT_NO_DIFF_TIMESTAMPS does. This should make more visible a + feature I was about reimplementing ;) - Document all options from the pdf into the man page. - update the bash completion stuff so that : - it does not kill the shell when completing in a tree not matching the diff --git a/quilt/diff.in b/quilt/diff.in index fd1eef8..a617d33 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -50,7 +50,7 @@ included. --diff=utility Use the specified utility for generating the diff. The utility is invoked with the original and new file name as arguments. - + --no-timestamps Do not include file timestamps in patch headers (as if QUILT_DIFF_NO_TIMESTAMPS were set to yes)." diff --git a/quilt/refresh.in b/quilt/refresh.in index c490373..3bce618 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -37,10 +37,10 @@ been modified by any more recent patches will end up in the specified patch. -p n Create a -p n style patch (-p0 or -p1 supported). - + -f Force refresh, even if more recent patches modify some of the same files. - + --no-timestamps Do not include file timestamps in patch headers (as if QUILT_DIFF_NO_TIMESTAMPS were set to yes)." diff --git a/quilt/upgrade.in b/quilt/upgrade.in index 2b9a61b..beb62b3 100644 --- a/quilt/upgrade.in +++ b/quilt/upgrade.in @@ -77,7 +77,7 @@ for patch in $(applied_patches) do proper_name="$(grep -E -e '^'"$(quote_re $patch)"'(|\.patch|\.diff?)(|\.gz|\.bz2)([ \t]|$)' $SERIES)" proper_name=${proper_name#$QUILT_PATCHES/} - proper_name=${proper_name// /} + proper_name=${proper_name%% *} if [ -z "$proper_name" ] then failed=1 -- cgit