* debian/rules:

  - Fixed lintian warnings "debian/rules ignores make errors".
* debian/control:
  - Substituted outdated "Source-Version" fields with "binary:Version".
  - Added 'python-apt' to Suggests, as apt-mark need it for work.
  - Drop Debian revision from 'doc-base' build dependency, this fixes
    appropriate lintian warning.
* debian/libapt-pkg-doc.doc-base.*:
  - Changed section: from old 'Devel' to 'Debian'. This fixes appropriate
    lintian warnings.
* debian/{postrm,prerm,preinst}:
  - Added 'set -e', fixes lintian warnings
    'maintainer-script-ignores-error'.
* dselect/makefile:
  - Removed unneeded 'LOCAL' entry. This allows cleaning rule to run smoothly.
* share/lintian-overrides:
  - Added with override of 'apt must depend on python'. Script 'apt-mark'
    needs apt-python for working and checks this on fly. We don't want
    python in most cases.
* cmdline/apt-key:
  - Added 'unset GREP_OPTIONS' to the script. This prevents 'apt-key update'
    failure when GREP_OPTIONS contains options that modify grep output.
    (Closes: #428752)
* apt-pkg/acquire-item.cc:
  - fix a merge mistake that prevents the fallback to the 
    uncompressed 'Packages' to work correctly (closes: #409284)
* apt-pkg/acquire-item.cc:
  - Added fallback to uncompressed 'Packages' if neither 'bz2' nor 'gz'
    available. (Closes: #409284)
* apt-pkg/algorithm.cc:
  - Strip username and password from source URL in error message.
    (Closes: #425150)

* fix various -Wall warnings

1 files changed, 3 insertions, 2 deletions

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index abcae46fe..eed438250 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -192,7 +192,8 @@ DynamicMMap::~DynamicMMap()
    unsigned long EndOfFile = iSize;
    iSize = WorkSpace;
    Close(false);
-   ftruncate(Fd->Fd(),EndOfFile);
+   if(ftruncate(Fd->Fd(),EndOfFile) < 0)
+      _error->Errno("ftruncate", _("Failed to truncate file"));
 }  
 									/*}}}*/
 // DynamicMMap::RawAllocate - Allocate a raw chunk of unaligned space	/*{{{*/
@@ -209,7 +210,7 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln)
    // Just in case error check
    if (Result + Size > WorkSpace)
    {
-      _error->Error("Dynamic MMap ran out of room");
+      _error->Error(_("Dynamic MMap ran out of room"));
       return 0;
    }