summaryrefslogtreecommitdiff
path: root/debian
AgeCommit message (Collapse)Author
2005-06-28Merge with mainlineMatt Zimmerman
Patches applied: * apt@packages.debian.org/apt--main--0--patch-98 Install only one keyring on each branch (Closes: #316119)
2005-06-26Merge with mvoMatt Zimmerman
Patches applied: * michael.vogt@ubuntu.com--2005/apt--bts225947--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-1 * merged with mainline and apt--fixes--0 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-2 * patch from aj (slighly modified to use auto_ptr<>) applied * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-3 * changelog updated * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-4 * work for arch=all packages too now * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-5 * merged with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-7 * fixed incorrect man-page example * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-8 * changelog udpate * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-87 * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-1 * report timeouts (from Connect) and fail if they happen in pkgAcqMetaSig * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-2 * merged with the fixes branch to make it build again * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-1 tag of apt@packages.debian.org/apt--main--0--patch-88 * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-2 * merged apt--mvo (to make pining on components work again) * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-3 * merged with apt--fixes--0 (to make the building of the french manpages work and to fix a incorrect man-page example * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-4 * merged with the bts225947 code * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-5 * merged the imporoved timoeut handling patch * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-6 * merged with matt * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-7 * removed another conflict with apt--main
2005-06-26Merge with mainlineMatt Zimmerman
Patches applied: * andrelop@debian.org/apt--translation--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * andrelop@debian.org/apt--translation--0--patch-1 Sync with Matt version. * andrelop@debian.org/apt--translation--0--patch-2 Update pt_BR translation * andrelop@debian.org/apt--translation--0--patch-3 Sync with bubulle's branch. * apt@packages.debian.org/apt--main--0--patch-94 Update changelog * apt@packages.debian.org/apt--main--0--patch-95 Merge Christian's branch * apt@packages.debian.org/apt--main--0--patch-96 Update changelog * apt@packages.debian.org/apt--main--0--patch-97 Update priority of apt-utils to important, to match the override file * bubulle@debian.org--2005/apt--main--0--patch-82 Fix permissions * bubulle@debian.org--2005/apt--main--0--patch-83 French translation spellchecked * bubulle@debian.org--2005/apt--main--0--patch-84 Spell corrections in German translations * bubulle@debian.org--2005/apt--main--0--patch-85 Correct some file permissions * bubulle@debian.org--2005/apt--main--0--patch-86 Correct Hebrew translation * bubulle@debian.org--2005/apt--main--0--patch-87 Sync Portuguese translation with the POT file * bubulle@debian.org--2005/apt--main--0--patch-88 Updated Danish translation (not yet complete) * bubulle@debian.org--2005/apt--main--0--patch-89 Sync with Andre Luis Lopes and Otavio branches
2005-06-26Improved arch-build ruleMatt Zimmerman
2005-06-26Merge with mainlineMatt Zimmerman
Patches applied: * apt@packages.debian.org/apt--main--0--patch-93 Merge with mvo * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-22 * added myself to uploaders, changelog is signed with mvo@debian.org and in sync with the debian/experimental upload * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-23 * apt-cache show <virtual-pkg> shows all virtual packages instead of nothing (thanks to otavio) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-24 * changelog updated * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-25 * make pinning on component work again (we just use the section, as apt-0.6 don't use per-section Release files anymore) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-27 * updated the changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-28 * merged with my apt--fixes--0 branch * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-29 * added a missing OpProgress::Done() in depCache::Init(), removed the show-virtual-packages patch in apt-cache because matt does not like him :/ * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-30 * fix a stupid bug in the depcache::Init() code * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-31 * merged/removed conflicts with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32 * merged apt--main and make sure that the po files come from apt--main (because they are more recent)
2005-06-250.6.38ubuntu1Matt Zimmerman
2005-06-25Merge from Debian branchMatt Zimmerman
Patches applied: * apt@packages.debian.org/apt--main--0--patch-89 Branch for Debian * apt@packages.debian.org/apt--main--0--patch-90 Update version in configure * apt@packages.debian.org/apt--main--0--patch-91 Fix French man page build * apt@packages.debian.org/apt--main--0--patch-92 Add the current Debian archive signing key * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6 * build fix for apt--main--0
2005-06-13Change debian/bugscript to use #!/bin/bash (Closes: #313402)Matt Zimmerman
2005-06-06Update changelogMatt Zimmerman
2005-05-24Fix build of French man pages (now using XML, not SGML)Matt Zimmerman
2005-05-24Update changelogMatt Zimmerman
2005-05-24Open 0.6.37Matt Zimmerman
2005-05-24Merge michael.vogt@ubuntu.com--2005/apt--fixes--0Matt Zimmerman
Patches applied: * apt@packages.debian.org/apt--misc-abi-changes--0--patch-4 Merge from mainline * apt@packages.debian.org/apt--misc-abi-changes--0--patch-5 Merge from mainline * apt@packages.debian.org/apt--misc-abi-changes--0--patch-6 Collapse both pkgAcquire::Run() methods into one, with a default value * michael.vogt@ubuntu.com--2005/apt--fixes--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-1 * merged obvious fixes into the tree to make it easy for matt to merge * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-2 * more merges from otavio that looks good/uncritical * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-3 * merged Matts misc-abi-changes tree * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-4 * finalized the changelog for a ubuntu build * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-26 * fix the cache-control header generation * otavio@debian.org--2005/apt--fixes--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-71 * otavio@debian.org--2005/apt--fixes--0--patch-1 Fix comments about the need of xmlto * otavio@debian.org--2005/apt--fixes--0--patch-2 Fix a compile warning * otavio@debian.org--2005/apt--fixes--0--patch-3 Sync with apt--main--0--patch-76 * otavio@debian.org--2005/apt--fixes--0--patch-4 Sync with apt--main--0--patch-78 * otavio@debian.org--2005/apt--fixes--0--patch-5 Add fixes that was wrongly included on DDTP changes. * otavio@debian.org--2005/apt--fixes--0--patch-8 Add information about the other fixes include on this branch now. * otavio@debian.org--2005/apt--fixes--0--patch-9 Merge last changes from apt--main--0. * otavio@debian.org--2005/apt--fixes--0--patch-10 Fix warnings about min/max change in gcc-4.0 * otavio@debian.org--2005/apt--fixes--0--patch-11 Fix remaning warnings while compiling gcc-4.0 * otavio@debian.org--2005/apt--fixes--0--patch-12 Add changelog entry about the fixes for warnings while compiling using GCC 4.0 compiler.
2005-05-06Merge michael.vogt@ubuntu.com--2005/apt--mvo--0Matt Zimmerman
Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-20 * supress output when /var/cache/apt/archives is empty; break when min-age is reached * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-21 * changed distro to "experimental", changed version number to 0.6.36
2005-05-05* changed distro to "experimental", changed version number to 0.6.36Michael Vogt
2005-04-06* supress output when /var/cache/apt/archives is empty; break when min-age ↵Michael Vogt
is reached
2005-04-06Update changelogMatt Zimmerman
2005-04-06* honor "Acquire::gpgv::Options" in apt-cdrom tooMichael Vogt
2005-04-01* whitespace change to add incomplete log for last patchMichael Vogt
* apt-pkg/acquire-item.cc: added "Acquire::BrokenProxy" that will force apt to always re-get the Release.gpg file (for broken proxies) * debian/apt.cron.daily: MinAge is defaulting to 2 days now to prevent over-aggresive removal
2005-04-01* changelog updatedMichael Vogt
2005-03-31* merged with matts treeMichael Vogt
Patches applied: * apt@packages.debian.org/apt--main--0--patch-72 Open 0.6.36 * apt@packages.debian.org/apt--main--0--patch-73 Merge apt--mvo--0 * apt@packages.debian.org/apt--main--0--patch-74 Update changelog * apt@packages.debian.org/apt--main--0--patch-75 Merge bubulle@debian.org--2005/apt--main--0 * apt@packages.debian.org/apt--main--0--patch-76 Update changelog * bubulle@debian.org--2005/apt--main--0--patch-58 Correct file permissions * bubulle@debian.org--2005/apt--main--0--patch-59 Bring consistency to the use of capitals in programs messages * bubulle@debian.org--2005/apt--main--0--patch-60 Correct the permission change on configure.in * bubulle@debian.org--2005/apt--main--0--patch-61 Complete unfuzzification of PO files after the capitalization fixes * bubulle@debian.org--2005/apt--main--0--patch-62 Final work of capitalization cleaning and translation unfuzzyfication * bubulle@debian.org--2005/apt--main--0--patch-63 Correct the "arbitary" typo in apt-ftparchive * bubulle@debian.org--2005/apt--main--0--patch-64 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-65 Italian translation update
2005-03-26Update changelogMatt Zimmerman
2005-03-26Update changelogMatt Zimmerman
2005-03-26Merge apt--mvo--0Matt Zimmerman
Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-9 * be more carefull when building the archive path (thanks to matt!) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-10 * ignore time conflicts on apt-key update (this is used at install time when the clock may be totally broken) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-11 * run check_size_constraints independent of AUTOCLEAN (thanks Matt) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-12 * check cache size after AUTOCLEAN was run (but independent) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-13 * MinAge implemented, cron script variables documented, bugfix in check_stamp() function
2005-03-26Open 0.6.36Matt Zimmerman
2005-03-23* changelog entry for 0.6.34ubuntu1 added, MinAge default is 2 days nowMichael Vogt
2005-03-22* MinAge implemented, cron script variables documented, bugfix in ↵Michael Vogt
check_stamp() function
2005-03-15* check cache size after AUTOCLEAN was run (but independent)Michael Vogt
2005-03-15* run check_size_constraints independent of AUTOCLEAN (thanks Matt)Michael Vogt
2005-03-15* be more carefull when building the archive path (thanks to matt!)Michael Vogt
Patches applied: * apt@packages.debian.org/apt--main--0--patch-67 Open 0.6.35 * apt@packages.debian.org/apt--main--0--patch-68 Merge apt--mvo--0 * apt@packages.debian.org/apt--main--0--patch-69 Correct spelling in cron.daily * apt@packages.debian.org/apt--main--0--patch-70 Use find|xargs rather than find -exec in cron.daily * apt@packages.debian.org/apt--main--0--patch-71 Update changelog
2005-03-14Update changelogMatt Zimmerman
2005-03-14Use find|xargs rather than find -exec in cron.dailyMatt Zimmerman
2005-03-14Correct spelling in cron.dailyMatt Zimmerman
2005-03-14Merge apt--mvo--0Matt Zimmerman
Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-7 * sync with matt again * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-8 * add APT::Archives::{MaxAge,MaxSize} to the cron.daily apt script
2005-03-14* add APT::Archives::{MaxAge,MaxSize} to the cron.daily apt scriptMichael Vogt
2005-03-08Open 0.6.35Matt Zimmerman
2005-03-05Merge from bubulle@debian.org--2005/apt--main--0 (translations)Matt Zimmerman
Patches applied: * bubulle@debian.org--2005/apt--main--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-48 * bubulle@debian.org--2005/apt--main--0--patch-1 French translation update * bubulle@debian.org--2005/apt--main--0--patch-2 Remove useles tilde files * bubulle@debian.org--2005/apt--main--0--patch-3 Updated Finnish and Basque translations * bubulle@debian.org--2005/apt--main--0--patch-4 Update with files from apt-sarge. Complete French translation. * bubulle@debian.org--2005/apt--main--0--patch-5 Correct typo in Usage message : s/arbitary/arbitrary. Unfuzzy translations. Closes: #291172 * bubulle@debian.org--2005/apt--main--0--patch-6 Updated French manpage. Closes: #291020 * bubulle@debian.org--2005/apt--main--0--patch-7 Japanese documentation update. Closes: #265720 * bubulle@debian.org--2005/apt--main--0--patch-8 Updated Traditional Chines translation * bubulle@debian.org--2005/apt--main--0--patch-9 Updated Norwegian Bokmal translation from sarge branch * bubulle@debian.org--2005/apt--main--0--patch-10 Updated Slovenian translation * bubulle@debian.org--2005/apt--main--0--patch-11 Remove no_NO translation (not needed after sarge) * bubulle@debian.org--2005/apt--main--0--patch-12 Hungarian translation updated from the sarge branch. Closes: #292204 * bubulle@debian.org--2005/apt--main--0--patch-13 Hungarian translation completed. Closes: #292204 * bubulle@debian.org--2005/apt--main--0--patch-14 Polish translation updated from sarge * bubulle@debian.org--2005/apt--main--0--patch-15 Initiali Tagalog translation. Closes:#293132 * bubulle@debian.org--2005/apt--main--0--patch-16 Really add the Tagalog translation. Closes: #293132 * bubulle@debian.org--2005/apt--main--0--patch-17 Completed Tagalog translation. Closes: #293132 * bubulle@debian.org--2005/apt--main--0--patch-18 Merge with Matt and update French translation * bubulle@debian.org--2005/apt--main--0--patch-19 Remove no_NO from LINGUAS * bubulle@debian.org--2005/apt--main--0--patch-20 Rebuild the POT file * bubulle@debian.org--2005/apt--main--0--patch-21 Update all PO files from the new apt-all.pot file * bubulle@debian.org--2005/apt--main--0--patch-22 Complete French translation * bubulle@debian.org--2005/apt--main--0--patch-23 Updated Basque translation for main by Piarres Beobide Egana * bubulle@debian.org--2005/apt--main--0--patch-24 Updated Japanese and Norwegian Bokmal translations * bubulle@debian.org--2005/apt--main--0--patch-25 Tagalog translation update by Eric Pareja * bubulle@debian.org--2005/apt--main--0--patch-26 Updated Simplified Chinese translation by Kov Tchai * bubulle@debian.org--2005/apt--main--0--patch-27 Updated Slovak translation by Peter Mann * bubulle@debian.org--2005/apt--main--0--patch-28 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-29 Dutch translation update by Bart Cornelis * bubulle@debian.org--2005/apt--main--0--patch-30 Danish translation update by Claus Hindsgaul * bubulle@debian.org--2005/apt--main--0--patch-31 Correct LINGUAS to include ru and tl * bubulle@debian.org--2005/apt--main--0--patch-32 Polish translation update by Bartosz Fenski * bubulle@debian.org--2005/apt--main--0--patch-33 Czech translation update by Miroslav Kure * bubulle@debian.org--2005/apt--main--0--patch-34 Brazilian Portuguese translation update by Andre Luis Lopes * bubulle@debian.org--2005/apt--main--0--patch-35 Complete Norwegian Nynorsk translation by H��vard Korsvoll * bubulle@debian.org--2005/apt--main--0--patch-36 Updated Spanish translation by Ruben Porras * bubulle@debian.org--2005/apt--main--0--patch-37 Russian translation update by Yuri Kozlov * bubulle@debian.org--2005/apt--main--0--patch-38 German translation update by Michael Piefel * bubulle@debian.org--2005/apt--main--0--patch-39 Swedish translation update by Peter Karlsson * bubulle@debian.org--2005/apt--main--0--patch-40 Finnish translation update by Tapio Lehtonen * bubulle@debian.org--2005/apt--main--0--patch-41 Hungarian translation update by Kelemen G��bor * bubulle@debian.org--2005/apt--main--0--patch-42 Catalan translation update by Jordi Mallach * bubulle@debian.org--2005/apt--main--0--patch-43 Korean translation update by Changwoo Ryu * bubulle@debian.org--2005/apt--main--0--patch-44 Greek translation updated by George Papamichelakis * bubulle@debian.org--2005/apt--main--0--patch-45 Important corrections to French translation by Mohamed Adn��neTrojette * bubulle@debian.org--2005/apt--main--0--patch-46 Updated Slovenian translation by Jure Cuhalev * bubulle@debian.org--2005/apt--main--0--patch-47 French translation update after proofreading * bubulle@debian.org--2005/apt--main--0--patch-48 Updated Portuguese translation by Miguel Figuereido * bubulle@debian.org--2005/apt--main--0--patch-49 Traditional Chinese translation update by Asho Yeh * bubulle@debian.org--2005/apt--main--0--patch-50 Restored complete French translation * bubulle@debian.org--2005/apt--main--0--patch-51 Remove de.UTF-8 from LINGUAS * bubulle@debian.org--2005/apt--main--0--patch-52 Greek translation completed * bubulle@debian.org--2005/apt--main--0--patch-53 Traditional Chinese translation update * bubulle@debian.org--2005/apt--main--0--patch-54 Merge with matt * bubulle@debian.org--2005/apt--main--0--patch-55 Regenerate apt-all.pot from the sources after merging with Matt * bubulle@debian.org--2005/apt--main--0--patch-56 Re-sync PO files with the POT file * bubulle@debian.org--2005/apt--main--0--patch-57 Correct file permissions
2005-03-05Update build-depends on gettext to 0.12Matt Zimmerman
2005-03-05Add missing semicolon in configure-index (Debian #295773)Matt Zimmerman
2005-03-05Open 0.6.34Matt Zimmerman
2005-02-26Merge apt--mvo--0Matt Zimmerman
Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-2 * merge with matts tree, added documentation for the gpgv stuff * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-3 * added gpgv::Options to configure-index * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-4 * PulseIntervall can be configured now to make frontends like synaptic hayppy. it's done in a way that does not break binary compatibility * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-5 * fix for apt-get update removing the cdroms Release.gpg files * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-6 * path scoring changed, the non-symlink path is scored highest
2005-02-09Merge apt--mvo--0Matt Zimmerman
Patches applied: * michael.vogt@canonical.com--2004/apt--mvo--0--patch-12 * star-merged with matt, removed the unset("no_proxy") in methods/ftp.cc * michael.vogt@canonical.com--2004/apt--mvo--0--patch-13 * commented the ftp no_proxy unseting in methods/ftp.cc * michael.vogt@canonical.com--2004/apt--mvo--0--patch-14 * starmeged with matt, added some comments to the unsetting of no_proxy in ftp.cc * michael.vogt@canonical.com--2004/apt--mvo--0--patch-15 * merged with matt's tree * michael.vogt@canonical.com--2004/apt--mvo--0--patch-16 * added support for "Acquire::gpgv::options" in methods/gpgv.cc * michael.vogt@ubuntu.com--2005/apt--mvo--0--base-0 tag of michael.vogt@canonical.com--2004/apt--mvo--0--patch-16 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-1 * slightly cosmetic change in methods/gpgv.cc
2005-02-09Open 0.6.32Matt Zimmerman
2005-02-04Move CD-ROM handling backend into libapt-pkgMatt Zimmerman
- apt-cdrom.cc seperated into frontend (cmdline/apt-cdrom.cc and library apt-pkg/cdrom.{cc,h}) (Ubuntu #5668) Patches applied: * michael.vogt@ubuntu.com--2005/apt--auth-cdrom--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-51 * michael.vogt@ubuntu.com--2005/apt--auth-cdrom--0--patch-1 * added support for signed cdroms * michael.vogt@ubuntu.com--2005/apt--auth-cdrom--0--patch-2 * merged with apt--main, seperated cmdline/apt-cdrom.cc into a library (apt-pkg/cdrom.{cc,h}) * michael.vogt@ubuntu.com--2005/apt--auth-cdrom--0--patch-3 * cleaned up the cmdline/apt-cdrom.cc code
2005-02-04Fix build/install of Polish offline documentationMatt Zimmerman
* Fix build/install of Polish offline documentation, based on patch from Christian Perrier (Closes: #270404)
2005-02-04allow SHA1Summation to process a file descriptor until EOFMatt Zimmerman
* Apply patch from Anthony Towns to allow SHA1Summation to process a file descriptor until EOF, rather than requiring that the length of input be specified (Closes: #291338)
2005-01-22Remove debugging from apt.cron.dailyMatt Zimmerman
2005-01-220.6.31Matt Zimmerman
2005-01-190.6.30Matt Zimmerman
2005-01-19Merge michael.vogt@canonical.com--2004/apt--status-fd--0Matt Zimmerman
Patches applied: * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-32 * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-1 * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-2 * changed version of the library * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-3 * merged with matt again * michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-4 * merged with apt--main--0 and fixed permissions in po/ * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-1 tag of michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-4 * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-2 * merged with matt's tree * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-3 * removed a stupid "<<<" merge in the changelog * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-4 * star-merged with apt@packages.debian.org/apt--main--0 * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-5 * removed the "pre-fork/post-fork" change and put it into it's own branch, star-merged with matt so that it applies cleanly * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-6 * cleaned a incorrect log-file merge * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-7 * removed a conflict in =tagging-method * michael.vogt@canonical.com--2004/apt--status-fd--0--patch-8 * cleaned up the delta so that it no longer contains unreleated whitespace changes
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 10:41:47 +0000