diff options
| -rw-r--r-- | README.arch | 6 | ||||
| -rw-r--r-- | apt-pkg/algorithms.h | 3 | ||||
| -rw-r--r-- | apt-pkg/cacheiterators.h | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/README.arch b/README.arch index c02d57350..92870d614 100644 --- 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: -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 174a7f58d..b95218061 100644 --- 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(); - + + // Install all protected packages void InstallProtect(); pkgProblemResolver(pkgDepCache *Cache); diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index ce3c4165e..c3a0d0a5a 100644 --- 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 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) |