add gnupg and gnupg2 as test-dependency

[apt.git] / apt-pkg / deb / debversion.cc

diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc
index 14056126280f6dca8391d700ace13ed31c013cc7..a5eacb7f50f2a9f0ae1876906b598d743f1d33c3 100644 (file)
--- a/apt-pkg/deb/debversion.cc
+++ b/apt-pkg/deb/debversion.cc
@@ -15,6 +15,8 @@
 #include <apt-pkg/debversion.h>
 #include <apt-pkg/pkgcache.h>
 
 #include <apt-pkg/debversion.h>
 #include <apt-pkg/pkgcache.h>
 

+#include <string.h>
+#include <string>

 #include <stdlib.h>
 #include <ctype.h>
                                                                        /*}}}*/
 #include <stdlib.h>
 #include <ctype.h>
                                                                        /*}}}*/


@@ -116,7 +118,7 @@ int debVersioningSystem::CmpFragment(const char *A,const char *AEnd,
       return 1;
    }
 
       return 1;
    }
 

-   // Shouldnt happen
+   // Shouldn't happen

    return 1;
 }
                                                                        /*}}}*/
    return 1;
 }
                                                                        /*}}}*/


@@ -221,7 +223,7 @@ bool debVersioningSystem::CheckDep(const char *PkgVer,
    if (PkgVer == DepVer)
       return Op == pkgCache::Dep::Equals || Op == pkgCache::Dep::LessEq || Op == pkgCache::Dep::GreaterEq;
 
    if (PkgVer == DepVer)
       return Op == pkgCache::Dep::Equals || Op == pkgCache::Dep::LessEq || Op == pkgCache::Dep::GreaterEq;
 

-   // Perform the actual comparision.
+   // Perform the actual comparison.

    int const Res = CmpVersion(PkgVer, DepVer);
    switch (Op)
    {
    int const Res = CmpVersion(PkgVer, DepVer);
    switch (Op)
    {