Explorar el Código

* README.arch updates, comment in apt-pkg/algorithm.h added, apt-pkg/cacheiterators.h order in initlist changed to remove warning

Michael Vogt hace 21 años
padre
commit
c320a1e61a
Se han modificado 3 ficheros con 8 adiciones y 3 borrados
  1. 5 1
      README.arch
  2. 2 1
      apt-pkg/algorithms.h
  3. 1 1
      apt-pkg/cacheiterators.h

+ 5 - 1
README.arch

@@ -4,5 +4,9 @@ packages (in addtion to the usual build-depends):
 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).

+ 2 - 1
apt-pkg/algorithms.h

@@ -118,7 +118,8 @@ class pkgProblemResolver
    
    // Try to resolve problems only by using keep
    bool ResolveByKeep();
-   
+
+   // Install all protected packages   
    void InstallProtect();   
    
    pkgProblemResolver(pkgDepCache *Cache);

+ 1 - 1
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 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)