* merge the remaining Ubuntu change:

[apt.git] / apt-pkg / versionmatch.h

diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h
index a8f3c84ac9a8ab92fcb3fdb289510a3ea208c035..a8da072ae078e039ce8dafd9004ec8183eca9fb7 100644 (file)
--- a/apt-pkg/versionmatch.h
+++ b/apt-pkg/versionmatch.h
@@ -23,6 +23,7 @@
       Codename (n=) e.g. etch, lenny, squeeze, sid
       Label (l=)
       Component (c=)
       Codename (n=) e.g. etch, lenny, squeeze, sid
       Label (l=)
       Component (c=)

+      Binary Architecture (b=)

    If there are no equals signs in the string then it is scanned in short
    form - if it starts with a number it is Version otherwise it is an
    Archive or a Codename.
    If there are no equals signs in the string then it is scanned in short
    form - if it starts with a number it is Version otherwise it is an
    Archive or a Codename.


@@ -55,6 +56,7 @@ class pkgVersionMatch
    string RelArchive;
    string RelLabel;
    string RelComponent;
    string RelArchive;
    string RelLabel;
    string RelComponent;

+   string RelArchitecture;

    bool MatchAll;
    
    // Origin Matching
    bool MatchAll;
    
    // Origin Matching