From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 10 Dec 2009 15:07:43 +0000 (+0100)
Subject: * merge lp:~mvo/apt/netrc branch, this adds support for a
X-Git-Tag: 0.7.25~9
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/9307ef07498d37c0b5e05b036195abaf7ad0105c?hp=-c

* merge lp:~mvo/apt/netrc branch, this adds support for a
  /etc/apt/auth.conf that can be used to store username/passwords
  in a "netrc" style file (with the extension that it supports "/"
  in a machine definition). Based on the maemo git branch.
* apt-pkg/deb/dpkgpm.cc:
  - add "purge" to list of known actions
---

9307ef07498d37c0b5e05b036195abaf7ad0105c
diff --combined debian/changelog
index cf1977286,8c5cbac7c..9b3bd724c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -19,8 -19,6 +19,8 @@@ apt (0.7.25) UNRELEASED; urgency=lo
      Closes: #555797
    * Simplified Chinese translation update by Aron Xu 
      Closes: #558737
 +  * Slovak translation update by Ivan Masár
 +    Closes: #559277
    
    [ Michael Vogt ]
    * apt-pkg/packagemanager.cc:
@@@ -32,6 -30,12 +32,12 @@@
    * methods/https.cc:
      - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972
        thanks to Brian Thomason for the patch
+   * merge lp:~mvo/apt/netrc branch, this adds support for a
+     /etc/apt/auth.conf that can be used to store username/passwords
+     in a "netrc" style file (with the extension that it supports "/"
+     in a machine definition). Based on the maemo git branch.
+   * apt-pkg/deb/dpkgpm.cc:
+     - add "purge" to list of known actions
  
    [ Brian Murray ]
    * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: