From: Michael Vogt <egon@debian-devbox>
Date: Wed, 18 Jan 2012 09:27:15 +0000 (+0100)
Subject: * apt-pkg/contrib/fileutl.h:
X-Git-Tag: 0.9.0~31
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/743b2763c20e5612938f11679ef3524682728a7a?hp=-c

* apt-pkg/contrib/fileutl.h:
  - store the offset in the internal fd before calculate size of
    the zlib-handled file to jump back to this place again
* apt-pkg/contrib/fileutl.h:
---

743b2763c20e5612938f11679ef3524682728a7a
diff --combined debian/changelog
index 80f575dd2,c7c33fef1..db4e63d35
--- a/debian/changelog
+++ b/debian/changelog
@@@ -9,12 -9,15 +9,15 @@@ apt (0.8.16~exp10) UNRELEASED; urgency=
    * apt-pkg/deb/dpkgpm.cc:
      - check if dpkg supports multiarch with --assert-multi-arch
        and if it does be always explicit about the architecture
+   * apt-pkg/contrib/fileutl.h:
+     - store the offset in the internal fd before calculate size of
+       the zlib-handled file to jump back to this place again
  
    [ Michael Vogt ]
-   * apt-pkg/contrib/fileutils.h:
+   * apt-pkg/contrib/fileutl.h:
      - fix segfault from python-apt testsuite
  
 - -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 18 Jan 2012 00:47:54 +0100
 + -- Michael Vogt <mvo@debian.org>  Tue, 17 Jan 2012 12:06:15 +0100
  
  apt (0.8.16~exp9) experimental; urgency=low
  
@@@ -264,10 -267,6 +267,10 @@@ apt (0.8.15.10) UNRELEASEDunstable; urg
      - show a debug why a package was kept by ResolveByKeep()
    * doc/manpage-style.xml:
      - put <brackets> around email addresses
 +  * apt-pkg/aptconfiguration.cc:
 +    - parse dpkg --print-foreign-architectures correctly in
 +      case archs are separated by newline instead of space, too.
 +      (Closes: #655590)
    * doc/po/de.po:
      - apply typo-fix from Michael Basse, thanks! (LP: #900770)
  
@@@ -276,13 -275,10 +279,13 @@@
    * doc/*.xml:
      - find and fix a bunch of misspellings
  
 -  [ Program translation updatex ]
 +  [ Program translation updates ]
    * Dutch (Jeroen Schot). Closes: #652230
 +  * Slovak (Ivan Masar). Closes: #652985
 +  * Russian (Yuri Kozlov). Closes: #654844
 +  * Hungarian (Gabor Kelemen). Closes: #655238
  
 - -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 06 Dec 2011 16:35:39 +0100
 + -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 13 Jan 2012 17:30:36 +0100
  
  apt (0.8.15.9) unstable; urgency=low