* Fix compilation warnings in apt-pkg/cdrom.cc and

  apt-pkg/contrib/configuration.cc.

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 0cbdc178fa77eb8463e76181a361710b5489b3b2..370687f2485a632ecb6073d58a74bc7b340833d1 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -675,8 +675,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
    DropRepeats(TransList,"");
    if(log) {
       msg.str("");
-      ioprintf(msg, _("Found %u package indexes, %u source indexes, "
-                     "%u translation indexes and %u signatures\n"), 
+      ioprintf(msg, _("Found %zu package indexes, %zu source indexes, "
+                     "%zu translation indexes and %zu signatures\n"), 
               List.size(), SourceList.size(), TransList.size(),
               SigList.size());
       log->Update(msg.str(), STEP_SCAN);

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index e8301d918a6c192df14800bc7f6c8acddb40de7b..da57c2054cdfbbd389b8aed86a8a0e89461060cd 100644 (file)
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -512,7 +512,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
       CurLine++;
       // This should be made to work instead, but this is better than looping
       if (F.fail() && !F.eof())
-         return _error->Error(_("Line %d too long (max %u)"), CurLine, sizeof(Buffer));
+         return _error->Error(_("Line %d too long (max %lu)"), CurLine, sizeof(Buffer));
 
       _strtabexpand(Buffer,sizeof(Buffer));
       _strstrip(Buffer);

diff --git a/debian/changelog b/debian/changelog
index ef9784178646a042cab658d4ad5d7c122cc99e08..749609c8fe877dd5ac59714ba803d1e01f7a07c8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ apt (0.7.10) UNRELEASED; urgency=low
     closes: #438136.
   * Fix cron.daily job to not call fail if apt isn't installed, closes:
     #443286.
+  * Fix compilation warnings in apt-pkg/cdrom.cc and
+    apt-pkg/contrib/configuration.cc.
 
   [ Program translations ]
     - Basque updated. Closes: #453088
@@ -59,7 +61,7 @@ apt (0.7.10) UNRELEASED; urgency=low
   * Fix wording for "After unpacking...". Thans to Michael Gilbert
     for the patch. Closes: #260825
 
- -- Christian Perrier <bubulle@debian.org>  Mon, 17 Dec 2007 10:10:17 +0530
+ -- Otavio Salvador <otavio@debian.org>  Thu, 27 Dec 2007 15:04:23 -0200
 
 apt (0.7.9) unstable; urgency=low