From 0425a56bf14c2411534326a0d3410a512c5ddeaa Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 8 Jan 2013 18:42:09 +0100 Subject: add missing translated apt.8 manpages, thanks to Helge Kreutzmann. Closes: #696923 --- debian/changelog | 2 ++ debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dcc6e4d16..e308eb02c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ apt (0.9.7.8) UNRELEASED; urgency=low [ Michael Vogt ] * fix pkgProblemResolver::Scores, thanks to Paul Wise. Closes: #697577 + * add missing translated apt.8 manpages, thanks to Helge Kreutzmann. + Closes: #696923 -- Christian Perrier Mon, 24 Dec 2012 07:01:20 +0100 diff --git a/debian/rules b/debian/rules index 83e23881c..5051dab4f 100755 --- a/debian/rules +++ b/debian/rules @@ -172,7 +172,7 @@ apt-doc: build-debiandoc # Build architecture-dependent files here. binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https -apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list +apt_MANPAGES = apt apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list apt: build build-manpages dh_testdir -p$@ dh_testroot -p$@ -- cgit v1.2.3-70-g09d2 From 291f47791d2c0d8521922c8d3090e2aa6f099d5b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Jan 2013 06:33:56 +0100 Subject: * apt-pkg/contrib/progress.cc: - Make "..." translatable to fix inconsistencies in the output of e.g. apt-get update. While this adds new translatable strings, not having translations for them will not break anything. Thanks to Guillem Jover. Closes: #696225 --- apt-pkg/contrib/progress.cc | 4 ++-- debian/changelog | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index 317048845..17a6b70e9 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -176,7 +176,7 @@ void OpTextProgress::Update() if (OldOp.empty() == false) cout << endl; OldOp = "a"; - cout << Op << "..." << flush; + cout << Op << _("...") << flush; } return; @@ -192,7 +192,7 @@ void OpTextProgress::Update() } // Print the spinner - snprintf(S,sizeof(S),"\r%s... %u%%",Op.c_str(),(unsigned int)Percent); + snprintf(S,sizeof(S),_("\r%s... %u%%"),Op.c_str(),(unsigned int)Percent); Write(S); OldOp = Op; diff --git a/debian/changelog b/debian/changelog index e308eb02c..02fcdaa8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,11 @@ apt (0.9.7.8) UNRELEASED; urgency=low Closes: #697577 * add missing translated apt.8 manpages, thanks to Helge Kreutzmann. Closes: #696923 + * apt-pkg/contrib/progress.cc: + - Make "..." translatable to fix inconsistencies in the output + of e.g. apt-get update. While this adds new translatable strings, + not having translations for them will not break anything. + Thanks to Guillem Jover. Closes: #696225 -- Christian Perrier Mon, 24 Dec 2012 07:01:20 +0100 -- cgit v1.2.3-70-g09d2 From 50816ce74432f24135aefc590361bbb8ccfc71f1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Jan 2013 06:57:13 +0100 Subject: * debian/apt.cron.daily: - when reading from /dev/urandom, use less entropy and fix a rare bug when the random number chksum is less than 1000. Closes: #695285 --- debian/apt.cron.daily | 2 +- debian/changelog | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 5c00f22db..27f08dd4a 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -289,7 +289,7 @@ random_sleep() fi if [ -z "$RANDOM" ] ; then # A fix for shells that do not have this bash feature. - RANDOM=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c"1-5") + RANDOM=$(dd if=/dev/urandom bs=2 count=1 2> /dev/null | cksum | cut -d' ' -f1 | cut -c"1-5") fi TIME=$(($RANDOM % $RandomSleep)) debug_echo "sleeping for $TIME seconds" diff --git a/debian/changelog b/debian/changelog index 02fcdaa8b..d08dd8038 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,10 @@ apt (0.9.7.8) UNRELEASED; urgency=low of e.g. apt-get update. While this adds new translatable strings, not having translations for them will not break anything. Thanks to Guillem Jover. Closes: #696225 + * debian/apt.cron.daily: + - when reading from /dev/urandom, use less entropy and fix a rare + bug when the random number chksum is less than 1000. + Closes: #695285 -- Christian Perrier Mon, 24 Dec 2012 07:01:20 +0100 -- cgit v1.2.3-70-g09d2