summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-10-03 00:18:53 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2014-10-03 00:18:53 +0200
commit30b45652d6b8c710e7a5e7e95cfa431a5df4462c (patch)
tree4b0256e549cec64aefa15030f3b812f3209201cb /apt-pkg/deb
parent8b32e72c6f7143de4ec02f44e362b0df9e21e024 (diff)
rename StringType VERSION to VERSIONNUMBER
aptitude has a define for VERSION, so to not generate a FTBFS we just rename our enum element to a slightly less generic name. Git-Dch: Ignore
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/deblistparser.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 103b126de..63414c944 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -162,7 +162,7 @@ bool debListParser::NewVersion(pkgCache::VerIterator &Ver)
std::string const version(Open + 1, (Close - Open) - 1);
if (version != Ver.VerStr())
{
- map_stringitem_t const idx = StoreString(pkgCacheGenerator::VERSION, version);
+ map_stringitem_t const idx = StoreString(pkgCacheGenerator::VERSIONNUMBER, version);
Ver->SourceVerStr = idx;
}
}
@@ -953,7 +953,7 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
}
APT_INRELEASE(MIXED, "Suite", FileI->Archive)
APT_INRELEASE(MIXED, "Component", FileI->Component)
- APT_INRELEASE(VERSION, "Version", FileI->Version)
+ APT_INRELEASE(VERSIONNUMBER, "Version", FileI->Version)
APT_INRELEASE(MIXED, "Origin", FileI->Origin)
APT_INRELEASE(MIXED, "Codename", FileI->Codename)
APT_INRELEASE(MIXED, "Label", FileI->Label)