summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmdline/apt-cdrom.cc6
-rw-r--r--cmdline/apt-get.cc2
-rw-r--r--debian/changelog41
-rw-r--r--debian/control2
-rw-r--r--doc/apt-cache.8.xml2
5 files changed, 29 insertions, 24 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/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 605e56eab..ff400a6ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,13 @@
-apt (0.6.41.0exp2) experimental; urgency=low
+apt (0.6.42.0exp1) experimental; urgency=low
- * support for apt-get source -t (and honor pining) (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)
- (closes: #334671)
- * apt-pkg/contrib/md5.cc:
- - fix a alignment problem on sparc64 that gives random bus errors
- (thanks to Fabbione for providing a test-case)
+ * added support for package index diffs
+ * added support for i18n of the package descriptions
+ * build from mvo@debian.org--2005/apt--debian-experimental--0
+ (from http://people.debian.org/~mvo/arch)
- -- Michael Vogt <mvo@debian.org> Wed, 19 Oct 2005 16:19:49 +0200
+ -- Michael Vogt <mvo@debian.org> Wed, 19 Oct 2005 22:12:13 +0200
-apt (0.6.41.0exp1) experimental; urgency=low
+apt (0.6.42) unstable; urgency=low
* apt-pkg/cdrom.cc:
- unmount the cdrom when apt failed to locate any package files
@@ -26,15 +22,24 @@ apt (0.6.41.0exp1) experimental; 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)
- * added support for package index diffs
- * added support for i18n of the package descriptions
- * build from mvo@debian.org--2005/apt--debian-experimental--0
- (from http://people.debian.org/~mvo/arch)
-
- -- Michael Vogt <mvo@debian.org> Mon, 17 Oct 2005 17:16:45 +0200
+ * 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)
+ (closes: #334671)
+ * 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)
+ * cmdline/apt-cdrom.cc:
+ - fix some missing gettext() calls (closes: #334539)
+ * doc/apt-cache.8.xml: fix typo (closes: #334714)
+
+ -- Michael Vogt <mvo@debian.org> Wed, 19 Oct 2005 22:02:09 +0200
apt (0.6.41) unstable; urgency=low
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
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:
</varlistentry>
<varlistentry><term>rdepends <replaceable>pkg(s)</replaceable></term>
- <listitem><para><literal>rdepends</literal>shows a listing of each reverse dependency a
+ <listitem><para><literal>rdepends</literal> shows a listing of each reverse dependency a
package has.</para></listitem>
</varlistentry>