* apt-pkg/deb/dpkgpm.{cc,h}:

  - merged dpkg-log branch, this lets you specify a
    Dir::Log::Terminal file to log dpkg output to
    ABI break

diff --cc apt-pkg/init.cc
Simple merge

diff --cc apt-pkg/init.h
index b33d2db81435b7554c3c10f33fecc991b2a478a8,bc0e5503658c572c349052697a69d9a51c96250c..23e951effac738fd157ad06a232c78b57d4787f6
--- 1/apt-pkg/init.h
--- 2/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@@ -18,7 -18,7 +18,7 @@@
  
  // See the makefile
  #define APT_PKG_MAJOR 4
--#define APT_PKG_MINOR 4
++#define APT_PKG_MINOR 5
  #define APT_PKG_RELEASE 0
      
  extern const char *pkgVersion;

diff --cc apt-pkg/makefile
index df9954f67579b6f7125e584ef8f8bcc901544db1,8dd50b8c23c321236acd54fc368feae361ab9f77..b327dbf6489a4facdb8abe7ee23a1173dd85d5e3
--- 1/apt-pkg/makefile
--- 2/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@@ -13,9 -13,9 +13,9 @@@ include ../buildlib/defaults.ma
  # methods/makefile - FIXME
  LIBRARY=apt-pkg
  LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
--MAJOR=4.4
++MAJOR=4.5
  MINOR=0
- SLIBS=$(PTHREADLIB) $(INTLLIBS)
+ SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil
  APT_DOMAIN:=libapt-pkg$(MAJOR)
  
  # Source code for the contributed non-core things

diff --cc debian/changelog
index b9824f84a9e6920fda6726652913d09788b525c8,cb86ce5802a2a2d2adad851a58dc83317f42cac8..8c0bc2d0ed78d420451b1893e20921bf89b87269
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,80 -1,8 +1,84 @@@
 -apt (0.7.4) UNRELEASED; urgency=low
 +apt (0.7.7) UNRELEASED; urgency=low
  
 -  * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)
 +  * apt-inst/contrib/extracttar.cc:
 +    - fix fd leak for zero size files (thanks to Bill Broadley for
 +      reporting this bug)
 +  * apt-pkg/acquire-item.cc:
 +    - remove zero size files on I-M-S hit
 +  * methods/https.cc:
 +    - only send LastModified if we actually have one
 +    - send range request with if-range 
 +    - delete failed downloads
++  * apt-pkg/deb/dpkgpm.{cc,h}:
++    - merged dpkg-log branch, this lets you specify a 
++      Dir::Log::Terminal file to log dpkg output to
++      ABI break
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 02 Aug 2007 11:55:54 +0200
 +
 +apt (0.7.6) unstable; urgency=low
 +
 +  * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong
 +    directory downloading on non-linux architectures (closes: #435597)
 +
 + -- Otavio Salvador <otavio@debian.org>  Wed, 01 Aug 2007 19:49:51 -0300
 +
 +apt (0.7.5) unstable; urgency=low
 +
 +  [ Otavio Salvador ]
 +  * Applied patch from Guillem Jover <guillem@debian.org> to use
 +    dpkg-architecture to get the host architecture (closes: #407187)
 +  * Applied patch from Guillem Jover <guillem@debian.org> to add
 +    support to add lzma support (closes: #408201)
  
 - -- Otavio Salvador <otavio@ossystems.com.br>  Mon, 02 Jul 2007 13:27:54 -0300
 +  [ Michael Vogt ]
 +  * apt-pkg/depcache.cc:
 +    - support a list of sections for:
 +      APT::Install-Recommends-Sections
 +      APT::Never-MarkAuto-Sections
 +  * methods/makefile:
 +    - install lzma symlink method (for full lzma support)
 +  * debian/control:
 +    - suggest "lzma"
 +
 + -- Otavio Salvador <otavio@ossystems.com.br>  Wed, 25 Jul 2007 20:16:46 -0300
 +
 +apt (0.7.4) unstable; urgency=low
 +
 +  [ Michael Vogt ]
 +  * cmdline/apt-get.cc:
 +    - fix in the task-install code regexp (thanks to Adam Conrad and
 +      Colin Watson)
 +    - support task removal too: apt-get remove taskname^
 +      (thanks to Matt Zimmerman reporting this problem)
 +
 +  [ Otavio Salvador ]
 +  * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)
 +  * Fix compilation warnings:
 +    - apt-pkg/contrib/configuration.cc: wrong argument type;
 +    - apt-pkg/deb/dpkgpm.cc: wrong signess;
 +    - apt-pkg-acquire-item.cc: wrong signess and orderned initializers;
 +    - methods/https.cc:
 +      - type conversion;
 +      - unused variable;
 +      - changed SetupProxy() method to void;
 +  * Simplified HttpMethod::Fetch on http.cc removing Tail variable;
 +  * Fix pipeline handling on http.cc (closes: #413324)
 +  * Fix building to properly support binNMUs. Thanks to Daniel Schepler
 +    <schepler@math.unipd.it> by the patch (closes: #359634)
 +  * Fix example for Install-{Recommends,Suggests} options on
 +    configure-index example file. Thanks to Peter Eisentraut
 +    <peter_e@gmx.net> by the patch (closes: #432223)
 +
 +  [ Christian Perrier ]
 +  * Basque translation update. Closes: ##423766
 +  * Unfuzzy formerly complete translations
 +  * French translation update
 +  * Re-generate PO(T) files
 +  * Spanish translation update
 +  * Swedish translation update
 +
 + -- Otavio Salvador <otavio@debian.org>  Tue, 24 Jul 2007 09:55:50 -0300
  
  apt (0.7.3) unstable; urgency=low
  

diff --cc debian/rules
Simple merge

diff --cc doc/examples/configure-index
Simple merge

diff --cc methods/makefile
index f0fd4e414c0da291c7973ac8f1c103a85fc7ff5f,f178cbbeac3344c796a1be5b1cc44e9771a112f6..e47539dbb3994aa14f25dc4cf240169a47fe6d62
--- 1/methods/makefile
--- 2/methods/makefile
+++ b/methods/makefile
@@@ -7,7 -7,7 +7,7 @@@ include ../buildlib/defaults.ma
  BIN := $(BIN)/methods
  
  # FIXME..
--LIB_APT_PKG_MAJOR = 4.4
++LIB_APT_PKG_MAJOR = 4.5
  APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
  
  # The file method