From c20f67f082cdb11251c7af6786e5195d4cac3733 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2005 19:32:03 +0000 Subject: * corrections in the changelog --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 078d2c8b2..1aaae9ef3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,10 +13,10 @@ apt (0.6.41.1) unstable; urgency=low - patch-112: Swedish translation update - patch-115: Basque translation completed (Closes: #333299) * applied french man-page update (thanks to Philippe Batailler) - (closes: #316318, #327456) + (closes: #316638, #327456) * fix leak in the mmap code, thanks to Daniel Burrows for the patch (closes: #250583) - * support for apt-get source -t (and honor pining) (closes: #152129) + * support for apt-get [build-dep|source] -t (closes: #152129) * added "APT::Authentication::Trust-CDROM" option to make the life for the installer people easier (closes: #334656) * fix crash in apt-ftparchive (thanks to Bastian Blank for the patch) -- cgit v1.2.3 From 463870e4b43bd9bd15652010fdcdedb717d0aa7e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2005 19:41:09 +0000 Subject: * init the default ScreenWidth to 79 columns by default (Closes: #324921) --- cmdline/apt-get.cc | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 6e17611cb..3475d79ae 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -66,7 +66,7 @@ ostream c0out(0); ostream c1out(0); ostream c2out(0); ofstream devnull("/dev/null"); -unsigned int ScreenWidth = 80; +unsigned int ScreenWidth = 80 - 1; /* - 1 for the cursor */ // class CacheFile - Cover class for some dependency cache functions /*{{{*/ // --------------------------------------------------------------------- diff --git a/debian/changelog b/debian/changelog index 1aaae9ef3..e9f47e2d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ apt (0.6.41.1) unstable; urgency=low * apt-pkg/contrib/md5.cc: - fix a alignment problem on sparc64 that gives random bus errors (thanks to Fabbione for providing a test-case) + * init the default ScreenWidth to 79 columns by default + (Closes: #324921) -- -- cgit v1.2.3 From 4a5e5089e571b46becc22d05a8caaceccc6f6cd1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2005 19:46:33 +0000 Subject: apt-cdrom.cc:fix some missing gettext() calls (closes: #334539); doc/apt-cache.8.xml: fix typo (closes: #334714) --- cmdline/apt-cdrom.cc | 6 +++--- debian/changelog | 3 +++ doc/apt-cache.8.xml | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 2578f9c6b..7434a7225 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -75,7 +75,7 @@ string pkgCdromTextStatus::PromptLine(const char *Text) bool pkgCdromTextStatus::AskCdromName(string &name) { - cout << "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" << flush; + cout << _("Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'") << flush; name = PromptLine(""); return true; @@ -90,7 +90,7 @@ void pkgCdromTextStatus::Update(string text, int current) bool pkgCdromTextStatus::ChangeCdrom() { - Prompt("Please insert a Disc in the drive and press enter"); + Prompt(_("Please insert a Disc in the drive and press enter")); return true; } @@ -114,7 +114,7 @@ bool DoAdd(CommandLine &) pkgCdrom cdrom; res = cdrom.Add(&log); if(res) - cout << "Repeat this process for the rest of the CDs in your set." << endl; + cout << _("Repeat this process for the rest of the CDs in your set.") << endl; return res; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index e9f47e2d1..9ee7179d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,9 @@ apt (0.6.41.1) unstable; urgency=low (thanks to Fabbione for providing a test-case) * init the default ScreenWidth to 79 columns by default (Closes: #324921) + * cmdline/apt-cdrom.cc: + - fix some missing gettext() calls (closes: #334539) + * doc/apt-cache.8.xml: fix typo (closes: #334714) -- diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 34749fd77..0e1d2f8d9 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -214,7 +214,7 @@ Reverse Provides: rdepends pkg(s) - rdependsshows a listing of each reverse dependency a + rdepends shows a listing of each reverse dependency a package has. -- cgit v1.2.3 From 468155b77499bf1ecbfe29a318768d07a7a33919 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2005 19:50:11 +0000 Subject: * seting section to "admin" to match override file --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 6d9418a46..4aa7b5aa2 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg -Section: base +Section: admin Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. It provides the apt-get utility and APT dselect method that provides a -- cgit v1.2.3