summaryrefslogtreecommitdiff
path: root/apt-pkg
Commit message (Expand)AuthorAgeFilesLines
* * merged another missing bit from the ubuntu branchMichael Vogt2007-06-092-2/+2
* * merged some more missing bitsMichael Vogt2007-06-091-1/+7
|\
| * * apt-pkg/depcache.cc:Michael Vogt2007-03-141-1/+4
* | * huge merge to bring the apt debian-sid and ubuntu branches as closeMichael Vogt2007-06-0972-374/+3826
|\ \
| * \ * merged the debian/experimental changes backMichael Vogt2007-06-0672-381/+3342
| |\ \
| | * | * updated from http://people.ubuntu.com/~mvo/bzr/apt/auto-mark/Michael Vogt2007-05-022-6/+18
| | |\|
| | | * * apt-pkg/depcache.cc:Michael Vogt2007-03-141-1/+16
| | | * * apt-pkg/packagemanager.cc:Michael Vogt2007-03-131-1/+2
| | * | * merged with the apt--mvo branchMichael Vogt2007-05-028-17/+47
| | |\ \
| | * \ \ * merged from apt--mvoMichael Vogt2007-01-122-2/+7
| | |\ \ \
| | * \ \ \ * merged apt--curl-https branchMichael Vogt2006-12-191-2/+4
| | |\ \ \ \
| | * \ \ \ \ * apt-pkg/depcache.cc:Michael Vogt2006-12-181-0/+5
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | * apt-pkg/depcache.cc:Michael Vogt2006-12-181-0/+5
| | * | | | | * merged the apt-breaks-iwj branchMichael Vogt2006-12-1414-32/+122
| | |\ \ \ \ \
| | | * \ \ \ \ * merged with apt--mvoMichael Vogt2006-12-146-114/+120
| | | |\ \ \ \ \
| | | | * | | | | * apt-pkg/deb/debsrcrecords.{cc,h}:Michael Vogt2006-12-012-2/+2
| | | * | | | | | 0.6.46.3ubuntu2 change as uploaded: fix dist-upgradeIan Jackson2006-12-081-0/+1
| | | * | | | | | bump cache versionIan Jackson2006-09-051-1/+1
| | | * | | | | | initial Breaks implementationIan Jackson2006-08-257-18/+81
| | | * | | | | | * apt-pkg/deb/dpkgpm.cc:Michael Vogt2006-08-151-0/+2
| | | * | | | | | * apt-pkg/pkgcachegen.cc:Michael Vogt2006-08-151-2/+2
| | | * | | | | | * merged from the install-recommends branchMichael Vogt2006-08-141-8/+9
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ * merged ddtp supportMichael Vogt2006-08-1125-32/+967
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ * merged the apt--install-recommends branchMichael Vogt2006-08-114-13/+28
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ * merged the apt--install-recommends branchMichael Vogt2006-08-103-11/+48
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ * merged with mainlineMichael Vogt2006-08-019-23/+618
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | * merged changes from Kamions upload (thanks!)Michael Vogt2006-07-211-0/+1
| | | * | | | | | | | | | | * apt-pkg/depcache.cc:Michael Vogt2006-07-041-0/+9
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ * merged the debian--auto-mark patchMichael Vogt2006-07-039-66/+733
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ * merged with apts mainlineMichael Vogt2006-07-035-80/+54
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | * wording fixes (cherry picked from apt--mvo)Michael Vogt2006-04-181-2/+2
| | | * | | | | | | | | | | | | | * merged with mainlineMichael Vogt2006-03-281-1/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | * more work for the DefaultAptSources specMichael Vogt2006-02-213-5/+15
| | | * | | | | | | | | | | | | | | * don't print a "can't stat " message for missing index files (DefaultSources...Michael Vogt2006-02-211-0/+2
| | | * | | | | | | | | | | | | | | * handle network failures more gracefully (default apt sources spec)Michael Vogt2006-02-211-3/+7
| | * | | | | | | | | | | | | | | | * merged from the apt--pdiff branchMichael Vogt2006-12-141-11/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | * apt-pkg/acquire-item.ccMichael Vogt2006-12-071-2/+5
| | | * | | | | | | | | | | | | | | | merged with apt--mvoMichael Vogt2006-12-0739-219/+991
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | * apt-pkg/acquire-item.cc:Michael Vogt2006-12-071-9/+7
| | * | | | | | | | | | | | | | | | | | * merged the no-pragma branchMichael Vogt2006-12-1451-159/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | * removed the remaining #ifdef __GNUG__ that are no longer requiredMichael Vogt2006-10-022-4/+0
| | | * | | | | | | | | | | | | | | | | | * remove the remaining #ifdef __GNUG__ bitsMichael Vogt2006-10-023-6/+1
| | | * | | | | | | | | | | | | | | | | | * removed the pragma messMichael Vogt2006-10-0249-147/+6
| | * | | | | | | | | | | | | | | | | | | * merged with apt--debian-sidMichael Vogt2006-12-147-6/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ * merged with apt--debian-sidMichael Vogt2006-12-144-39/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ * merged from apt--auto-markMichael Vogt2006-10-022-9/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | * apt-pkg/depcache.cc:Michael Vogt2006-09-211-3/+11
| | | * | | | | | | | | | | | | | | | | | | | * apt-pkg/algorithms.cc:Michael Vogt2006-09-081-2/+7
| | | * | | | | | | | | | | | | | | | | | | | * merged with the apt--mvo branchMichael Vogt2006-09-069-23/+618
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | * merged from apt--mvoMichael Vogt2006-10-022-7/+41
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |