* README.arch updates, comment in apt-pkg/algorithm.h added, apt-pkg/cacheiterators...

diff --git a/README.arch b/README.arch
index c02d573500a6b3b20f32002f8f746367ef6c1c3e..92870d614a244dd4d5c9c4d13ee147444550e4b4 100644 (file)
--- a/README.arch
+++ b/README.arch
@@ -4,5 +4,9 @@ packages (in addtion to the usual build-depends):
 xmlto perlsgml sgml2x sgmlspl docbook
 
 then run:
 xmlto perlsgml sgml2x sgmlspl docbook
 
 then run:

-debian/rules arch-build

 
 

+$ debian/rules arch-build
+
+that will build packages in the "debian/arch-build" directory. It will
+honor "DEB_BUILD_PROG_OPTS" as options that are passed to debuild (e.g. -S 
+may be usefull).

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 174a7f58d18aea15aa0c36bf2fde93c243a3de8a..b95218061903e4ea84d2b08445a41eee3878eaaf 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -118,7 +118,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);

diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index ce3c4165efbe6337e812e878f1330d788acec005..c3a0d0a5a45fa3132a30ea57118e26d0b9737069 100644 (file)
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -244,7 +244,7 @@ class pkgCache::PrvIterator
    inline PkgIterator OwnerPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[Prv->Version].ParentPkg);};
    inline unsigned long Index() const {return Prv - Owner->ProvideP;};
 
    inline PkgIterator OwnerPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[Prv->Version].ParentPkg);};
    inline unsigned long Index() const {return Prv - Owner->ProvideP;};
 

-   inline PrvIterator() : Owner(0), Prv(0), Type(PrvVer) {};
+   inline PrvIterator() : Prv(0), Type(PrvVer), Owner(0)  {};

 
    inline PrvIterator(pkgCache &Owner,Provides *Trg,Version *) :
           Prv(Trg), Type(PrvVer), Owner(&Owner) 
 
    inline PrvIterator(pkgCache &Owner,Provides *Trg,Version *) :
           Prv(Trg), Type(PrvVer), Owner(&Owner)