* added a missing OpProgress::Done() in depCache::Init(), removed the show-virtual...

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index c6bf3185ae2b09bb4e093c6d91a02bf53f544b15..240ad4da2d0e3b9c8f90f51253609d208aaf0aa9 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -91,6 +91,7 @@ bool pkgDepCache::Init(OpProgress *Prog)
    }
    
    Update(Prog);
    }
    
    Update(Prog);

+   Prog->Done();

    
    return true;
 } 
    
    return true;
 } 

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 3bd1435fc3c8e625a67f08b800c0396e6c31d490..0014563b8a6a5765ca09a692bd686016b7235d2f 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1360,20 +1360,6 @@ bool ShowPackage(CommandLine &CmdL)
 
       ++found;
 
 
       ++found;
 

-      // Show virtual packages
-      if (Pkg->ProvidesList != 0)
-      {
-        ioprintf(std::cout,_("Package %s is a virtual package provided by:\n"),
-                 Pkg.Name());
-        
-        pkgCache::PrvIterator I = Pkg.ProvidesList();
-        for (; I.end() == false; I++)
-           cout << "  " << I.OwnerPkg().Name() << endl;
-        cout << _("You should explicitly select one to show.") << endl;
-        continue;
-      }
-
-

       // Find the proper version to use.
       if (_config->FindB("APT::Cache::AllVersions","true") == true)
       {
       // Find the proper version to use.
       if (_config->FindB("APT::Cache::AllVersions","true") == true)
       {

diff --git a/debian/changelog b/debian/changelog
index d2b89636932347a7e16e3ae67c1adc6b19586f4a..681684daaec854eabac09b029bb3ed3da055aff1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,5 @@
 apt (0.6.37) breezy; urgency=low
 
 apt (0.6.37) breezy; urgency=low
 

-  * apt-cache show <virtualpkg> shows the available packages providing 
-    the virtual pkg (thanks to otavio) (closes: #202493)

   * make pinning on the "component" work again (using the section of the 
     archive, we don't use per-section Release files anymore with apt-0.6)
     (closes ubuntu #9935)
   * make pinning on the "component" work again (using the section of the 
     archive, we don't use per-section Release files anymore with apt-0.6)
     (closes ubuntu #9935)


@@ -23,7 +21,6 @@ apt (0.6.36ubuntu1) breezy; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 23 May 2005 11:57:53 +0200
 
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 23 May 2005 11:57:53 +0200
 

->>>>>>> MERGE-SOURCE

 apt (0.6.36) experimental; urgency=low
 
   * Merge apt--mvo--0:
 apt (0.6.36) experimental; urgency=low
 
   * Merge apt--mvo--0:


@@ -35,11 +32,7 @@ apt (0.6.36) experimental; urgency=low
     - apt-pkg/cdrom.cc:
       honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496)
  
     - apt-pkg/cdrom.cc:
       honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496)
  

-<<<<<<< TREE
- -- Michael Vogt <mvo@debian.org>  Fri,  6 May 2005 10:12:20 +0200
-=======

  -- Michael Vogt <mvo@debian.org>  Thu, 31 Mar 2005 20:37:11 +0200
  -- Michael Vogt <mvo@debian.org>  Thu, 31 Mar 2005 20:37:11 +0200

->>>>>>> MERGE-SOURCE

 
 apt (0.6.35) hoary; urgency=low
 
 
 apt (0.6.35) hoary; urgency=low