diff options
| -rw-r--r-- | po/de.po | 12 | ||||
| -rw-r--r-- | po/fr.po | 12 | ||||
| -rw-r--r-- | po/ja.po | 12 | ||||
| -rw-r--r-- | po/quilt.pot | 12 | ||||
| -rw-r--r-- | quilt.changes | 8 | ||||
| -rw-r--r-- | scripts/patchfns.in | 12 |
6 files changed, 38 insertions, 30 deletions
@@ -640,27 +640,27 @@ msgstr "" "Die Option \\`-n' kann nur beim Importieren eines einzelnen Patches " "verwendet werden\\n" -#: quilt/import.in:93 +#: quilt/import.in:92 msgid "Patch %s is applied\\n" msgstr "Patch %s ist angewandt\\n" -#: quilt/import.in:101 +#: quilt/import.in:100 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Patch %s existiert bereits. Ersetzen mit -f.\\n" -#: quilt/import.in:105 +#: quilt/import.in:104 msgid "Replacing patch %s with new version\\n" msgstr "Ersetze Patch %s durch neuere Version\\n" -#: quilt/import.in:108 +#: quilt/import.in:107 msgid "Importing patch %s (stored as %s)\\n" msgstr "Importiere Patch %s (abgelegt als %s)\\n" -#: quilt/import.in:116 +#: quilt/import.in:115 msgid "Failed to import patch %s\\n" msgstr "Konnte Patch %s nicht importieren\\n" -#: quilt/import.in:123 +#: quilt/import.in:122 msgid "Failed to insert patch %s into file series\\n" msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n" @@ -642,27 +642,27 @@ msgid "Option \\`-n' can only be used when importing a single patch\\n" msgstr "" "L'option « -n » ne peut être utilisé que lors de l'import d'un seul patch.\\n" -#: quilt/import.in:93 +#: quilt/import.in:92 msgid "Patch %s is applied\\n" msgstr "Le patch %s n'est pas appliqué\\n" -#: quilt/import.in:101 +#: quilt/import.in:100 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Le patch %s existe. Utilisez -f pour le remplacer.\\n" -#: quilt/import.in:105 +#: quilt/import.in:104 msgid "Replacing patch %s with new version\\n" msgstr "Remplacement du patch %s avec la nouvelle version\\n" -#: quilt/import.in:108 +#: quilt/import.in:107 msgid "Importing patch %s (stored as %s)\\n" msgstr "Import du patch %s (enregistré dans %s)\\n" -#: quilt/import.in:116 +#: quilt/import.in:115 msgid "Failed to import patch %s\\n" msgstr "Impossible d'importer le patch %s\\n" -#: quilt/import.in:123 +#: quilt/import.in:122 msgid "Failed to insert patch %s into file series\\n" msgstr "Impossible d'inserer %s dans le fichier de série.\\n" @@ -620,27 +620,27 @@ msgstr "" msgid "Option \\`-n' can only be used when importing a single patch\\n" msgstr "オプション \\`-n'ã¯ã€ãƒ‘ッãƒã‚’一ã¤ã ã‘å–り込むã¨ãã®ã¿æœ‰åŠ¹ã§ã™ã€‚\\n" -#: quilt/import.in:93 +#: quilt/import.in:92 msgid "Patch %s is applied\\n" msgstr "パッム%s ã¯ã€ã™ã§ã«é©ç”¨ã•ã‚Œã¦ã„ã¾ã™\\n" -#: quilt/import.in:101 +#: quilt/import.in:100 msgid "Patch %s exists. Replace with -f.\\n" msgstr "パッム%s ã¯ã€ã™ã§ã«å˜åœ¨ã—ã¾ã™ã€‚-fã§ç½®ãæ›ãˆã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\\n" -#: quilt/import.in:105 +#: quilt/import.in:104 msgid "Replacing patch %s with new version\\n" msgstr "パッム%s ã‚’æ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ç½®ãæ›ãˆã¾ã™\\n" -#: quilt/import.in:108 +#: quilt/import.in:107 msgid "Importing patch %s (stored as %s)\\n" msgstr "パッム%s ã‚’å–り込んã§ã„ã¾ã™ (%s ã¨ã—ã¦ä¿å˜ã•ã‚Œã¾ã™)\\n" -#: quilt/import.in:116 +#: quilt/import.in:115 msgid "Failed to import patch %s\\n" msgstr "パッム%s ã®å–ã‚Šè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ\\n" -#: quilt/import.in:123 +#: quilt/import.in:122 msgid "Failed to insert patch %s into file series\\n" msgstr "seriesファイルã¸ã®ãƒ‘ッム%s ã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 34df47c..d5bb012 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -430,27 +430,27 @@ msgstr "" msgid "Option \\`-n' can only be used when importing a single patch\\n" msgstr "" -#: quilt/import.in:93 +#: quilt/import.in:92 msgid "Patch %s is applied\\n" msgstr "" -#: quilt/import.in:101 +#: quilt/import.in:100 msgid "Patch %s exists. Replace with -f.\\n" msgstr "" -#: quilt/import.in:105 +#: quilt/import.in:104 msgid "Replacing patch %s with new version\\n" msgstr "" -#: quilt/import.in:108 +#: quilt/import.in:107 msgid "Importing patch %s (stored as %s)\\n" msgstr "" -#: quilt/import.in:116 +#: quilt/import.in:115 msgid "Failed to import patch %s\\n" msgstr "" -#: quilt/import.in:123 +#: quilt/import.in:122 msgid "Failed to insert patch %s into file series\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index 6b3c100..50514ba 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Aug 26 11:52:45 CEST 2005 - agruen@suse.de + +- scripts/patchfns.in: insert_in_series(): Insert new patches + before the following patch instead of after the top patch. When + no patch is in the series file, insert the new patch at the end + (i.e., after comments from setup, etc.) instead of at the top. + +------------------------------------------------------------------- Fri Aug 26 10:29:55 CEST 2005 - khali@linux-fr.org - quilt/import.in: Fix error path when imported patch doesn't diff --git a/scripts/patchfns.in b/scripts/patchfns.in index 0738a1b..c5156e2 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -191,7 +191,7 @@ patch_in_series() insert_in_series() { local patch=$1 patch_args=$2 - local top=$(top_patch) tmpfile + local next=$(patches_after "$(top_patch)" | head -n 1) tmpfile if [ -n "$patch_args" ] then @@ -200,12 +200,12 @@ insert_in_series() tmpfile=$(gen_tempfile) || return 1 mkdir -p $(dirname $SERIES) - if [ -n "$top" ] + if [ -n "$next" ] then @AWK@ ' - { print } - /^'"$(quote_re $top)"'([ \t]|$)/ \ + /^'"$(quote_re $next)"'([ \t]|$)/ \ { print "'"$patch$patch_args"'" } + { print } ' $SERIES > $tmpfile status=$? if [ $status -ne 0 ] @@ -214,11 +214,11 @@ insert_in_series() return 1 fi else - echo "$patch$patch_args" > $tmpfile if [ -e $SERIES ] then - cat $SERIES >> $tmpfile + cat $SERIES > $tmpfile fi + echo "$patch$patch_args" >> $tmpfile fi cat $tmpfile > $SERIES rm -f $tmpfile |