From e6ba1a56311211613c93048dd189184b516e5315 Mon Sep 17 00:00:00 2001 From: Slava Semushin Date: Tue, 31 Jul 2007 23:22:22 +0700 Subject: [PATCH] Fixed typo in output of help command in apt-shell (#5400) --- apt-0.5.15lorg2-alt-i18n-apt-shell-typo.patch | 80 +++++++++++++++++++ apt.be.po | 2 +- apt.ru.po | 2 +- apt.spec | 4 + 4 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 apt-0.5.15lorg2-alt-i18n-apt-shell-typo.patch diff --git a/apt-0.5.15lorg2-alt-i18n-apt-shell-typo.patch b/apt-0.5.15lorg2-alt-i18n-apt-shell-typo.patch new file mode 100644 index 0000000..ed3b55b --- /dev/null +++ b/apt-0.5.15lorg2-alt-i18n-apt-shell-typo.patch @@ -0,0 +1,80 @@ + +https://bugzilla.altlinux.org/show_bug.cgi?id=5400 + +--- apt/cmdline/apt-shell.cc.orig 2007-07-31 23:15:06 +0700 ++++ apt/cmdline/apt-shell.cc 2007-07-31 23:15:56 +0700 +@@ -3769,7 +3769,7 @@ bool ShowHelp(CommandLine &CmdL) + " remove - Remove packages\n" + " keep - Keep packages\n" + " upgrade - Perform a global upgrade\n" +- " dist-upgrade - Perform a globla distribution upgrade\n" ++ " dist-upgrade - Perform a global distribution upgrade\n" + " build-dep - Install build-dependencies for source packages\n" + // " dselect-upgrade - Follow dselect selections\n" + " update - Retrieve new lists of packages\n" +--- apt/po/de_DE.po.orig 2007-07-31 23:14:58 +0700 ++++ apt/po/de_DE.po 2007-07-31 23:15:56 +0700 +@@ -1122,7 +1122,7 @@ msgid "" + " remove - Remove packages\n" + " keep - Keep packages\n" + " upgrade - Perform a global upgrade\n" +-" dist-upgrade - Perform a globla distribution upgrade\n" ++" dist-upgrade - Perform a global distribution upgrade\n" + " build-dep - Install build-dependencies for source packages\n" + " update - Retrieve new lists of packages\n" + " commit - Apply the changes in the system\n" +--- apt/po/es_ES.po.orig 2007-07-31 23:14:58 +0700 ++++ apt/po/es_ES.po 2007-07-31 23:15:56 +0700 +@@ -1101,7 +1101,7 @@ msgid "" + " remove - Remove packages\n" + " keep - Keep packages\n" + " upgrade - Perform a global upgrade\n" +-" dist-upgrade - Perform a globla distribution upgrade\n" ++" dist-upgrade - Perform a global distribution upgrade\n" + " build-dep - Install build-dependencies for source packages\n" + " update - Retrieve new lists of packages\n" + " commit - Apply the changes in the system\n" +--- apt/po/it_IT.po.orig 2007-07-31 23:14:58 +0700 ++++ apt/po/it_IT.po 2007-07-31 23:15:56 +0700 +@@ -1106,7 +1106,7 @@ msgid "" + " remove - Remove packages\n" + " keep - Keep packages\n" + " upgrade - Perform a global upgrade\n" +-" dist-upgrade - Perform a globla distribution upgrade\n" ++" dist-upgrade - Perform a global distribution upgrade\n" + " build-dep - Install build-dependencies for source packages\n" + " update - Retrieve new lists of packages\n" + " commit - Apply the changes in the system\n" +--- apt/po/ja.po.orig 2007-07-31 23:14:58 +0700 ++++ apt/po/ja.po 2007-07-31 23:15:56 +0700 +@@ -1204,7 +1204,7 @@ msgid "" + " remove - Remove packages\n" + " keep - Keep packages\n" + " upgrade - Perform a global upgrade\n" +-" dist-upgrade - Perform a globla distribution upgrade\n" ++" dist-upgrade - Perform a global distribution upgrade\n" + " build-dep - Install build-dependencies for source packages\n" + " update - Retrieve new lists of packages\n" + " commit - Apply the changes in the system\n" +--- apt/po/pt_BR.po.orig 2007-07-31 23:14:58 +0700 ++++ apt/po/pt_BR.po 2007-07-31 23:15:56 +0700 +@@ -1203,7 +1203,7 @@ msgid "" + " remove - Remove packages\n" + " keep - Keep packages\n" + " upgrade - Perform a global upgrade\n" +-" dist-upgrade - Perform a globla distribution upgrade\n" ++" dist-upgrade - Perform a global distribution upgrade\n" + " build-dep - Install build-dependencies for source packages\n" + " update - Retrieve new lists of packages\n" + " commit - Apply the changes in the system\n" +--- apt/po/ru.po.orig 2007-07-31 23:14:58 +0700 ++++ apt/po/ru.po 2007-07-31 23:15:56 +0700 +@@ -1221,7 +1221,7 @@ msgid "" + " remove - Remove packages\n" + " keep - Keep packages\n" + " upgrade - Perform a global upgrade\n" +-" dist-upgrade - Perform a globla distribution upgrade\n" ++" dist-upgrade - Perform a global distribution upgrade\n" + " build-dep - Install build-dependencies for source packages\n" + " update - Retrieve new lists of packages\n" + " commit - Apply the changes in the system\n" diff --git a/apt.be.po b/apt.be.po index 0feee0b..9ffdb7c 100644 --- a/apt.be.po +++ b/apt.be.po @@ -1201,7 +1201,7 @@ msgid "" " remove - Remove packages\n" " keep - Keep packages\n" " upgrade - Perform a global upgrade\n" -" dist-upgrade - Perform a globla distribution upgrade\n" +" dist-upgrade - Perform a global distribution upgrade\n" " build-dep - Install build-dependencies for source packages\n" " update - Retrieve new lists of packages\n" " commit - Apply the changes in the system\n" diff --git a/apt.ru.po b/apt.ru.po index b321408..ba221b3 100644 --- a/apt.ru.po +++ b/apt.ru.po @@ -1218,7 +1218,7 @@ msgid "" " remove - Remove packages\n" " keep - Keep packages\n" " upgrade - Perform a global upgrade\n" -" dist-upgrade - Perform a globla distribution upgrade\n" +" dist-upgrade - Perform a global distribution upgrade\n" " build-dep - Install build-dependencies for source packages\n" " update - Retrieve new lists of packages\n" " commit - Apply the changes in the system\n" diff --git a/apt.spec b/apt.spec index 4662dab..0e14c3e 100644 --- a/apt.spec +++ b/apt.spec @@ -63,6 +63,9 @@ Patch49: apt-0.5.15lorg2-alt-apt-get-simple-output.patch Patch50: apt-0.5.15lorg2-alt-versionmatch-TryToChangeVer.patch Patch51: apt-0.5.15lorg3-alt-exit-status.patch +# Fix for bug #5400 +Patch52: apt-0.5.15lorg2-alt-i18n-apt-shell-typo.patch + # Normally not applied, but useful. Patch101: apt-0.5.4cnc9-alt-getsrc-debug.patch @@ -270,6 +273,7 @@ This package contains method 'rsync' for APT. %patch49 -p1 %patch50 -p1 %patch51 -p1 +%patch52 -p1 find -type f -name \*.orig -delete