* merge patch that enforces stricter https server certificate

  checking (thanks to Arnaud Ebalard, closes: #485960)
* allow per-mirror specific https settings
  (thanks to Arnaud Ebalard, closes: #485965)
* add doc/examples/apt-https-method-example.cof
  (thanks to Arnaud Ebalard, closes: #485964)
* add DPkg::NoTriggers option so that applications that call
  apt/aptitude (like the installer) defer trigger processing
  (thanks to Joey Hess)
* document --install-recommends and --no-install-recommends
  (thanks to Dereck Wonnacott, LP: #126180)
* apt-ftparchive might write corrupt Release files (LP: #46439)
* Apply --important option to apt-cache depends (LP: #16947)

diff --cc apt-pkg/deb/dpkgpm.cc
Simple merge

diff --cc configure.in
index b9368ae8c8d6781488587067ec40b1fde892e4e0,c0c73e1c8d1ab750db40dfbcfa3dcdcd160cc76c..cb229a68d7264fd53d1f427b1175ff9efaef8ce9
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  dnl -- SET THIS TO THE RELEASE VERSION --
- AC_DEFINE_UNQUOTED(VERSION,"0.7.14ubuntu3")
 -AC_DEFINE_UNQUOTED(VERSION,"0.7.13")
++AC_DEFINE_UNQUOTED(VERSION,"0.7.14ubuntu4")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)

diff --cc debian/changelog
index fb5fc9f77233430012a5f25221267ebeb318a3a5,24f876e447bea67445e90118871b58410260f7fa..91724d164e83ef4992b7a8e06e449cde65de0cd7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,47 -1,40 +1,63 @@@
 -apt (0.7.15) UNRELEASED; urgency=low
 -
 -  [ Osamu Aoki ]
 -  * Updated cron script to support backups by hardlinks and 
 -    verbose levels.  All features turned off by default. 
 -  * Added more error handlings.  Closes: #438803, #462734, #454989, 
 -  * Refactored condition structure to make download and upgrade performed 
 -    if only previous steps succeeded. Closes: #341970
 -  * Documented all cron script related configuration items in 
 -    configure-index.
 +apt (0.7.14ubuntu4) intrepid; urgency=low
  
+   [ Michael Vogt ]
    * apt-pkg/deb/dpkgpm.cc:
 -    - improve apt progress reporting, display trigger actions
 -  * apt-pkg/depcache.cc:
 -    - when checking for new important deps, skip critical ones
 -      (LP: #236360)
 +    - fix uninitialized variable that caused no apport reports
 +      to be written sometimes (thanks to Matt Zimmerman)
+   * merge patch that enforces stricter https server certificate
+     checking (thanks to Arnaud Ebalard, closes: #485960)
+   * allow per-mirror specific https settings
+     (thanks to Arnaud Ebalard, closes: #485965)
+   * add doc/examples/apt-https-method-example.cof
+     (thanks to Arnaud Ebalard, closes: #485964)
+   * add DPkg::NoTriggers option so that applications that call
+     apt/aptitude (like the installer) defer trigger processing
+     (thanks to Joey Hess) 
+   * document --install-recommends and --no-install-recommends
+     (thanks to Dereck Wonnacott, LP: #126180)
+ 
+   [ Dereck Wonnacott ]
+   * apt-ftparchive might write corrupt Release files (LP: #46439)
+   * Apply --important option to apt-cache depends (LP: #16947) 
  
-- --
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 05 Aug 2008 10:10:49 +0200
 +
 +apt (0.7.14ubuntu3) intrepid; urgency=low
  
 -apt (0.7.14) unstable; urgency=low
 +  [ Otavio Salvador ]
 +  * Apply patch to avoid truncating of arbitrary files. Thanks to Bryan
 +    Donlan <bdonlan@fushizen.net> for the patch. Closes: #482476
 +  * Avoid using dbus if dbus-daemon isn't running. Closes: #438803
  
 +  [ Michael Vogt ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - improve apt progress reporting, display trigger actions
 +  * apt-pkg/depcache.cc:
 +    - when checking for new important deps, skip critical ones
 +      (LP: #236360)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 03 Jun 2008 17:27:07 +0200
 +
 +apt (0.7.14ubuntu2) intrepid; urgency=low
 +
 +  * debian/control:
 +    - fix FTBFS by adding missing intltool dependency 
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 09 May 2008 13:50:22 +0200
 +
 +apt (0.7.14ubuntu1) intrepid; urgency=low
 +
 +  [ Michael Vogt ]
 +  * enable installation of recommends by default
 +  * debian/apt.conf.ubuntu:
 +    - remove APT::Install-Recommends-Sections (no longer needed)
 +  * merged from debian/sid, remaining changes:
 +    - authentication-reliable branch (to be merged into debian soon)
 +    - mirror:// uri branch (breaks ABI in debian, not merged yet)
 +    - apport failure reporting
 +    - show warning on apt-get source with 'Vcs-' header
 +    - proxy detection from gconf in apt.cron
 +  
    [ Christian Perrier ]
    * Mark a message from dselect backend as translatable
      Thanks to Frédéric Bothamy for the patch