diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-12-08 17:29:42 +0000 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-12-08 17:29:42 +0000 |
commit | 7a6058744badb38d2ccac0158d6ed1359cfb0239 (patch) | |
tree | 03d443207298e66131b94c8764f9620a7f450616 /apt-pkg/algorithms.h | |
parent | bd01d47ebadaeab178942d0ba3ebdf50d8860c81 (diff) |
* merged with the current debian version
Patches applied:
* bubulle@debian.org--2005/apt--main--0--patch-132
Completed Simplified Chinese translation
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-94
* pkgDirStream has (slightly) better extract support now
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-95
* merge fix for #339533
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-96
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-97
* some more debug output
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-98
* ABI change: merged more flexible pkgAcquireFile code
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-99
* merged http download limit for apt (#146877)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-100
* applied parts of the string speedup patch from debian #319377 (ABI change)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-101
* fix for #340448
Diffstat (limited to 'apt-pkg/algorithms.h')
-rw-r--r-- | apt-pkg/algorithms.h | 3 |
1 files changed, 2 insertions, 1 deletions
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); |