merge train fixes

diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 317048845c1a89fb9a1ee0d8941ad413d0b05518..17a6b70e91c92886cd2c379f2e6e848bbd087463 100644 (file)
--- 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/apt.cron.daily b/debian/apt.cron.daily
index 5c00f22db11b9e5af618df3ef75e84c88ab190a5..27f08dd4aa8e273069bfc37b08b97088f54cde07 100644 (file)
--- 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 46213d779feb7d54e6382c2d627f7676fb398a8e..840d9ebd9bf85e807b8465da7027aebe4299a0d4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,15 @@ apt (0.9.7.8) UNRELEASED; urgency=low
     Closes: #697577
   * 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
 

diff --git a/debian/rules b/debian/rules
index 83e23881c49b17469b0ad67cd43ed5bf179beb4a..5051dab4f8caaa32bcd05574dd71fee51a567684 100755 (executable)
--- 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$@