diff options
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | po/de.po | 16 | ||||
-rw-r--r-- | po/fr.po | 16 | ||||
-rw-r--r-- | po/ja.po | 16 | ||||
-rw-r--r-- | po/quilt.pot | 16 | ||||
-rw-r--r-- | po/ru.po | 16 | ||||
-rw-r--r-- | quilt.changes | 10 | ||||
-rw-r--r-- | quilt/scripts/parse-patch.in | 178 |
8 files changed, 11 insertions, 259 deletions
diff --git a/Makefile.in b/Makefile.in index ba731f0..d2155df 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,7 +84,7 @@ QUILT := $(QUILT_IN) SRC += $(QUILT_SRC:%=quilt/%) DIRT += $(QUILT_IN:%=quilt/%) -SCRIPTS_IN := patchfns parse-patch inspect dependency-graph edmail \ +SCRIPTS_IN := patchfns inspect dependency-graph edmail \ remove-trailing-ws SCRIPTS_SRC := $(SCRIPTS_IN:%=%.in) @@ -1395,22 +1395,6 @@ msgstr "Anzeigename `%s' enthält eine unvollständige Klammerung\n" msgid "Delivery address `%s' is invalid\n" msgstr "Zustelladresse `%s' ist ungültig\n" -#: quilt/scripts/parse-patch.in:50 -#, perl-format -msgid "USAGE: %s {-s|-u} section file [< replacement]\n" -msgstr "" - -#: quilt/scripts/parse-patch.in:101 quilt/scripts/parse-patch.in:108 -#: quilt/scripts/parse-patch.in:115 quilt/scripts/parse-patch.in:122 -#, fuzzy, perl-format -msgid "File %s disappeared!\n" -msgstr "Datei %s ist unverändert\\n" - -#: quilt/scripts/parse-patch.in:168 quilt/scripts/parse-patch.in:174 -#, fuzzy, perl-format -msgid "Failed to rename %s to %s: %s\n" -msgstr "Umbenennen von %s auf %s: %s\n" - #: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539 #, fuzzy msgid "%s is not a regular file\\n" @@ -1419,22 +1419,6 @@ msgstr "Le nom `%s' est mal parenthésé\n" msgid "Delivery address `%s' is invalid\n" msgstr "L'adresse de destination `%s' est invalide\n" -#: quilt/scripts/parse-patch.in:50 -#, perl-format -msgid "USAGE: %s {-s|-u} section file [< replacement]\n" -msgstr "USAGE : %s {-s|-u} section fichier [< remplacement]\n" - -#: quilt/scripts/parse-patch.in:101 quilt/scripts/parse-patch.in:108 -#: quilt/scripts/parse-patch.in:115 quilt/scripts/parse-patch.in:122 -#, perl-format -msgid "File %s disappeared!\n" -msgstr "Le fichier %s a disparu !\n" - -#: quilt/scripts/parse-patch.in:168 quilt/scripts/parse-patch.in:174 -#, perl-format -msgid "Failed to rename %s to %s: %s\n" -msgstr "Impossible de renommer %s en %s : %s\n" - #: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539 msgid "%s is not a regular file\\n" msgstr "%s n'est pas un fichier régulier\\n" @@ -1379,22 +1379,6 @@ msgstr "表示用の名前 `%s' が対にならない括弧を含んでいます msgid "Delivery address `%s' is invalid\n" msgstr "配送先のアドレス `%s' が不正です\n" -#: quilt/scripts/parse-patch.in:50 -#, perl-format -msgid "USAGE: %s {-s|-u} section file [< replacement]\n" -msgstr "" - -#: quilt/scripts/parse-patch.in:101 quilt/scripts/parse-patch.in:108 -#: quilt/scripts/parse-patch.in:115 quilt/scripts/parse-patch.in:122 -#, fuzzy, perl-format -msgid "File %s disappeared!\n" -msgstr "ファイル %s に変更はありません\\n" - -#: quilt/scripts/parse-patch.in:168 quilt/scripts/parse-patch.in:174 -#, fuzzy, perl-format -msgid "Failed to rename %s to %s: %s\n" -msgstr "%s から %s へ名前を変更しました: %s\n" - #: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539 msgid "%s is not a regular file\\n" msgstr "%s は普通のファイルではありません\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 8c78e33..33da106 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -951,22 +951,6 @@ msgstr "" msgid "Delivery address `%s' is invalid\n" msgstr "" -#: quilt/scripts/parse-patch.in:50 -#, perl-format -msgid "USAGE: %s {-s|-u} section file [< replacement]\n" -msgstr "" - -#: quilt/scripts/parse-patch.in:101 quilt/scripts/parse-patch.in:108 -#: quilt/scripts/parse-patch.in:115 quilt/scripts/parse-patch.in:122 -#, perl-format -msgid "File %s disappeared!\n" -msgstr "" - -#: quilt/scripts/parse-patch.in:168 quilt/scripts/parse-patch.in:174 -#, perl-format -msgid "Failed to rename %s to %s: %s\n" -msgstr "" - #: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539 msgid "%s is not a regular file\\n" msgstr "" @@ -1306,22 +1306,6 @@ msgstr "Отображаемое имя '%s' содержит непарные msgid "Delivery address `%s' is invalid\n" msgstr "Некорректный адрес назначения '%s'\n" -#: quilt/scripts/parse-patch.in:50 -#, perl-format -msgid "USAGE: %s {-s|-u} section file [< replacement]\n" -msgstr "СИНТАКСИС: %s {-s|-u} секция файл [< замена]\n" - -#: quilt/scripts/parse-patch.in:101 quilt/scripts/parse-patch.in:108 -#: quilt/scripts/parse-patch.in:115 quilt/scripts/parse-patch.in:122 -#, perl-format -msgid "File %s disappeared!\n" -msgstr "Файл %s исчез!\n" - -#: quilt/scripts/parse-patch.in:168 quilt/scripts/parse-patch.in:174 -#, perl-format -msgid "Failed to rename %s to %s: %s\n" -msgstr "Не удалось переименовать %s в %s: %s\n" - #: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539 #, fuzzy msgid "%s is not a regular file\\n" diff --git a/quilt.changes b/quilt.changes index 5af8340..be14234 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Sat Jan 28 15:47:53 CET 2012 - jdelvare@suse.de + +- Remove parse-patch which is no longer used. Based on a + preliminary patch by Yasushi SHOJI. + + None of quilt code uses parse-patch anymore. The last one, it seems, + was contrib/import.diff, which was removed at 2f9728a9. So, just + remove it. + +------------------------------------------------------------------- Mon Jan 23 13:56:57 CET 2012 - jdelvare@suse.de - scripts/inspect.in: Leave stderr free for actual error reporting. diff --git a/quilt/scripts/parse-patch.in b/quilt/scripts/parse-patch.in deleted file mode 100644 index 959e632..0000000 --- a/quilt/scripts/parse-patch.in +++ /dev/null @@ -1,178 +0,0 @@ -#!@PERL@ -w - -# This script is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# See the COPYING and AUTHORS files for more details. - -# Extract or update a section from a combined patch + documentation + -# meta information file. - -use FileHandle; -use Getopt::Long; -use File::Temp qw(tempfile); -use strict; - -# This ugly trick lets the script work even if gettext support is missing. -# We did so because Locale::gettext doesn't ship with the standard perl -# distribution. -BEGIN { - if (eval { require Locale::gettext }) { - import Locale::gettext; - require POSIX; - import POSIX, qw(setlocale); - } else { - eval ' - use constant LC_MESSAGES => 0; - sub setlocale($$) { } - sub bindtextdomain($$) { } - sub textdomain($) { } - sub gettext($) { shift } - ' - } -} - -setlocale(LC_MESSAGES, ""); -bindtextdomain("quilt", "@LOCALEDIR@"); -textdomain("quilt"); - -sub _($) { - return gettext(shift); -} - -my $select; -my $update; - -if (!GetOptions("s|select=s" => \$select, - "u|update=s" => \$update) || - (!defined $select && !defined $update)) { - print STDERR sprintf(_("USAGE: %s {-s|-u} section file [< replacement]\n"), $0); - exit 1; -} - -foreach my $arg (@ARGV) { - my $fh; - - if (! -e $arg) { - $fh = new FileHandle("/dev/null"); - } elsif ($arg =~ /\.gz$/) { - $fh = new FileHandle("gzip -cd $arg |"); - } elsif ($arg =~ /\.bz2$/) { - $fh = new FileHandle("bzip2 -cd $arg |"); - } elsif ($arg =~ /\.xz$/) { - $fh = new FileHandle("xz -cd $arg |"); - } elsif ($arg =~ /\.lzma$/) { - $fh = new FileHandle("lzma -cd $arg |"); - } else { - $fh = new FileHandle("< $arg"); - } - - unless ($fh) { - print STDERR "$arg: $!\n"; - next; - } - - if (defined $select) { - my $section = "head"; - my $newline = ""; - while (<$fh>) { - if (/^%(.*)/) { - last if $section eq $select; - $section = $1; - next; - } - if ($section eq $select) { - print $newline; - if ($_ eq "\n") { - $newline = $_; - } else { - $newline=""; - print; - } - } - } - } elsif (defined $update) { - my ($fh2, $tempname) = tempfile("$arg.XXXXXX"); - if ($arg =~ /\.gz$/) { - $fh2->close(); - if (! -e $tempname) { - die sprintf( -_("File %s disappeared!\n"), $tempname); - } - $fh2 = new FileHandle("| gzip -c > $tempname"); - } elsif ($arg =~ /\.bz2$/) { - $fh2->close(); - if (! -e $tempname) { - die sprintf( -_("File %s disappeared!\n"), $tempname); - } - $fh2 = new FileHandle("| bzip2 -c > $tempname"); - } elsif ($arg =~ /\.xz$/) { - $fh2->close(); - if (! -e $tempname) { - die sprintf( -_("File %s disappeared!\n"), $tempname); - } - $fh2 = new FileHandle("| xz -c > $tempname"); - } elsif ($arg =~ /\.lzma$/) { - $fh2->close(); - if (! -e $tempname) { - die sprintf( -_("File %s disappeared!\n"), $tempname); - } - $fh2 = new FileHandle("| lzma -c > $tempname"); - } - unless ($fh2) { - die "$tempname: $!\n"; - } - - # Copy things before updated section - my $last_was_newline=1; # start first section in first line - while (<$fh>) { - if (/^%(.*)/ && $1 eq $update) { - last; - } - $last_was_newline = ($_ eq "\n"); - print $fh2 $_; - } - print $fh2 "\n" - unless ($last_was_newline); - - # Create/replace updated section - print $fh2 "%$update\n"; - while (<STDIN>) { - print $fh2 $_; - } - print $fh2 "\n"; - - # Skip obsolete section - while (<$fh>) { - if (/^%(.*)/) { - print $fh2 $_; - last; - } - } - # Copy things after updated section - while (<$fh>) { - print $fh2 $_; - } - unless (close $fh2) { - die "$arg.patch: $!\n"; - } - - if (-e $arg) { - unlink "$arg~"; - unless (rename $arg, "$arg~") { - die sprintf( -_("Failed to rename %s to %s: %s\n"), $arg, "$arg~", $!); - } - } - unless (rename $tempname, $arg) { - rename("$arg~", $arg); - die sprintf( -_("Failed to rename %s to %s: %s\n"), $tempname, $arg, $!); - } - } - close $fh; -} |