acquire.h   acquire.h 
skipping to change at line 350 skipping to change at line 350
* \b NULL for none. This object is not owned by the * \b NULL for none. This object is not owned by the
* download process and will not be deleted when the pkgAcquire * download process and will not be deleted when the pkgAcquire
* object is destroyed. Naturally, it should live for at least as * object is destroyed. Naturally, it should live for at least as
* long as the pkgAcquire object does. * long as the pkgAcquire object does.
* \param Lock defines a lock file that should be acquired to ensure * \param Lock defines a lock file that should be acquired to ensure
* only one Acquire class is in action at the time or an empty string * only one Acquire class is in action at the time or an empty string
* if no lock file should be used. * if no lock file should be used.
*/ */
bool Setup(pkgAcquireStatus *Progress = NULL, string const &Lock = ""); bool Setup(pkgAcquireStatus *Progress = NULL, string const &Lock = "");
void SetLog(pkgAcquireStatus *Progress) { Log = Progress; }
/** \brief Construct a new pkgAcquire. */ /** \brief Construct a new pkgAcquire. */
pkgAcquire(pkgAcquireStatus *Log) __deprecated; pkgAcquire(pkgAcquireStatus *Log) __deprecated;
pkgAcquire(); pkgAcquire();
/** \brief Destroy this pkgAcquire object. /** \brief Destroy this pkgAcquire object.
* *
* Destroys all queue, method, and item objects associated with * Destroys all queue, method, and item objects associated with
* this download. * this download.
*/ */
virtual ~pkgAcquire(); virtual ~pkgAcquire();
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 algorithms.h   algorithms.h 
skipping to change at line 108 skipping to change at line 108
struct PackageKill struct PackageKill
{ {
PkgIterator Pkg; PkgIterator Pkg;
DepIterator Dep; DepIterator Dep;
}; };
void MakeScores(); void MakeScores();
bool DoUpgrade(pkgCache::PkgIterator Pkg); bool DoUpgrade(pkgCache::PkgIterator Pkg);
protected:
bool InstOrNewPolicyBroken(pkgCache::PkgIterator Pkg);
public: public:
inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protec ted; Cache.MarkProtected(Pkg);}; 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
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 aptconfiguration.h   aptconfiguration.h 
skipping to change at line 39 skipping to change at line 39
* This method ensures that the defaults are set and checks at runt ime * This method ensures that the defaults are set and checks at runt ime
* if the type can be used. E.g. the current default is to prefer b zip2 * if the type can be used. E.g. the current default is to prefer b zip2
* over lzma and gz - if the bzip2 binary is not available it has n ot much * over lzma and gz - if the bzip2 binary is not available it has n ot much
* sense in downloading the bz2 file, therefore we will not return bz2 as * sense in downloading the bz2 file, therefore we will not return bz2 as
* a usable compression type. The availability is checked with the settings * a usable compression type. The availability is checked with the settings
* in the Dir::Bin group. * in the Dir::Bin group.
* *
* \param Cached saves the result so we need to calculated it only once * \param Cached saves the result so we need to calculated it only once
* this parameter should ony be used for testing purp oses. * this parameter should ony be used for testing purp oses.
* *
* \return a vector of (all) Language Codes in the prefered usage o rder * \return a vector of the compression types in the prefered usage order
*/ */
std::vector<std::string> static const getCompressionTypes(bool const &Cached = true); std::vector<std::string> static const getCompressionTypes(bool const &Cached = true);
/** \brief Returns a vector of Language Codes /** \brief Returns a vector of Language Codes
* *
* Languages can be defined with their two or five chars long code. * Languages can be defined with their two or five chars long code.
* This methods handles the various ways to set the prefered codes, * This methods handles the various ways to set the prefered codes,
* honors the environment and ensures that the codes are not listed twice. * honors the environment and ensures that the codes are not listed twice.
* *
* The special word "environment" will be replaced with the long an d the short * The special word "environment" will be replaced with the long an d the short
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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.15.2" #define VERSION "0.8.15.3"
/* 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


 configuration.h   configuration.h 
skipping to change at line 85 skipping to change at line 85
std::vector<string> FindVector(const char *Name) const; std::vector<string> FindVector(const char *Name) const;
std::vector<string> FindVector(string const &Name) const { return FindVe ctor(Name.c_str()); }; std::vector<string> FindVector(string const &Name) const { return FindVe ctor(Name.c_str()); };
int FindI(const char *Name,int const &Default = 0) const; int FindI(const char *Name,int const &Default = 0) const;
int FindI(string const &Name,int const &Default = 0) const {return FindI (Name.c_str(),Default);}; int FindI(string const &Name,int const &Default = 0) const {return FindI (Name.c_str(),Default);};
bool FindB(const char *Name,bool const &Default = false) const; bool FindB(const char *Name,bool const &Default = false) const;
bool FindB(string const &Name,bool const &Default = false) const {return FindB(Name.c_str(),Default);}; bool FindB(string const &Name,bool const &Default = false) const {return FindB(Name.c_str(),Default);};
string FindAny(const char *Name,const char *Default = 0) const; string FindAny(const char *Name,const char *Default = 0) const;
inline void Set(const string &Name,const string &Value) {Set(Name.c_str( ),Value);}; inline void Set(const string &Name,const string &Value) {Set(Name.c_str( ),Value);};
void CndSet(const char *Name,const string &Value); void CndSet(const char *Name,const string &Value);
void CndSet(const char *Name,const int Value);
void Set(const char *Name,const string &Value); void Set(const char *Name,const string &Value);
void Set(const char *Name,const int &Value); void Set(const char *Name,const int &Value);
inline bool Exists(const string &Name) const {return Exists(Name.c_str() );}; inline bool Exists(const string &Name) const {return Exists(Name.c_str() );};
bool Exists(const char *Name) const; bool Exists(const char *Name) const;
bool ExistsAny(const char *Name) const; bool ExistsAny(const char *Name) const;
// clear a whole tree // clear a whole tree
void Clear(const string &Name); void Clear(const string &Name);
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 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/