From a0e2348bb19b9cb52ff8711b153a05fd74587374 Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 4 Jan 2015 12:50:29 +0200 Subject: [PATCH 1/4] Version changes in rpm spec file. --HG-- branch : develop --- dist/rpm/valentina.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index 633415889..c092a06fa 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -25,7 +25,7 @@ BuildRequires: ccache BuildRequires: update-desktop-files %endif -Version: 0.2.8 +Version: 0.2.9 Release: 0 URL: https://bitbucket.org/dismine/valentina License: GPL-3.0+ From a68c8e95a814f56c44bb996f9888ebe8bc735c42 Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 4 Jan 2015 13:05:22 +0200 Subject: [PATCH 2/4] Version changes for creation deb package. --HG-- branch : develop --- dist/debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/debian/changelog b/dist/debian/changelog index c5c709e33..e32aca73a 100644 --- a/dist/debian/changelog +++ b/dist/debian/changelog @@ -1,4 +1,4 @@ -valentina (0.2.8-alpha) trusty; urgency=low +valentina (0.2.9) trusty; urgency=low * Auto build. From 0b80c2b9f85182ddfecb5c02196a85e6a55369f1 Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 4 Jan 2015 18:11:00 +0200 Subject: [PATCH 3/4] =?UTF-8?q?We=20alwayse=20need=20information=20about?= =?UTF-8?q?=20=E2=80=9Cthe=20current=20parent=20of=20the=20working=20direc?= =?UTF-8?q?tory=E2=80=9D.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : develop --- src/app/app.pro | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/app.pro b/src/app/app.pro index 2f2885803..981de58c5 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -109,7 +109,7 @@ CONFIG(debug, debug|release){ #Calculate latest tag distance and build revision only in release mode. Change number each time requare #recompilation precompiled headers file. DEFINES += "LATEST_TAG_DISTANCE=0" - DEFINES += "BUILD_REVISION=\\\"uknown\\\"" + DEFINES += "BUILD_REVISION=\\\"unknown\\\"" }else{ # Release mode DEFINES += V_NO_ASSERT @@ -126,7 +126,7 @@ CONFIG(debug, debug|release){ } #latest tag distance number for using in version - HG_DISTANCE=$$system(hg log -r tip --template '{latesttagdistance}') + HG_DISTANCE=$$system(hg log -r. --template '{latesttagdistance}') isEmpty(HG_DISTANCE){ HG_DISTANCE = 0 # if we can't find local revision left 0. } @@ -135,10 +135,10 @@ CONFIG(debug, debug|release){ #build revision number for using in version unix { - HG_HESH=$$system("hg log -r tip --template '{node|short}'") + HG_HESH=$$system("hg log -r. --template '{node|short}'") } else { # Use escape character before "|" on Windows - HG_HESH=$$system(hg log -r tip --template "{node^|short}") + HG_HESH=$$system(hg log -r. --template "{node^|short}") } isEmpty(HG_HESH){ HG_HESH = "unknown" # if we can't find build revision left unknown. From feb1d9945e4b6eabb379825f0f4f1fbbd0b947f8 Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 4 Jan 2015 18:22:06 +0200 Subject: [PATCH 4/4] Version changes for nsis script. --HG-- branch : develop --- dist/nsis/valentina.nsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/nsis/valentina.nsi b/dist/nsis/valentina.nsi index 09b811912..83c88332c 100644 --- a/dist/nsis/valentina.nsi +++ b/dist/nsis/valentina.nsi @@ -14,7 +14,7 @@ SetCompressor /FINAL /SOLID lzma !define MUI_FILE "valentina" !insertmacro GetPEVersionLocal "c:\pack\valentina\valentina.exe" ver -!define MUI_VERSION "${ver_1}.${ver_2}.${ver_3}-alpha" +!define MUI_VERSION "${ver_1}.${ver_2}.${ver_3}" !define MUI_BRANDINGTEXT "Valentina ${MUI_VERSION}" !define WEBSITE_LINK "http://www.valentina-project.org/"