From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 9 Jan 2013 07:25:14 +0000 (+0100)
Subject: merge train fixes
X-Git-Tag: 0.9.8~53
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/d52f514fd380cdeef7ff68a54f81b82932d113cf?ds=sidebyside

merge train fixes
---

d52f514fd380cdeef7ff68a54f81b82932d113cf
diff --cc debian/changelog
index 46213d779,d08dd8038..840d9ebd9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -6,8 -6,17 +6,17 @@@ apt (0.9.7.8) UNRELEASED; urgency=lo
    [ Michael Vogt ]
    * fix pkgProblemResolver::Scores, thanks to Paul Wise. 
      Closes: #697577
 -  * add missing translated apt.8 manpages, thanks to Helge Kreutzmann.
 -    Closes: #696923
 +  * fix missing translated apt.8 manpages, thanks to Helge Kreutzmann
 +    for the report. 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
+   * 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 <bubulle@debian.org>  Mon, 24 Dec 2012 07:01:20 +0100