diff options
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/deb/debsrcrecords.cc | 7 | ||||
| -rw-r--r-- | apt-pkg/deb/debsrcrecords.h | 4 | ||||
| -rw-r--r-- | apt-pkg/init.h | 4 | ||||
| -rw-r--r-- | apt-pkg/makefile | 2 | ||||
| -rw-r--r-- | apt-pkg/srcrecords.h | 4 |
5 files changed, 12 insertions, 9 deletions
diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index d452095cd..639079be3 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: debsrcrecords.cc,v 1.4 2001/02/20 07:03:17 jgg Exp $ +// $Id: debsrcrecords.cc,v 1.5 2001/11/04 17:09:18 tausq Exp $ /* ###################################################################### Debian Source Package Records - Parser implementation for Debian style @@ -47,7 +47,7 @@ const char **debSrcRecordParser::Binaries() package/version records representing the build dependency. The returned array need not be freed and will be reused by the next call to this function */ -bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps) +bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps, bool ArchOnly) { unsigned int I; const char *Start, *Stop; @@ -61,6 +61,9 @@ bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> for (I = 0; I < 4; I++) { + if (ArchOnly && (I == 1 || I == 3)) + continue; + if (Sect.Find(fields[I], Start, Stop) == false) continue; diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index 477fe4fe3..a49734795 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: debsrcrecords.h,v 1.6 2001/02/20 07:03:17 jgg Exp $ +// $Id: debsrcrecords.h,v 1.7 2001/11/04 17:09:18 tausq Exp $ /* ###################################################################### Debian Source Package Records - Parser implementation for Debian style @@ -39,7 +39,7 @@ class debSrcRecordParser : public pkgSrcRecords::Parser virtual string Maintainer() const {return Sect.FindS("Maintainer");}; virtual string Section() const {return Sect.FindS("Section");}; virtual const char **Binaries(); - virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps); + virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool ArchOnly); virtual unsigned long Offset() {return iOffset;}; virtual string AsStr() { diff --git a/apt-pkg/init.h b/apt-pkg/init.h index b07bc99ec..ed8a607b9 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: init.h,v 1.8 2001/04/22 05:42:52 jgg Exp $ +// $Id: init.h,v 1.9 2001/11/04 17:09:18 tausq Exp $ /* ###################################################################### Init - Initialize the package library @@ -18,7 +18,7 @@ // See the makefile #define APT_PKG_MAJOR 3 -#define APT_PKG_MINOR 2 +#define APT_PKG_MINOR 3 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index e1b4d6153..f8cb1ddca 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -12,7 +12,7 @@ include ../buildlib/defaults.mak # The library name, don't forget to update init.h LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) -MAJOR=3.2 +MAJOR=3.3 MINOR=0 SLIBS=$(PTHREADLIB) diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h index f63d0934d..4eebf48f1 100644 --- a/apt-pkg/srcrecords.h +++ b/apt-pkg/srcrecords.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: srcrecords.h,v 1.7 2001/05/07 04:24:08 jgg Exp $ +// $Id: srcrecords.h,v 1.8 2001/11/04 17:09:18 tausq Exp $ /* ###################################################################### Source Package Records - Allows access to source package records @@ -72,7 +72,7 @@ class pkgSrcRecords virtual string Section() const = 0; virtual const char **Binaries() = 0; // Ownership does not transfer - virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps) = 0; + virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool ArchOnly) = 0; static const char *BuildDepType(unsigned char Type); virtual bool Files(vector<pkgSrcRecords::File> &F) = 0; |