From: David Kalnischkies Date: Sun, 30 Oct 2011 18:48:05 +0000 (-0500) Subject: merge with my debian-sid branch X-Git-Tag: 0.9.0~47^2~3 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/89d88ac3ef3f82fdfeac6d8d231deddeeb0f02e9 merge with my debian-sid branch --- 89d88ac3ef3f82fdfeac6d8d231deddeeb0f02e9 diff --cc apt-pkg/algorithms.cc index 4c2ea0f2d,44cba8d92..f7a333606 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@@ -1228,11 -1199,15 +1231,15 @@@ bool pkgProblemResolver::InstOrNewPolic // a newly broken policy (recommends/suggests) is a problem if (Cache[I].NowPolicyBroken() == false && Cache[I].InstPolicyBroken() == true) + { + if (Debug == true) + std::clog << " Policy breaks with upgrade of " << I << std::endl; return true; - + } + return false; } - + /*}}}*/ // ProblemResolver::ResolveByKeep - Resolve problems using keep /*{{{*/ // --------------------------------------------------------------------- /* This is the work horse of the soft upgrade routine. It is very gental diff --cc apt-pkg/deb/dpkgpm.cc index 5eb6406c6,b6c92fc23..7c0ed5639 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@@ -983,8 -965,6 +983,7 @@@ bool pkgDPkgPM::Go(int OutStatusFd char status_fd_buf[20]; snprintf(status_fd_buf,sizeof(status_fd_buf),"%i", fd[1]); ADDARG(status_fd_buf); - + unsigned long const Op = I->Op; switch (I->Op) { diff --cc debian/changelog index 98a561698,ef4027406..406f1e8a4 --- a/debian/changelog +++ b/debian/changelog @@@ -1,196 -1,66 +1,259 @@@ -apt (0.8.15.9+nmu1) unstable; urgency=low +apt (0.8.16~exp8) experimental; urgency=low + + [ David Kalnischkies ] + * apt-pkg/packagemanager.cc: + - do not fail on unpacked packages in SmartUnPack, just don't + shedule them for unpack, but do all checks and configure them + + -- David Kalnischkies Mon, 17 Oct 2011 11:21:21 +0200 + +apt (0.8.16~exp7) experimental; urgency=low + + [ David Kalnischkies ] + * do not pollute namespace in the headers with using (Closes: #500198) + * use forward declaration in headers if possible instead of includes + * remove old APT_COMPATIBILITY ifdef's + * apt-pkg/deb/dpkgpm.cc: + - use std::vector instead of fixed size arrays to store args and + multiarch-packagename strings + - load the dpkg base arguments only one time and reuse them later + * cmdline/apt-get.cc: + - follow Provides in the evaluation of saving candidates, too, for + statisfying garbage package dependencies (Closes: #640590) + * apt-pkg/algorithms.cc: + - if a package is garbage, don't try to save it with FixByInstall + * apt-pkg/deb/debsrcrecords.cc: + - remove the limit of 400 Binaries for a source package (Closes: #622110) + * apt-pkg/deb/deblistparser.cc: + - fix crash when the dynamic mmap needs to be grown in + LoadReleaseInfo (LP: #854090) + * apt-pkg/deb/debmetaindex.cc: + - none is a separator, not a language: no need for Index (Closes: #624218) + * apt-pkg/aptconfiguration.cc: + - do not builtin languages only if none is forced (Closes: #643787) + * apt-pkg/pkgcachegen.cc: + - refactor MergeList by creating -Group, -Package and -Version specialist + - share description list between "same" versions (LP: #868977) + This also means that descriptions are shared across archives now. + - add implicit dependencies needed for Multi-Arch at the time a Version + struct is created and not at the end of the cache generation + * apt-pkg/pkgcache.cc: + - always prefer "en" over "" for "en"-language regardless of cache-order + + [ Michael Vogt ] + * apt-pkg/contrib/configuration.cc: + - fix double delete (LP: #848907) + - ignore only the invalid regexp instead of all options + * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc: + - fix fetching language information by adding OptionalSubIndexTarget + * methods/https.cc: + - cleanup broken downloads properly + + [ Colin Watson ] + * ftparchive/cachedb.cc: + - fix buffersize in bytes2hex + + -- Michael Vogt Fri, 14 Oct 2011 13:51:35 +0200 + +apt (0.8.16~exp6) experimental; urgency=low + + [ Christopher Baines ] + * enable APT in unpack/configure ordering to handle loops as well + as tight dependencies between immediate packages better + enabling also the possibility to mark all packages as immediate + (at least Closes: #353290, #540227, #559733, #621836, #639290) + + [ David Kalnischkies ] + * [abi-break] Support large files in the complete toolset. Indexes of this + size are pretty unlikely for now, but we need it for deb + packages which could become bigger than 4GB now (LP: #815895) + * merged the debian-sid branch + + [ Michael Vogt ] + * bump ABI version + + -- Michael Vogt Wed, 14 Sep 2011 21:06:51 +0200 + +apt (0.8.16~exp5) experimental; urgency=low + + * merged the latest debian-sid fixes + * apt-pkg/makefile: + - install sha256.h compat header + * apt-pkg/pkgcachegen.{cc,h}: + - use ref-to-ptr semantic in NewDepends() to ensure that the + libapt does not segfault if the cache is remapped in between + (LP: #812862) + - fix crash when P.Arch() was used but the cache got remapped + * apt-pkg/acquire-item.{cc,h}: + - do not check for a "Package" tag in optional index targets + like the translations index + * apt-pkg/acquire.cc: + - fix potential divide-by-zero + * methods/mirror.cc: + - include the architecture(s) in the query string as well so + that the server can make better decisions + + -- Michael Vogt Mon, 15 Aug 2011 14:52:54 +0200 + +apt (0.8.16~exp4) experimental; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/pkgcache.h: + - [ABI break] Add pkgCache::Header::CacheFileSize, storing the cache size + * apt-pkg/pkgcachegen.cc: + - Write the file size to the cache + * apt-pkg/pkgcache.cc: + - Check that cache is at least CacheFileSize bytes large (LP: #16467) + + [ Michael Vogt ] + * merged latest fixes from debian-sid + * apt-pkg/cdrom.{cc,h}: + - cleanup old ABI break avoidance hacks + * [ABI break] apt-pkg/acquire-item.{cc,h}: + - cleanup around OptionalIndexTarget and SubIndexTarget + * [ABI break] merged patch from Jonathan Thomas to have a new + RecordField() function in the pkgRecorder parser. Many thanks + Thomas + * [ABI break] merge patch from Jonathan Thomas to speed up the + depcache by caching the install-recommends and install-suggests + values + * apt-pkg/contrib/fileutl.{cc,h}: + - add GetModificationTime() helper + * apt-pkg/pkgcachegen.cc: + - regenerate the cache if the sources.list changes to ensure + that changes in the ordering there will be honored by apt + * apt-pkg/sourcelist.{cc,h}: + - add pkgSourceList::GetLastModifiedTime() helper + + -- Michael Vogt Thu, 28 Jul 2011 16:57:08 +0200 + +apt (0.8.16~exp3) experimental; urgency=low + + [ David Kalnischkies ] + * apt-pkg/pkgcache.h: + - readd All{Foreign,Allowed} as suggested by Julian to + remain strictly API compatible + * apt-pkg/acquire*.{cc,h}: + - try even harder to support really big files in the fetcher by + converting (hopefully) everything to 'long long' (Closes: #632271) + * ftparchive/writer.cc: + - generate all checksums in one run over the file for Release + * cmdline/apt-get.cc: + - add an --assume-no option for testing to say 'no' to everything + * apt-pkg/deb/debmetaindex.cc: + - add trusted=yes option to mark unsigned (local) repository as trusted + based on a patch from Ansgar Burchardt, thanks a lot! (Closes: #596498) + + [ Michael Vogt ] + * merge fixes from the debian/unstable upload + * merge lp:~mvo/apt/sha512-template to get fixes for the + sha1/md5 verifiation (closes: #632520) + + -- Michael Vogt Fri, 15 Jul 2011 09:56:17 +0200 + +apt (0.8.16~exp2) experimental; urgency=low + + [ David Kalnischkies ] + * [ABI-Break] Implement EDSP in libapt-pkg so that all front-ends which + use the internal resolver can now be used also with external + ones as the usage is hidden in between the old API + * provide two edsp solvers in apt-utils: + - 'dump' to quickly output a complete scenario and + - 'apt' to use the internal as an external resolver + * apt-pkg/pkgcache.h: + - clean up mess with the "all" handling in MultiArch to + fix LP: #733741 cleanly for everyone now + * apt-pkg/depcache.cc: + - use a boolean instead of an int for Add/Remove in AddStates + similar to how it works with AddSizes + - let the Mark methods return if their marking was successful + - if a Breaks can't be upgraded, remove it. If it or a Conflict + can't be removed the installation of the breaker fails. + * cmdline/apt-get.cc: + - do not discard the error messages from the resolver and instead + only show the general 'Broken packages' message if nothing else + + [ Stefano Zacchiroli ] + * doc/external-dependency-solver-protocol.txt: + - describe EDSP and the configuration interface around it + + [ Michael Vogt ] + * [ABI-Break] merge lp:~mvo/apt/sha512-template to add support for sha512 + * [ABI-Break] merge lp:~mvo/apt/dpointer to support easier extending + without breaking the ABI + * increase ABI version and update package names + + -- Michael Vogt Wed, 29 Jun 2011 13:57:28 +0200 + +apt (0.8.16~exp1) experimental; urgency=low + + * merged with the debian/unstable upload + + -- Michael Vogt Wed, 29 Jun 2011 12:40:31 +0200 + ++apt (1.8.15.9+nmu1) unstable; urgency=low + + [ David Kalnischkies ] + * algorithms.cc: + - show a debug why a package was kept by ResolveByKeep() + + -- David Kalnischkies Mon, 17 Oct 2011 16:36:22 +0200 + + apt (0.8.15.9) unstable; urgency=low + + [ David Kalnischkies ] + * Symbol file update + * doc/apt-get.8.xml: + - change wording of autoremove description as suggested + by Robert Simmons, thanks! (Closes: #641490) + * apt-pkg/deb/dpkgpm.cc: + - use std::vector instead of fixed size arrays to store args and + multiarch-packagename strings + - load the dpkg base arguments only one time and reuse them later + * cmdline/apt-get.cc: + - follow Provides in the evaluation of saving candidates, too, for + statisfying garbage package dependencies (Closes: #640590) + * apt-pkg/algorithms.cc: + - if a package is garbage, don't try to save it with FixByInstall + * apt-pkg/init.cc: + - silently ignore *.orig and *.save files by default + * apt-pkg/policy.cc: + - accept generic release pin expressions again in -t (Closes: #644166) + * apt-pkg/deb/debmetaindex.cc: + - none is a separator, not a language: no need for Index (Closes: #624218) + * apt-pkg/aptconfiguration.cc: + - do not builtin languages only if none is forced (Closes: #643787) + * doc/apt.conf.5.xml: + - apply spelling fix by Kevin Lyda, thanks! (Closes: #644104) + + [ Christian Perrier ] + * Fix spelling error (sensée) in French translation. Thanks + to Corentin Le Gall for spotting it. + + [ Colin Watson ] + * ftparchive/cachedb.cc: + - fix buffersize in bytes2hex + + [ Michael Vogt ] + * ftparchive/cachedb.cc: + - make buffer fully dynamic (thanks to Colin Watson) + + -- Michael Vogt Fri, 14 Oct 2011 12:00:09 +0200 + + apt (0.8.15.8) unstable; urgency=low + + [ David Kalnischkies ] + * cmdline/apt-get.cc: + - output list of virtual package providers to c1out in -q=1 + instead of /dev/null to unbreak sbuild (LP: #816155) - ++ + [ Michael Vogt ] + * apt-pkg/contrib/configuration.cc: + - fix double delete (LP: #848907) + - ignore only the invalid regexp instead of all options + + -- Michael Vogt Wed, 14 Sep 2011 12:08:25 +0200 + apt (0.8.15.7) unstable; urgency=low [ David Kalnischkies ] diff --cc doc/po/de.po index 6261a470e,0ce5c1bcc..1c3ab0e90 --- a/doc/po/de.po +++ b/doc/po/de.po @@@ -1394,12 -1394,18 +1394,18 @@@ msgstr " msgid "" msgstr "" - # FIXME s/twicked/tricked/ #. type: Content of: #: apt-cache.8.xml:317 + #, fuzzy + #| msgid "" + #| "Per default the depends and rdepends print all dependencies. This can be twicked with these flags " + #| "which will omit the specified dependency type. Configuration Item: " + #| "APT::Cache::ShowDependencyType e.g. APT::Cache::ShowRecommends." msgid "" "Per default the depends and rdepends " -"print all dependencies. This can be tweaked with these flags which will omit " +"print all dependencies. This can be twicked with these flags which will omit " "the specified dependency type. Configuration Item: APT::Cache::" "ShowDependencyType e.g. APT::" "Cache::ShowRecommends." @@@ -3133,9 -3140,8 +3139,20 @@@ msgid " msgstr "" ", , " - # FIXME Checksum im letzten Abschnitt ? #. type: Content of: #: apt-ftparchive.1.xml:531 ++#, fuzzy ++#| msgid "" ++#| "Generate the given checksum. These options default to on, when turned off " ++#| "the generated index files will not have the checksum fields where " ++#| "possible. Configuration Items: APT::FTPArchive::" ++#| "Checksum and APT::" ++#| "FTPArchive::Index::Checksum where Index can be Packages, Sources " ++#| "or Release and Checksum can be MD5, SHA1 or SHA256." msgid "" "Generate the given checksum. These options default to on, when turned off " "the generated index files will not have the checksum fields where possible. " @@@ -3748,12 -3785,19 +3795,18 @@@ msgstr " "installiert haben oder installieren könnten." #. type: Content of: -#: apt-get.8.xml:262 +#: apt-get.8.xml:255 + #, fuzzy + #| msgid "" + #| "If the option is specified then the package " + #| "will be compiled to a binary .deb using dpkg-buildpackage, if is specified then the " + #| "source package will not be unpacked." msgid "" "If the option is specified then the package will " -"be compiled to a binary .deb using dpkg-buildpackage for " -"the architecture as defined by the --host-architecture " -"option. If is specified then the source " -"package will not be unpacked." +"be compiled to a binary .deb using dpkg-buildpackage, if " +" is specified then the source package will " +"not be unpacked." msgstr "" "Wenn die -Option angegeben ist, dann wird das " "Paket unter Benutzung von dpkg-buildpackage zu einem " @@@ -3793,10 -3837,17 +3846,14 @@@ msgid "build-dep msgstr "build-dep" #. type: Content of: -#: apt-get.8.xml:281 +#: apt-get.8.xml:272 + #, fuzzy + #| msgid "" + #| "build-dep causes apt-get to install/remove packages in " + #| "an attempt to satisfy the build dependencies for a source package." msgid "" "build-dep causes apt-get to install/remove packages in an " -"attempt to satisfy the build dependencies for a source package. By default " -"the dependencies are satisfied to build the package nativly. If desired a " -"host-architecture can be specified with the