* dpkg-triggers: Deal properly with new package states.

[apt.git] / apt-pkg / algorithms.h

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 0b38e4244fd24d62e86e83a9cb3f81ba654245e3..b72874d8e216687c4edfd0474008f730b71b7b16 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -30,9 +30,6 @@
 #ifndef PKGLIB_ALGORITHMS_H
 #define PKGLIB_ALGORITHMS_H
 
 #ifndef PKGLIB_ALGORITHMS_H
 #define PKGLIB_ALGORITHMS_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/algorithms.h"
-#endif 

 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>


@@ -67,8 +64,10 @@ class pkgSimulate : public pkgPackageManager
    virtual bool Install(PkgIterator Pkg,string File);
    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge);
    virtual bool Install(PkgIterator Pkg,string File);
    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge);

+
+private:

    void ShortBreaks();
    void ShortBreaks();

-   void Describe(PkgIterator iPkg,ostream &out,bool Now);
+   void Describe(PkgIterator iPkg,ostream &out,bool Current,bool Candidate);

    
    public:
 
    
    public:
 


@@ -116,7 +115,8 @@ class pkgProblemResolver
    
    // Try to resolve problems only by using keep
    bool ResolveByKeep();
    
    // Try to resolve problems only by using keep
    bool ResolveByKeep();

-   
+
+   // Install all protected packages   

    void InstallProtect();   
    
    pkgProblemResolver(pkgDepCache *Cache);
    void InstallProtect();   
    
    pkgProblemResolver(pkgDepCache *Cache);