cacheiterators.h   cacheiterators.h 
skipping to change at line 223 skipping to change at line 223
}; };
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;
inline PrvIterator ProvidesList() const; inline PrvIterator ProvidesList() const;
inline VerFileIterator FileList() const; inline VerFileIterator FileList() const;
bool Downloadable() const; bool Downloadable() const;
inline const char *PriorityType() const {return Owner->Priority(S->P riority);}; inline const char *PriorityType() const {return Owner->Priority(S->P riority);};
const char *MultiArchType() const;
std::string RelStr() const; std::string RelStr() const;
bool Automatic() const; bool Automatic() const;
VerFileIterator NewestFile() const; VerFileIterator NewestFile() const;
inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Iterator<Vers ion, VerIterator>(Owner, Trg) { inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Iterator<Vers ion, VerIterator>(Owner, Trg) {
if (S == 0) if (S == 0)
S = OwnerPointer(); S = OwnerPointer();
}; };
inline VerIterator() : Iterator<Version, VerIterator>() {}; inline VerIterator() : Iterator<Version, VerIterator>() {};
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 config.h   config.h 
skipping to change at line 39 skipping to change at line 39
/* Define to the size of the filesize containing structures */ /* Define to the size of the filesize containing structures */
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
/* Define the arch name string */ /* Define the arch name string */
#define COMMON_ARCH "i386" #define COMMON_ARCH "i386"
/* The package name string */ /* The package name string */
#define PACKAGE "apt" #define PACKAGE "apt"
/* The version number string */ /* The version number string */
#define PACKAGE_VERSION "0.9.9" #define PACKAGE_VERSION "0.9.9.1"
/* The mail address to reach upstream */ /* The mail address to reach upstream */
#define PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>" #define PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>"
#define APT_8_CLEANER_HEADERS #define APT_8_CLEANER_HEADERS
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 depcache.h   depcache.h 
skipping to change at line 445 skipping to change at line 445
std::string const &TargetRel, std::string const &TargetRel,
std::list<std::pair<pkgCache::VerIterator, pkgCa che::VerIterator> > &Changed); std::list<std::pair<pkgCache::VerIterator, pkgCa che::VerIterator> > &Changed);
/** Set the "is automatically installed" flag of Pkg. */ /** Set the "is automatically installed" flag of Pkg. */
void MarkAuto(const PkgIterator &Pkg, bool Auto); void MarkAuto(const PkgIterator &Pkg, bool Auto);
// @} // @}
/** \return \b true if it's OK for MarkInstall to install /** \return \b true if it's OK for MarkInstall to install
* the given package. * the given package.
* *
* See the default implementation for a simple example how this * The default implementation simply calls all IsInstallOk*
* method can be used. * method mentioned below.
* Overriding implementations should use the hold-state-flag to cache *
* results from previous checks of this package - also it should * Overriding implementations should use the hold-state-flag to
* be used if the default resolver implementation is also used to * cache results from previous checks of this package - if possible.
* ensure that these packages are handled like "normal" dpkg holds.
* *
* The parameters are the same as in the calling MarkInstall: * The parameters are the same as in the calling MarkInstall:
* \param Pkg the package that MarkInstall wants to install. * \param Pkg the package that MarkInstall wants to install.
* \param AutoInst needs a previous MarkInstall this package? * \param AutoInst install this and all its dependencies
* \param Depth recursive deep of this Marker call * \param Depth recursive deep of this Marker call
* \param FromUser was the install requested by the user? * \param FromUser was the install requested by the user?
*/ */
virtual bool IsInstallOk(const PkgIterator &Pkg,bool AutoInst = true, virtual bool IsInstallOk(const PkgIterator &Pkg,bool AutoInst = true,
unsigned long Depth = 0, bool FromUser = true); unsigned long Depth = 0, bool FromUser = true);
/** \return \b true if it's OK for MarkDelete to remove /** \return \b true if it's OK for MarkDelete to remove
* the given package. * the given package.
* *
* See the default implementation for a simple example how this * The default implementation simply calls all IsDeleteOk*
* method can be used. * method mentioned below, see also #IsInstallOk.
* Overriding implementations should use the hold-state-flag to cache
* results from previous checks of this package - also it should
* be used if the default resolver implementation is also used to
* ensure that these packages are handled like "normal" dpkg holds.
* *
* The parameters are the same as in the calling MarkDelete: * The parameters are the same as in the calling MarkDelete:
* \param Pkg the package that MarkDelete wants to remove. * \param Pkg the package that MarkDelete wants to remove.
* \param Purge should we purge instead of "only" remove? * \param Purge should we purge instead of "only" remove?
* \param Depth recursive deep of this Marker call * \param Depth recursive deep of this Marker call
* \param FromUser was the remove requested by the user? * \param FromUser was the remove requested by the user?
*/ */
virtual bool IsDeleteOk(const PkgIterator &Pkg,bool MarkPurge = false, virtual bool IsDeleteOk(const PkgIterator &Pkg,bool MarkPurge = false,
unsigned long Depth = 0, bool FromUser = true); unsigned long Depth = 0, bool FromUser = true);
skipping to change at line 501 skipping to change at line 496
inline unsigned long PolicyBrokenCount() {return iPolicyBrokenCount;}; inline unsigned long PolicyBrokenCount() {return iPolicyBrokenCount;};
inline unsigned long BadCount() {return iBadCount;}; inline unsigned long BadCount() {return iBadCount;};
bool Init(OpProgress *Prog); bool Init(OpProgress *Prog);
// Generate all state information // Generate all state information
void Update(OpProgress *Prog = 0); void Update(OpProgress *Prog = 0);
pkgDepCache(pkgCache *Cache,Policy *Plcy = 0); pkgDepCache(pkgCache *Cache,Policy *Plcy = 0);
virtual ~pkgDepCache(); virtual ~pkgDepCache();
protected:
// methods call by IsInstallOk
bool IsInstallOkMultiArchSameVersionSynced(PkgIterator const &Pkg,
bool const AutoInst, unsigned long const Depth, bool const FromUser
);
// methods call by IsDeleteOk
bool IsDeleteOkProtectInstallRequests(PkgIterator const &Pkg,
bool const rPurge, unsigned long const Depth, bool const FromUser);
private: private:
bool IsModeChangeOk(ModeList const mode, PkgIterator const &Pkg, bool IsModeChangeOk(ModeList const mode, PkgIterator const &Pkg,
unsigned long const Depth, bool const FromUser); unsigned long const Depth, bool const FromUser);
}; };
#endif #endif
 End of changes. 4 change blocks. 
13 lines changed or deleted 18 lines changed or added


 dpkgpm.h   dpkgpm.h 
skipping to change at line 17 skipping to change at line 17
##################################################################### */ ##################################################################### */
/*}} }*/ /*}} }*/
#ifndef PKGLIB_DPKGPM_H #ifndef PKGLIB_DPKGPM_H
#define PKGLIB_DPKGPM_H #define PKGLIB_DPKGPM_H
#include <apt-pkg/packagemanager.h> #include <apt-pkg/packagemanager.h>
#include <vector> #include <vector>
#include <map> #include <map>
#include <stdio.h> #include <stdio.h>
#include <apt-pkg/macros.h>
#ifndef APT_8_CLEANER_HEADERS #ifndef APT_8_CLEANER_HEADERS
using std::vector; using std::vector;
using std::map; using std::map;
#endif #endif
class pkgDPkgPMPrivate; class pkgDPkgPMPrivate;
class pkgDPkgPM : public pkgPackageManager class pkgDPkgPM : public pkgPackageManager
{ {
skipping to change at line 82 skipping to change at line 83
PkgIterator Pkg; PkgIterator Pkg;
Item(Ops Op,PkgIterator Pkg,std::string File = "") : Op(Op), Item(Ops Op,PkgIterator Pkg,std::string File = "") : Op(Op),
File(File), Pkg(Pkg) {}; File(File), Pkg(Pkg) {};
Item() {}; Item() {};
}; };
std::vector<Item> List; std::vector<Item> List;
// Helpers // Helpers
bool RunScriptsWithPkgs(const char *Cnf); bool RunScriptsWithPkgs(const char *Cnf);
bool SendV2Pkgs(FILE *F); __deprecated bool SendV2Pkgs(FILE *F);
bool SendPkgsInfo(FILE * const F, unsigned int const &Version);
void WriteHistoryTag(std::string const &tag, std::string value); void WriteHistoryTag(std::string const &tag, std::string value);
// apport integration // apport integration
void WriteApportReport(const char *pkgpath, const char *errormsg); void WriteApportReport(const char *pkgpath, const char *errormsg);
// dpkg log // dpkg log
bool OpenLog(); bool OpenLog();
bool CloseLog(); bool CloseLog();
// input processing // input processing
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 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/