* debian/rules

  - fix https install location

diff --cc debian/changelog
index bb21c6faa79b41afdce1a73074b569237bfa2010,fdf4a03e53fc28c91624c58574154050f5d5f421,fdf4a03e53fc28c91624c58574154050f5d5f421,832ee11d43f764be769b721c6d30616ff8bded45..6bed39d1bdd918724455a10866c58662abe4dbca
--- 1/debian/changelog
--- 2/debian/changelog
--- 3/debian/changelog
--- 4/debian/changelog
+++ b/debian/changelog
@@@@@ -1,12 -1,5 -1,5 -1,6 +1,13 @@@@@
 -- apt (0.7.10) UNRELEASED; urgency=low
 +++apt (0.7.10ubuntu1) hardy; urgency=low
   +
 +++  * methods/mirror.{cc,h}:
 +++    - only update mirror list on IndexFile updates 
 +++
 +++ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 28 Nov 2007 15:57:18 +0100
 +++
-   apt (0.7.10) UNRELEASED; urgency=low
+++ apt (0.7.10) unstable; urgency=low
 ++ 
+++   [ Otavio Salvador ]
      * Applied patch from Mike O'Connor <stew@vireo.org> to add a manpage to
        apt-mark, closes: #430207.
      * Applied patch from Andrei Popescu <andreimpopescu@gmail.com> to add a
@@@@@ -1098,54 -537,39 -537,39 -542,39 +1103,54 @@@@@ apt (0.6.45) unstable; urgency=lo
    
     -- Michael Vogt <mvo@debian.org>  Thu, 27 Jul 2006 00:52:05 +0200
    
 ---apt (0.6.44.2exp1) experimental; urgency=low
 +++apt (0.6.44.2ubuntu4) edgy; urgency=low
    
 ---  * added support for i18n of the package descriptions
 ---  * added support for aptitude like auto-install tracking (a HUGE
 ---    HUGE thanks to Daniel Burrows who made this possible) 
 ---  * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch
 ---  * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental
 +++  * Make apt-get dselect-upgrade happy again
    
 --- -- Michael Vogt <mvo@debian.org>  Mon,  3 Jul 2006 21:50:31 +0200
 +++ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 21 Jul 2006 11:03:02 +0200
    
 ---apt (0.6.44.2) unstable; urgency=low
 +++apt (0.6.44.2ubuntu3) edgy; urgency=low
    
 ---  * apt-pkg/depcache.cc:
 ---    - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
 ---  * apt-pkg/acquire-item.cc:
 ---    - fix missing chmod() in the new aquire code 
 ---      (thanks to Bastian Blank, Closes: #367425)
 ---  * merged from 
 ---    http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
 ---    * sk.po: Completed to 512t
 ---    * eu.po: Completed to 512t
 ---    * fr.po: Completed to 512t
 ---    * sv.po: Completed to 512t
 ---    * Update all PO and the POT. Gives 506t6f for formerly
 ---      complete translations
 +++  * Close extended_states file after writing it.
 +++
 +++ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 18 Jul 2006 00:12:13 +0100
 +++
 +++apt (0.6.44.2ubuntu2) edgy; urgency=low
 +++
 +++  * create a empty extended_states file if none exists already
   +
 --  -- Michael Vogt <mvo@debian.org>  Wed, 14 Jun 2006 12:00:57 +0200
 +++ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  4 Jul 2006 09:23:03 +0200
 ++ 
   - -- Michael Vogt <mvo@debian.org>  Wed, 14 Jun 2006 12:00:57 +0200
 +++apt (0.6.44.2ubuntu1) edgy; urgency=low
 +++
 +++  * merged with debian/unstable
 +++  * merged the "auto-mark" branch to support aptitude like
 +++    marking of automatically installed dependencies and added
 +++    "apt-get remove --auto-remove" to remove unused auto-installed
 +++    packages again
 +++  * changed library version from 3.11 to 3.50 to make it clearly 
 +++    different from the debian version (we are ABI incompatible because
 +++    of the auto-mark patch)
 +++
 +++ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  3 Jul 2006 18:30:46 +0200
 +++
 +++apt (0.6.44.2) unstable; urgency=low
 +++  
 +++   * apt-pkg/depcache.cc:
 +++     - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
 +++   * apt-pkg/acquire-item.cc:
 +++     - fix missing chmod() in the new aquire code
 +++       (thanks to Bastian Blank, Closes: #367425)
 +++   * merged from
 +++     http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
 +++     * sk.po: Completed to 512t
 +++     * eu.po: Completed to 512t
 +++     * fr.po: Completed to 512t
 +++     * sv.po: Completed to 512t
 +++     * Update all PO and the POT. Gives 506t6f for formerly
 +++       complete translations
 +++
 +++ -- Michael Vogt <mvo@debian.org>  Wed, 14 Jun 2006 12:00:57 +0200 
    
    apt (0.6.44.1-0.1) unstable; urgency=low
    

diff --cc debian/rules
Simple merge