diff --git a/debian/changelog b/debian/changelog index 33025a80..1952de4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -guh (0.1) trusty; urgency=low +guh (0.1.1) trusty; urgency=low * Initial release. diff --git a/guh.pri b/guh.pri index 5b57db4c..b49266cd 100644 --- a/guh.pri +++ b/guh.pri @@ -1,6 +1,4 @@ -guh_version_major = 0 -guh_version_minor = 0 -guh_version_patch = 1 +GUH_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"') coverage { message("Building coverage.") @@ -9,7 +7,4 @@ coverage { QMAKE_LFLAGS += -fprofile-arcs } -DEFINES += GUH_VERSION_MAJOR=$$guh_version_major -DEFINES += GUH_VERSION_MINOR=$$guh_version_minor -DEFINES += GUH_VERSION_PATCH=$$guh_version_patch -DEFINES += GUH_VERSION_STRING=\\\"$${guh_version_major}.$${guh_version_minor}.$${guh_version_patch}\\\" +DEFINES += GUH_VERSION_STRING=\\\"$${GUH_VERSION_STRING}\\\" diff --git a/tests/auto/api.json b/tests/auto/api.json index 559d2e55..6fc40ba5 100644 --- a/tests/auto/api.json +++ b/tests/auto/api.json @@ -1,4 +1,4 @@ -0.0.1 +0.1.1 { "methods": { "Actions.ExecuteAction": { diff --git a/tests/auto/versioning/testversioning.cpp b/tests/auto/versioning/testversioning.cpp index 3b7130d1..2a7a2991 100644 --- a/tests/auto/versioning/testversioning.cpp +++ b/tests/auto/versioning/testversioning.cpp @@ -94,7 +94,11 @@ void TestVersioning::apiChangeBumpsVersion() p.waitForFinished(); qDebug() << p.readAll(); - QVERIFY2(false, QString("JSONRPC API has changed. Update %1.").arg(oldFilePath).toLatin1().data()); + if (oldVersion != newVersion && oldApi == newApi) { + QVERIFY2(false, QString("Version has changed. Update %1.").arg(oldFilePath).toLatin1().data()); + } else { + QVERIFY2(false, QString("JSONRPC API has changed. Update %1.").arg(oldFilePath).toLatin1().data()); + } } #include "testversioning.moc"