diff options
-rw-r--r-- | po/de.po | 4 | ||||
-rw-r--r-- | po/fr.po | 4 | ||||
-rw-r--r-- | po/ja.po | 4 | ||||
-rw-r--r-- | po/quilt.pot | 4 | ||||
-rw-r--r-- | quilt.changes | 6 | ||||
-rw-r--r-- | quilt/scripts/patchfns.in | 9 |
6 files changed, 18 insertions, 13 deletions
@@ -1251,7 +1251,7 @@ msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n" msgid "Patch %s does not exist\\n" msgstr "Patch %s existiert nicht\\n" -#: quilt/scripts/patchfns.in:831 +#: quilt/scripts/patchfns.in:830 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1264,7 +1264,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: quilt/scripts/patchfns.in:916 +#: quilt/scripts/patchfns.in:915 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1264,7 +1264,7 @@ msgstr "La srie est compltement applique. Le dernier patch est %s.\\n" msgid "Patch %s does not exist\\n" msgstr "Le patch %s n'est pas dans la srie\\n" -#: quilt/scripts/patchfns.in:831 +#: quilt/scripts/patchfns.in:830 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1276,7 +1276,7 @@ msgstr "" "format %s (inclus). Veuillez retirer vos patches avec la version \n" "utilise pour les appliquer avant d'installer une version plus ancienne.\\n" -#: quilt/scripts/patchfns.in:916 +#: quilt/scripts/patchfns.in:915 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1228,7 +1228,7 @@ msgstr "" msgid "Patch %s does not exist\\n" msgstr "パッチ %s は seriesの中にありません\\n" -#: quilt/scripts/patchfns.in:831 +#: quilt/scripts/patchfns.in:830 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1240,7 +1240,7 @@ msgstr "" "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n" "すべてのパッチを pop してください。\\n" -#: quilt/scripts/patchfns.in:916 +#: quilt/scripts/patchfns.in:915 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/po/quilt.pot b/po/quilt.pot index d94154f..19ea580 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -870,7 +870,7 @@ msgstr "" msgid "Patch %s does not exist\\n" msgstr "" -#: quilt/scripts/patchfns.in:831 +#: quilt/scripts/patchfns.in:830 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -878,7 +878,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:916 +#: quilt/scripts/patchfns.in:915 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/quilt.changes b/quilt.changes index 87d87c0..96b15f8 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 24 03:28:12 CET 2006 - agruen@suse.de + +- quilt/scripts/parse-patch.in: files_in_patch improvement from + jayvdb@gmail.com. + +------------------------------------------------------------------- Mon Jan 23 21:40:26 CET 2006 - agruen@suse.de - configure.ac: Use $TR instead of tr. diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index 3286a2e..172e2b1 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -591,13 +591,12 @@ files_in_patch() { local patch="$1" local path="$QUILT_PC/$patch" + if [ -d "$path" ] then - for file in $(find "$path" -type f \ - -a ! -path "$path/.timestamp") - do - echo "${file:${#path}+1}" - done + find "$path" -type f \ + -a ! -path "$path/.timestamp" \ + -printf "%P\n" fi } |