aptconfiguration.h   aptconfiguration.h 
skipping to change at line 85 skipping to change at line 85
*/ */
std::vector<std::string> static const getArchitectures(bool const &C ached = true); std::vector<std::string> static const getArchitectures(bool const &C ached = true);
/** \brief Are we interested in the given Architecture? /** \brief Are we interested in the given Architecture?
* *
* \param Arch we want to check * \param Arch we want to check
* \return true if we are interested, false otherwise * \return true if we are interested, false otherwise
*/ */
bool static const checkArchitecture(std::string const &Arch); bool static const checkArchitecture(std::string const &Arch);
/** \brief Representation of supported compressors */
struct Compressor {
std::string Name;
std::string Extension;
std::string Binary;
std::vector<std::string> CompressArgs;
std::vector<std::string> UncompressArgs;
unsigned short Cost;
Compressor(char const *name, char const *extension, char con
st *binary,
char const *compressArg, char const *uncompressAr
g,
unsigned short const cost);
Compressor() {};
};
/** \brief Return a vector of Compressors supported for data.tar's
*
* \param Cached saves the result so we need to calculated it only
once
* this parameter should ony be used for testing purp
oses.
*
* \return a vector of Compressors
*/
std::vector<Compressor> static const getCompressors(bool const Cache
d = true);
/** \brief Return a vector of extensions supported for data.tar's */
std::vector<std::string> static const getCompressorExtensions();
/*}}
}*/
private: /*{{
{*/
void static setDefaultConfigurationForCompressors();
/*}} }*/ /*}} }*/
}; };
/*}} }*/ /*}} }*/
} }
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 36 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)
return "all";
return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch; return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;
}; };
inline const char *Arch(bool const pseudo) const { __deprecated inline const char *Arch(bool const pseudo) const {
if(pseudo == false)
return Arch();
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;
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);};
string RelStr() const; string RelStr() const;
bool Automatic() const; bool Automatic() const;
bool Pseudo() const; __deprecated bool Pseudo() 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>() {};
}; };
/*}} }*/ /*}} }*/
// Description Iterator /*{{{*/ // Description Iterator /*{{{*/
 End of changes. 3 change blocks. 
6 lines changed or deleted 2 lines changed or added


 cacheset.h   cacheset.h 
skipping to change at line 260 skipping to change at line 260
inline bool end() const { return false; }; inline bool end() const { return false; };
inline pkgCache::Version const * operator->() const { inline pkgCache::Version const * operator->() const {
return &***this; return &***this;
}; };
inline int CompareVer(const pkgCache::VerIterator &B) const { return (**this).CompareVer(B); }; inline int CompareVer(const pkgCache::VerIterator &B) const { return (**this).CompareVer(B); };
inline const char *VerStr() const { return (**this).VerStr() ; }; inline const char *VerStr() const { return (**this).VerStr() ; };
inline const char *Section() const { return (**this).Section (); }; inline const char *Section() const { return (**this).Section (); };
inline const char *Arch() const { return (**this).Arch(); }; inline const char *Arch() const { return (**this).Arch(); };
inline const char *Arch(bool const pseudo) const { return (* *this).Arch(pseudo); }; __deprecated inline const char *Arch(bool const pseudo) cons t { return (**this).Arch(); };
inline pkgCache::PkgIterator ParentPkg() const { return (**t his).ParentPkg(); }; inline pkgCache::PkgIterator ParentPkg() const { return (**t his).ParentPkg(); };
inline pkgCache::DescIterator DescriptionList() const { retu rn (**this).DescriptionList(); }; inline pkgCache::DescIterator DescriptionList() const { retu rn (**this).DescriptionList(); };
inline pkgCache::DescIterator TranslatedDescription() const { return (**this).TranslatedDescription(); }; inline pkgCache::DescIterator TranslatedDescription() const { return (**this).TranslatedDescription(); };
inline pkgCache::DepIterator DependsList() const { return (* *this).DependsList(); }; inline pkgCache::DepIterator DependsList() const { return (* *this).DependsList(); };
inline pkgCache::PrvIterator ProvidesList() const { return ( **this).ProvidesList(); }; inline pkgCache::PrvIterator ProvidesList() const { return ( **this).ProvidesList(); };
inline pkgCache::VerFileIterator FileList() const { return ( **this).FileList(); }; inline pkgCache::VerFileIterator FileList() const { return ( **this).FileList(); };
inline bool Downloadable() const { return (**this).Downloada ble(); }; inline bool Downloadable() const { return (**this).Downloada ble(); };
inline const char *PriorityType() const { return (**this).Pr iorityType(); }; inline const char *PriorityType() const { return (**this).Pr iorityType(); };
inline string RelStr() const { return (**this).RelStr(); }; inline string RelStr() const { return (**this).RelStr(); };
inline bool Automatic() const { return (**this).Automatic(); }; inline bool Automatic() const { return (**this).Automatic(); };
inline bool Pseudo() const { return (**this).Pseudo(); }; __deprecated inline bool Pseudo() const { return false; };
inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); }; inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); };
}; };
/*}} }*/ /*}} }*/
// 103. set::iterator is required to be modifiable, but this allows modification of keys // 103. set::iterator is required to be modifiable, but this allows modification of keys
typedef APT::VersionSet::const_iterator iterator; typedef APT::VersionSet::const_iterator iterator;
using std::set<pkgCache::VerIterator>::insert; using std::set<pkgCache::VerIterator>::insert;
inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set<pkgCache::VerIterator>::insert(V); }; inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set<pkgCache::VerIterator>::insert(V); };
inline void insert(VersionSet const &verset) { insert(verset.begin() , verset.end()); }; inline void insert(VersionSet const &verset) { insert(verset.begin() , verset.end()); };
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 cdrom.h   cdrom.h 
skipping to change at line 68 skipping to change at line 68
bool WriteDatabase(Configuration &Cnf); bool WriteDatabase(Configuration &Cnf);
bool WriteSourceList(string Name,vector<string> &List,bool Source); bool WriteSourceList(string Name,vector<string> &List,bool Source);
int Score(string Path); int Score(string Path);
public: public:
bool Ident(string &ident, pkgCdromStatus *log); bool Ident(string &ident, pkgCdromStatus *log);
bool Add(pkgCdromStatus *log); bool Add(pkgCdromStatus *log);
}; };
/*}} }*/ /*}} }*/
// class that uses libudev to find cdrom devices dynamically // class that uses libudev to find cdrom/removable devices dynamically
struct CdromDevice /*{{ {*/ struct CdromDevice /*{{ {*/
{ {
string DeviceName; string DeviceName;
bool Mounted; bool Mounted;
string MountPath; string MountPath;
}; };
/*}} }*/ /*}} }*/
class pkgUdevCdromDevices /*{{ {*/ class pkgUdevCdromDevices /*{{ {*/
{ {
protected: protected:
skipping to change at line 92 skipping to change at line 92
int (*udev_enumerate_add_match_property)(struct udev_enumerate *udev_enu merate, const char *property, const char *value); int (*udev_enumerate_add_match_property)(struct udev_enumerate *udev_enu merate, const char *property, const char *value);
int (*udev_enumerate_scan_devices)(struct udev_enumerate *udev_enumerate ); int (*udev_enumerate_scan_devices)(struct udev_enumerate *udev_enumerate );
struct udev_list_entry* (*udev_enumerate_get_list_entry)(struct udev_enu merate *udev_enumerate); struct udev_list_entry* (*udev_enumerate_get_list_entry)(struct udev_enu merate *udev_enumerate);
struct udev_device* (*udev_device_new_from_syspath)(struct udev *udev, c onst char *syspath); struct udev_device* (*udev_device_new_from_syspath)(struct udev *udev, c onst char *syspath);
struct udev* (*udev_enumerate_get_udev)(struct udev_enumerate *udev_enum erate); struct udev* (*udev_enumerate_get_udev)(struct udev_enumerate *udev_enum erate);
const char* (*udev_list_entry_get_name)(struct udev_list_entry *list_ent ry); const char* (*udev_list_entry_get_name)(struct udev_list_entry *list_ent ry);
const char* (*udev_device_get_devnode)(struct udev_device *udev_device); const char* (*udev_device_get_devnode)(struct udev_device *udev_device);
struct udev_enumerate *(*udev_enumerate_new) (struct udev *udev); struct udev_enumerate *(*udev_enumerate_new) (struct udev *udev);
struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_ent ry *list_entry); struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_ent ry *list_entry);
const char* (*udev_device_get_property_value)(struct udev_device *udev_d evice, const char *key); const char* (*udev_device_get_property_value)(struct udev_device *udev_d evice, const char *key);
#if 0 // FIXME: uncomment on next ABI break
int (*udev_enumerate_add_match_sysattr)(struct udev_enumerate *udev_enum
erate, const char *property, const char *value);
#endif
// end libudev dlopen // end libudev dlopen
public: public:
pkgUdevCdromDevices(); pkgUdevCdromDevices();
virtual ~pkgUdevCdromDevices(); virtual ~pkgUdevCdromDevices();
// try to open // try to open
bool Dlopen(); bool Dlopen();
// this is the new interface
vector<CdromDevice> ScanForRemovable(bool CdromOnly);
// FIXME: compat with the old interface/API/ABI only
vector<CdromDevice> Scan(); vector<CdromDevice> Scan();
}; };
/*}} }*/ /*}} }*/
#endif #endif
 End of changes. 4 change blocks. 
1 lines changed or deleted 10 lines changed or added


 cdromutl.h   cdromutl.h 
skipping to change at line 22 skipping to change at line 22
#include <string> #include <string>
using std::string; using std::string;
// mount cdrom, DeviceName (e.g. /dev/sr0) is optional // mount cdrom, DeviceName (e.g. /dev/sr0) is optional
bool MountCdrom(string Path, string DeviceName=""); bool MountCdrom(string Path, string DeviceName="");
bool UnmountCdrom(string Path); bool UnmountCdrom(string Path);
bool IdentCdrom(string CD,string &Res,unsigned int Version = 2); bool IdentCdrom(string CD,string &Res,unsigned int Version = 2);
bool IsMounted(string &Path); bool IsMounted(string &Path);
string FindMountPointForDevice(const char *device);
#endif #endif
 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 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.11.5" #define VERSION "0.8.12"
/* 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 75 skipping to change at line 75
return ((Configuration *)this)->Lookup(Name,false); return ((Configuration *)this)->Lookup(Name,false);
} }
public: public:
string Find(const char *Name,const char *Default = 0) const; string Find(const char *Name,const char *Default = 0) const;
string Find(string const &Name,const char *Default = 0) const {return Fi nd(Name.c_str(),Default);}; string Find(string const &Name,const char *Default = 0) const {return Fi nd(Name.c_str(),Default);};
string Find(string const &Name, string const &Default) const {return Fin d(Name.c_str(),Default.c_str());}; string Find(string const &Name, string const &Default) const {return Fin d(Name.c_str(),Default.c_str());};
string FindFile(const char *Name,const char *Default = 0) const; string FindFile(const char *Name,const char *Default = 0) const;
string FindDir(const char *Name,const char *Default = 0) const; string FindDir(const char *Name,const char *Default = 0) const;
std::vector<string> FindVector(string const &Name) const;
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()); };
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 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);
 End of changes. 2 change blocks. 
1 lines changed or deleted 1 lines changed or added


 depcache.h   depcache.h 
skipping to change at line 398 skipping to change at line 398
// @{ // @{
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 SetReInstall(PkgIterator const &Pkg,bool To); void SetReInstall(PkgIterator const &Pkg,bool To);
// 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
* to set the candidate of the dependency to a version from the given * to set the candidate of the dependency to a version from the given
* release, too. * release, too.
* *
skipping to change at line 484 skipping to change at line 485
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();
private: private:
// Helper for Update(OpProgress) to remove pseudoinstalled arch all pack ages // Helper for Update(OpProgress) to remove pseudoinstalled arch all pack ages
bool RemovePseudoInstalledPkg(PkgIterator &Pkg, std::set<unsigned long> // FIXME: they are private so shouldn't affect abi, but just in case…
&recheck); __deprecated bool RemovePseudoInstalledPkg(PkgIterator &Pkg, std::set<un
bool ReInstallPseudoForGroup(unsigned long const &Grp, std::set<unsigned signed long> &recheck) { return true; };
long> &recheck); __deprecated bool ReInstallPseudoForGroup(unsigned long const &Grp, std:
bool ReInstallPseudoForGroup(pkgCache::PkgIterator const &P, std::set<un :set<unsigned long> &recheck) { return true; };
signed long> &recheck); __deprecated bool ReInstallPseudoForGroup(pkgCache::PkgIterator const &P
, std::set<unsigned long> &recheck) { return true; };
}; };
#endif #endif
 End of changes. 2 change blocks. 
6 lines changed or deleted 8 lines changed or added


 pkgcache.h   pkgcache.h 
skipping to change at line 507 skipping to change at line 507
/** \brief complete version string */ /** \brief complete version string */
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 and All is the marker for a be co-installed on the system */
version with the Architecture: all. */ // FIXME: remove All on abi break
enum {None, All, Foreign, Same, Allowed} MultiArch; enum {None, All, Foreign, Same, Allowed} MultiArch;
/** \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 */
 End of changes. 1 change blocks. 
2 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/