algorithms.h   algorithms.h 
skipping to change at line 110 skipping to change at line 110
{ {
PkgIterator Pkg; PkgIterator Pkg;
DepIterator Dep; DepIterator Dep;
}; };
void MakeScores(); void MakeScores();
bool DoUpgrade(pkgCache::PkgIterator Pkg); bool DoUpgrade(pkgCache::PkgIterator Pkg);
public: public:
inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protec ted;}; inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protec ted; Cache.MarkProtected(Pkg);};
inline void Remove(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= ToRemov e;}; inline void Remove(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= ToRemov e;};
inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protec ted | ToRemove);}; inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protec ted | ToRemove);};
// Try to intelligently resolve problems by installing and removing pack ages // Try to intelligently resolve problems by installing and removing pack ages
bool Resolve(bool BrokenFix = false); bool Resolve(bool BrokenFix = false);
// Try to resolve problems only by using keep // Try to resolve problems only by using keep
bool ResolveByKeep(); bool ResolveByKeep();
// Install all protected packages // Install all protected packages
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 cacheiterators.h   cacheiterators.h 
skipping to change at line 209 skipping to change at line 209
This method should be used to identify if two pseudo versions ar e This method should be used to identify if two pseudo versions ar e
refering to the same "real" version */ refering to the same "real" version */
inline bool SimilarVer(const VerIterator &B) const { inline bool SimilarVer(const VerIterator &B) const {
return (B.end() == false && S->Hash == B->Hash && strcmp(Ver Str(), B.VerStr()) == 0); return (B.end() == false && S->Hash == B->Hash && strcmp(Ver Str(), B.VerStr()) == 0);
}; };
// Accessors // Accessors
inline const char *VerStr() const {return S->VerStr == 0?0:Owner->St rP + S->VerStr;}; inline const char *VerStr() const {return S->VerStr == 0?0:Owner->St rP + S->VerStr;};
inline const char *Section() const {return S->Section == 0?0:Owner-> StrP + S->Section;}; inline const char *Section() const {return S->Section == 0?0:Owner-> StrP + S->Section;};
inline const char *Arch() const { inline const char *Arch() const {
if (S->MultiArch == pkgCache::Version::All ||
S->MultiArch == pkgCache::Version::AllForeign ||
S->MultiArch == pkgCache::Version::AllAllowed)
return "all";
return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch; return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;
}; };
__deprecated inline const char *Arch(bool const pseudo) const { __deprecated inline const char *Arch(bool const pseudo) const {
return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch; return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;
}; };
inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owne r->PkgP + S->ParentPkg);}; inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owne r->PkgP + S->ParentPkg);};
inline DescIterator DescriptionList() const; inline DescIterator DescriptionList() const;
DescIterator TranslatedDescription() const; DescIterator TranslatedDescription() const;
inline DepIterator DependsList() const; inline DepIterator DependsList() const;
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 config.h   config.h 
skipping to change at line 41 skipping to change at line 41
/* Define if we have enabled pthread support */ /* Define if we have enabled pthread support */
/* #undef HAVE_PTHREAD */ /* #undef HAVE_PTHREAD */
/* If there is no socklen_t, define this for the netdb shim */ /* If there is no socklen_t, define this for the netdb shim */
/* #undef NEED_SOCKLEN_T_DEFINE */ /* #undef NEED_SOCKLEN_T_DEFINE */
/* Define the arch name string */ /* Define the arch name string */
#define COMMON_ARCH "i386" #define COMMON_ARCH "i386"
/* The version number string */ /* The version number string */
#define VERSION "0.8.13.1" #define VERSION "0.8.13.2"
/* The package name string */ /* The package name string */
#define PACKAGE "apt" #define PACKAGE "apt"
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 deblistparser.h   deblistparser.h 
skipping to change at line 43 skipping to change at line 43
unsigned long iOffset; unsigned long iOffset;
string Arch; string Arch;
std::vector<std::string> Architectures; std::vector<std::string> Architectures;
bool MultiArchEnabled; bool MultiArchEnabled;
unsigned long UniqFindTagWrite(const char *Tag); unsigned long UniqFindTagWrite(const char *Tag);
bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver); bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag, bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag,
unsigned int Type); unsigned int Type);
bool ParseProvides(pkgCache::VerIterator &Ver); bool ParseProvides(pkgCache::VerIterator &Ver);
bool NewProvidesAllArch(pkgCache::VerIterator &Ver, string const &Packag e, string const &Version);
static bool GrabWord(string Word,WordList *List,unsigned char &Out); static bool GrabWord(string Word,WordList *List,unsigned char &Out);
public: public:
static unsigned char GetPrio(string Str); static unsigned char GetPrio(string Str);
// These all operate against the current section // These all operate against the current section
virtual string Package(); virtual string Package();
virtual string Architecture(); virtual string Architecture();
virtual bool ArchitectureAll(); virtual bool ArchitectureAll();
skipping to change at line 72 skipping to change at line 73
virtual unsigned long Size() {return Section.size();}; virtual unsigned long Size() {return Section.size();};
virtual bool Step(); virtual bool Step();
bool LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,FileFd &File, bool LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,FileFd &File,
string section); string section);
static const char *ParseDepends(const char *Start,const char *Stop, static const char *ParseDepends(const char *Start,const char *Stop,
string &Package,string &Ver,unsigned int &Op, string &Package,string &Ver,unsigned int &Op,
bool const &ParseArchFlags = false, bool const &ParseArchFlags = false,
bool const &StripMultiArch = false); bool const &StripMultiArch = true);
static const char *ConvertRelation(const char *I,unsigned int &Op); static const char *ConvertRelation(const char *I,unsigned int &Op);
debListParser(FileFd *File, string const &Arch = ""); debListParser(FileFd *File, string const &Arch = "");
}; };
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 depcache.h   depcache.h 
skipping to change at line 122 skipping to change at line 122
// These flags are used in DepState // These flags are used in DepState
enum DepFlags {DepNow = (1 << 0),DepInstall = (1 << 1),DepCVer = (1 << 2 ), enum DepFlags {DepNow = (1 << 0),DepInstall = (1 << 1),DepCVer = (1 << 2 ),
DepGNow = (1 << 3),DepGInstall = (1 << 4),DepGCVer = (1 < < 5)}; DepGNow = (1 << 3),DepGInstall = (1 << 4),DepGCVer = (1 < < 5)};
// These flags are used in StateCache::DepState // These flags are used in StateCache::DepState
enum DepStateFlags {DepNowPolicy = (1 << 0), DepNowMin = (1 << 1), enum DepStateFlags {DepNowPolicy = (1 << 0), DepNowMin = (1 << 1),
DepInstPolicy = (1 << 2), DepInstMin = (1 << 3), DepInstPolicy = (1 << 2), DepInstMin = (1 << 3),
DepCandPolicy = (1 << 4), DepCandMin = (1 << 5)}; DepCandPolicy = (1 << 4), DepCandMin = (1 << 5)};
// These flags are used in StateCache::iFlags // These flags are used in StateCache::iFlags
enum InternalFlags {AutoKept = (1 << 0), Purge = (1 << 1), ReInstall = ( 1 << 2)}; enum InternalFlags {AutoKept = (1 << 0), Purge = (1 << 1), ReInstall = ( 1 << 2), Protected = (1 << 3)};
enum VersionTypes {NowVersion, InstallVersion, CandidateVersion}; enum VersionTypes {NowVersion, InstallVersion, CandidateVersion};
enum ModeList {ModeDelete = 0, ModeKeep = 1, ModeInstall = 2}; enum ModeList {ModeDelete = 0, ModeKeep = 1, ModeInstall = 2};
/** \brief Represents an active action group. /** \brief Represents an active action group.
* *
* An action group is a group of actions that are currently being * An action group is a group of actions that are currently being
* performed. While an active group is active, certain routine * performed. While an active group is active, certain routine
* clean-up actions that would normally be performed after every * clean-up actions that would normally be performed after every
* cache operation are delayed until the action group is * cache operation are delayed until the action group is
skipping to change at line 396 skipping to change at line 396
/** \name State Manipulators /** \name State Manipulators
*/ */
// @{ // @{
void MarkKeep(PkgIterator const &Pkg, bool Soft = false, void MarkKeep(PkgIterator const &Pkg, bool Soft = false,
bool FromUser = true, unsigned long Depth = 0); bool FromUser = true, unsigned long Depth = 0);
void MarkDelete(PkgIterator const &Pkg, bool Purge = false, void MarkDelete(PkgIterator const &Pkg, bool Purge = false,
unsigned long Depth = 0, bool FromUser = true); unsigned long Depth = 0, bool FromUser = true);
void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true, void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,
unsigned long Depth = 0, bool FromUser = true, unsigned long Depth = 0, bool FromUser = true,
bool ForceImportantDeps = false); bool ForceImportantDeps = false);
void MarkProtected(PkgIterator const &Pkg) { PkgState[Pkg->ID].iFlags |= Protected; };
void SetReInstall(PkgIterator const &Pkg,bool To); void SetReInstall(PkgIterator const &Pkg,bool To);
// FIXME: Remove the unused boolean parameter on abi break // FIXME: Remove the unused boolean parameter on abi break
void SetCandidateVersion(VerIterator TargetVer, bool const &Pseudo = tru e); void SetCandidateVersion(VerIterator TargetVer, bool const &Pseudo = tru e);
bool SetCandidateRelease(pkgCache::VerIterator TargetVer, bool SetCandidateRelease(pkgCache::VerIterator TargetVer,
std::string const &TargetRel); std::string const &TargetRel);
/** Set the candidate version for dependencies too if needed. /** Set the candidate version for dependencies too if needed.
* *
* Sets not only the candidate version as SetCandidateVersion does, * Sets not only the candidate version as SetCandidateVersion does,
* but walks also down the dependency tree and checks if it is required * but walks also down the dependency tree and checks if it is required
skipping to change at line 489 skipping to change at line 490
pkgDepCache(pkgCache *Cache,Policy *Plcy = 0); pkgDepCache(pkgCache *Cache,Policy *Plcy = 0);
virtual ~pkgDepCache(); virtual ~pkgDepCache();
private: private:
// Helper for Update(OpProgress) to remove pseudoinstalled arch all pack ages // Helper for Update(OpProgress) to remove pseudoinstalled arch all pack ages
// FIXME: they are private so shouldn't affect abi, but just in case… // FIXME: they are private so shouldn't affect abi, but just in case…
__deprecated bool RemovePseudoInstalledPkg(PkgIterator &Pkg, std::set<un signed long> &recheck) { return true; }; __deprecated bool RemovePseudoInstalledPkg(PkgIterator &Pkg, std::set<un signed long> &recheck) { return true; };
__deprecated bool ReInstallPseudoForGroup(unsigned long const &Grp, std: :set<unsigned long> &recheck) { return true; }; __deprecated bool ReInstallPseudoForGroup(unsigned long const &Grp, std: :set<unsigned long> &recheck) { return true; };
__deprecated bool ReInstallPseudoForGroup(pkgCache::PkgIterator const &P , std::set<unsigned long> &recheck) { return true; }; __deprecated bool ReInstallPseudoForGroup(pkgCache::PkgIterator const &P , std::set<unsigned long> &recheck) { return true; };
bool IsModeChangeOk(ModeList const mode, PkgIterator const &Pkg,
unsigned long const Depth, bool const FromUser);
}; };
#endif #endif
 End of changes. 3 change blocks. 
1 lines changed or deleted 5 lines changed or added


 pkgcache.h   pkgcache.h 
skipping to change at line 508 skipping to change at line 508
map_ptrloc VerStr; // StringItem map_ptrloc VerStr; // StringItem
/** \brief section this version is filled in */ /** \brief section this version is filled in */
map_ptrloc Section; // StringItem map_ptrloc Section; // StringItem
/** \brief stores the MultiArch capabilities of this version /** \brief stores the MultiArch capabilities of this version
None is the default and doesn't trigger special behaviour, None is the default and doesn't trigger special behaviour,
Foreign means that this version can fulfill dependencies even Foreign means that this version can fulfill dependencies even
if it is built for another architecture as the requester. if it is built for another architecture as the requester.
Same indicates that builds for different architectures can Same indicates that builds for different architectures can
be co-installed on the system */ be co-installed on the system */
// FIXME: remove All on abi break /* FIXME: A bitflag would be better with the next abibreak… */
enum {None, All, Foreign, Same, Allowed} MultiArch; enum {None, All, Foreign, Same, Allowed, AllForeign, AllAllowed} MultiAr
ch;
/** \brief references all the PackageFile's that this version came from /** \brief references all the PackageFile's that this version came from
FileList can be used to determine what distribution(s) the Version FileList can be used to determine what distribution(s) the Version
applies to. If FileList is 0 then this is a blank version. applies to. If FileList is 0 then this is a blank version.
The structure should also have a 0 in all other fields excluding The structure should also have a 0 in all other fields excluding
pkgCache::Version::VerStr and Possibly pkgCache::Version::NextVer. * / pkgCache::Version::VerStr and Possibly pkgCache::Version::NextVer. * /
map_ptrloc FileList; // VerFile map_ptrloc FileList; // VerFile
/** \brief next (lower or equal) version in the linked list */ /** \brief next (lower or equal) version in the linked list */
map_ptrloc NextVer; // Version map_ptrloc NextVer; // Version
 End of changes. 1 change blocks. 
2 lines changed or deleted 3 lines changed or added


 vendor.h   vendor.h 
#ifndef PKGLIB_VENDOR_H #ifndef PKGLIB_VENDOR_H
#define PKGLIB_VENDOR_H #define PKGLIB_VENDOR_H
#include <string> #include <string>
#include <vector> #include <vector>
#include <map> #include <map>
#include <apt-pkg/macros.h>
using std::string; using std::string;
// A class representing a particular software provider. // A class representing a particular software provider.
class Vendor class __deprecated Vendor
{ {
public: public:
struct Fingerprint struct Fingerprint
{ {
string Print; string Print;
string Description; string Description;
}; };
protected: protected:
string VendorID; string VendorID;
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 vendorlist.h   vendorlist.h 
skipping to change at line 20 skipping to change at line 20
##################################################################### */ ##################################################################### */
/*}} }*/ /*}} }*/
#ifndef PKGLIB_VENDORLIST_H #ifndef PKGLIB_VENDORLIST_H
#define PKGLIB_VENDORLIST_H #define PKGLIB_VENDORLIST_H
#include <string> #include <string>
#include <vector> #include <vector>
#include <apt-pkg/vendor.h> #include <apt-pkg/vendor.h>
#include <apt-pkg/configuration.h> #include <apt-pkg/configuration.h>
#include <apt-pkg/macros.h>
using std::string; using std::string;
using std::vector; using std::vector;
class pkgVendorList class __deprecated pkgVendorList
{ {
protected: protected:
vector<Vendor const *> VendorList; vector<Vendor const *> VendorList;
bool CreateList(Configuration& Cnf); bool CreateList(Configuration& Cnf);
const Vendor* LookupFingerprint(string Fingerprint); const Vendor* LookupFingerprint(string Fingerprint);
public: public:
typedef vector<Vendor const *>::const_iterator const_iterator; typedef vector<Vendor const *>::const_iterator const_iterator;
bool ReadMainList(); bool ReadMainList();
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/