diff options
| author | Michael Vogt <mvo@debian.org> | 2014-07-08 13:37:11 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-07-08 13:37:11 +0200 |
| commit | 2830b8436ac8a6f2f3dac4ce2cd030c24eebce04 (patch) | |
| tree | dcdaba1119e595edc8842c2e8746acdf25af6260 /test/libapt/parsedepends_test.cc | |
| parent | bcc352afa890788825dfbd1454847456748f511f (diff) | |
| parent | 521dd27dc33c8b2a6947a76872841f4254df4e58 (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/deb/deblistparser.cc
doc/po/apt-doc.pot
doc/po/de.po
doc/po/es.po
doc/po/fr.po
doc/po/it.po
doc/po/ja.po
doc/po/pl.po
doc/po/pt.po
doc/po/pt_BR.po
po/da.po
po/mr.po
po/vi.po
Diffstat (limited to 'test/libapt/parsedepends_test.cc')
| -rw-r--r-- | test/libapt/parsedepends_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc index 1e0afb66c..52eac8232 100644 --- a/test/libapt/parsedepends_test.cc +++ b/test/libapt/parsedepends_test.cc @@ -23,7 +23,7 @@ static void parseDependency(bool const StripMultiArch, bool const ParseArchFlag "libdb-dev:any, " "gettext:native (<= 0.12), " "libcurl4-gnutls-dev:native | libcurl3-gnutls-dev (>> 7.15.5), " - "debiandoc-sgml, " + "docbook-xml, " "apt (>= 0.7.25), " "not-for-me [ !amd64 ], " "only-for-me [ amd64 ], " @@ -82,7 +82,7 @@ static void parseDependency(bool const StripMultiArch, bool const ParseArchFlag EXPECT_EQ(Null | pkgCache::Dep::Greater, Op); Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch, ParseRestrictionsList); - EXPECT_EQ("debiandoc-sgml", Package); + EXPECT_EQ("docbook-xml", Package); EXPECT_EQ("", Version); EXPECT_EQ(Null | pkgCache::Dep::NoOp, Op); |