From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 22 Jul 2011 14:01:00 +0000 (+0200)
Subject: merged from donkult
X-Git-Tag: 0.8.15.3~1
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/555a487afb510c561d094f27bb08119694e7388f?hp=-c

merged from donkult
---

555a487afb510c561d094f27bb08119694e7388f
diff --combined cmdline/apt-get.cc
index 99ee4f228,748ebe6ab..1e7fee96b
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -2273,7 -2273,7 +2273,7 @@@ bool DoDownload(CommandLine &CmdL
  
     pkgAcquire Fetcher;
     AcqTextStatus Stat(ScreenWidth, _config->FindI("quiet",0));
 -   if (_config->FindB("APT::Get::Print-URIs") == true)
 +   if (_config->FindB("APT::Get::Print-URIs") == false)
        Fetcher.Setup(&Stat);
  
     pkgRecords Recs(Cache);
@@@ -2366,8 -2366,7 +2366,7 @@@ bool DoSource(CommandLine &CmdL
     // Create the download object
     AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));   
     pkgAcquire Fetcher;
-    if (Fetcher.Setup(&Stat) == false)
-       return false;
+    Fetcher.SetLog(&Stat);
  
     DscFile *Dsc = new DscFile[CmdL.FileSize()];
     
diff --combined debian/changelog
index c9d917407,607f7c64a..1ceeebfc5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -6,8 -6,6 +6,8 @@@ apt (0.8.15.3) UNRELEASED; urgency=lo
    * apt-pkg/algorithms.cc:
      - Hold back packages that would enter "policy-broken" state on upgrade
        when doing a "apt-get upgrade"
 +  * cmdline/apt-get.cc:
 +    - fix missing download progress in apt-get download
  
    [ David Kalnischkies ]
    * apt-pkg/pkgcachegen.cc:
@@@ -19,12 -17,21 +19,21 @@@
      - document APT::Architectures list (Closes: #612102)
    * cmdline/apt-get.cc:
      - restore all important dependencies for garbage packages (LP: #806274)
+     - do not require unused partial dirs in 'source' (Closes: #633510)
    * apt-pkg/init.cc:
      - use CndSet in pkgInitConfig (Closes: #629617)
    * apt-pkg/depcache.cc:
      - change default of APT::AutoRemove::SuggestsImportant to true
- 
-  -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 15 Jul 2011 09:29:37 +0200
+   * cmdline/apt-key:
+     - use a tmpfile instead of /etc/apt/secring.gpg (Closes: #632596)
+   * debian/apt.postinst:
+     - remove /etc/apt/secring.gpg if it is an empty file
+   * doc/apt-cache.8.xml:
+     - apply madison typofix from John Feuerstein, thanks! (Closes: #633455)
+   * apt-pkg/policy.cc:
+     - emit an error on unknown APT::Default-Release value (Closes: #407511)
+ 
+  -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 16 Jul 2011 16:43:37 +0200
  
  apt (0.8.15.2) unstable; urgency=high