summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* * merged the apt-breaks-iwj branchMichael Vogt2006-12-1425-5418/+189
|\
| * * merged with apt--mvoMichael Vogt2006-12-1424-196/+401
| |\
| | * * apt-pkg/deb/debsrcrecords.{cc,h}:Michael Vogt2006-12-012-2/+2
| * | * merged from ianMichael Vogt2006-12-144-4/+21
| |\ \
| | * | 0.6.46.3ubuntu2 change as uploaded: fix dist-upgradeIan Jackson2006-12-082-0/+8
| | * | undo versioned dpkg dependenciesIan Jackson2006-09-062-5/+6
| | |\ \
| | | * | * debian/changelog:Michael Vogt2006-09-062-4/+2
| | * | | version 0.6.45ubuntu6Ian Jackson2006-09-061-1/+1
| | * | | bump cache versionIan Jackson2006-09-052-1/+9
| |/ / /
| * / / initial Breaks implementationIan Jackson2006-08-2513-539/+344
| |/ /
| * | * apt-pkg/deb/dpkgpm.cc:Michael Vogt2006-08-154-2/+9
| * | * apt-pkg/pkgcachegen.cc:Michael Vogt2006-08-152-2/+10
| * | * cmdline/apt-get.cc:Michael Vogt2006-08-143-2/+9
| * | * changelog updatedMichael Vogt2006-08-141-1/+1
| * | * merged from the install-recommends branchMichael Vogt2006-08-141-8/+9
| |\ \
| * \ \ * merged ddtp supportMichael Vogt2006-08-1131-115/+1217
| |\ \ \
| * \ \ \ * merged the apt--install-recommends branchMichael Vogt2006-08-118-16/+56
| |\ \ \ \
| * \ \ \ \ * merged the apt--install-recommends branchMichael Vogt2006-08-1042-6893/+8441
| |\ \ \ \ \
| * \ \ \ \ \ * merged with mainlineMichael Vogt2006-08-0159-852/+9950
| |\ \ \ \ \ \
| * \ \ \ \ \ \ * merged with auto-markMichael Vogt2006-07-262-184/+187
| |\ \ \ \ \ \ \
| * | | | | | | | * debian/changelog:Michael Vogt2006-07-212-2/+2
| * | | | | | | | * cmdline/apt-get.cc:Michael Vogt2006-07-212-0/+8
| |\ \ \ \ \ \ \ \
| * | | | | | | | | * merged changes from Kamions upload (thanks!)Michael Vogt2006-07-212-0/+7
| * | | | | | | | | * apt-pkg/depcache.cc:Michael Vogt2006-07-043-1/+16
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ * merged the debian--auto-mark patchMichael Vogt2006-07-0318-229/+1060
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ * merged with apts mainlineMichael Vogt2006-07-0359-3842/+7267
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | * methods/http.cc: change user agent from debian to ubuntuMichael Vogt2006-05-263-2/+9
| * | | | | | | | | | | | * wording fixes (cherry picked from apt--mvo)Michael Vogt2006-04-182-2/+8
| * | | | | | | | | | | | * changelog updateMichael Vogt2006-03-281-1/+2
| * | | | | | | | | | | | * undo some of the bzr merge damage from the last mergeMichael Vogt2006-03-283-2/+5
| * | | | | | | | | | | | * fix the apt-key (merge problem?)Michael Vogt2006-03-281-3/+3
| * | | | | | | | | | | | * merged with mainlineMichael Vogt2006-03-282-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ * merged with mainlineMichael Vogt2006-03-283-4/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ * merged from mainMichael Vogt2006-03-2835-3034/+6726
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | * more work for the DefaultAptSources specMichael Vogt2006-02-215-81/+102
| * | | | | | | | | | | | | | | * don't print a "can't stat " message for missing index files (DefaultSources...Michael Vogt2006-02-211-0/+2
| * | | | | | | | | | | | | | | * fixed changelogMichael Vogt2006-02-211-2/+0
| * | | | | | | | | | | | | | | * handle network failures more gracefully (default apt sources spec)Michael Vogt2006-02-214-7/+30
| * | | | | | | | | | | | | | | * merged with apt--mvoMichael Vogt2006-02-212-12/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | * make errors during apt-get update warnings only (default sources spec)Michael Vogt2006-02-202-1/+2
| * | | | | | | | | | | | | | | | * merged with mainlineMichael Vogt2006-02-203-22/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ * merged with mainlineMichael Vogt2006-02-1342-2818/+2944
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | * finalize changelogMichael Vogt2006-01-251-1/+1
| * | | | | | | | | | | | | | | | | | * merged with apt--mvo--0Michael Vogt2006-01-188-415/+158
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ * merged from mainMichael Vogt2006-01-183-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ * merged with apt--mvoMichael Vogt2006-01-1049-4614/+7955
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | * unattended-upgrade integrated into the APT::Periodic systemMichael Vogt2005-12-092-0/+23
| * | | | | | | | | | | | | | | | | | | | | * "normal" merge, resolved lots of conflictsMichael Vogt2005-12-091-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | * fixed conflict in changelogMichael Vogt2005-12-091-7/+3
| * | | | | | | | | | | | | | | | | | | | | | * merged with mvoMichael Vogt2005-12-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \