Fix compilation warning in apt-pkg/acquire.cc. New experimental release

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 6840ae120c4c9edd0a66043a0791aad1a05f6b16..80c2fee0f19b2feee5575a7f62e2568afaee9fc0 100644 (file)
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -796,7 +796,7 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner)
    // Compute the CPS
    struct timeval NewTime;
    gettimeofday(&NewTime,0);
    // Compute the CPS
    struct timeval NewTime;
    gettimeofday(&NewTime,0);

-   if (NewTime.tv_sec - Time.tv_sec == 6 && NewTime.tv_usec > Time.tv_usec ||
+   if ((NewTime.tv_sec - Time.tv_sec == 6 && NewTime.tv_usec > Time.tv_usec) ||

        NewTime.tv_sec - Time.tv_sec > 6)
    {    
       double Delta = NewTime.tv_sec - Time.tv_sec + 
        NewTime.tv_sec - Time.tv_sec > 6)
    {    
       double Delta = NewTime.tv_sec - Time.tv_sec + 

diff --git a/debian/changelog b/debian/changelog
index 0bb4fcdde3ec946a5a171982f83bdbbf3e344168..9f73c25ccd87d59e39086113d621f9ba732b4824 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.7.17~exp1) UNRELEASED; urgency=low
+
+  [ Luca Bruno ]
+  * apt-pkg/acquire.cc:
+    - fix a compilation warning
+
+ -- Luca Bruno <lethalman88@gmail.com>  Sat, 11 Oct 2008 09:17:46 +0200
+

 apt (0.7.16) unstable; urgency=low
 
   [ Luca Bruno ]
 apt (0.7.16) unstable; urgency=low
 
   [ Luca Bruno ]