diff --git a/dist/OBS_debian/debian.changelog b/dist/OBS_debian/debian.changelog index e8d1509fa..fb800263e 100644 --- a/dist/OBS_debian/debian.changelog +++ b/dist/OBS_debian/debian.changelog @@ -1,4 +1,4 @@ -valentina (0.5.0) trusty; urgency=low +valentina (0.5.999) trusty; urgency=low * Auto build. diff --git a/dist/SlackBuild/valentina/valentina.SlackBuild b/dist/SlackBuild/valentina/valentina.SlackBuild index f15962a2b..62e006084 100644 --- a/dist/SlackBuild/valentina/valentina.SlackBuild +++ b/dist/SlackBuild/valentina/valentina.SlackBuild @@ -23,10 +23,10 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=valentina -VERSION=${VERSION:-0.4.4} +VERSION=${VERSION:-0.5.0} BUILD=${BUILD:-1} TAG=${TAG:-dismine} -COMMIT=610ac13345d7 +COMMIT=31c95eadca8b # Use parallel building if possible if [ -z "$NUMJOBS" ]; then diff --git a/dist/SlackBuild/valentina/valentina.info b/dist/SlackBuild/valentina/valentina.info index 90e79da88..0c130db06 100644 --- a/dist/SlackBuild/valentina/valentina.info +++ b/dist/SlackBuild/valentina/valentina.info @@ -1,8 +1,8 @@ PRGNAM="valentina" -VERSION="0.4.4" +VERSION="0.5.0" HOMEPAGE="http://www.valentina-project.org/" -DOWNLOAD="https://bitbucket.org/dismine/valentina/get/v0.4.4.tar.gz" -MD5SUM="4d2d030e7251bd5b2ca34d3e629831e3" +DOWNLOAD="https://bitbucket.org/dismine/valentina/get/v0.5.0.tar.gz" +MD5SUM="f23019c92e3209dbfa7699a1c13bb98b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5" diff --git a/dist/debian/changelog b/dist/debian/changelog index e8d1509fa..fb800263e 100644 --- a/dist/debian/changelog +++ b/dist/debian/changelog @@ -1,4 +1,4 @@ -valentina (0.5.0) trusty; urgency=low +valentina (0.5.999) trusty; urgency=low * Auto build. diff --git a/dist/macx/tape/Info.plist b/dist/macx/tape/Info.plist index 172d80bfa..9bb4dff97 100755 --- a/dist/macx/tape/Info.plist +++ b/dist/macx/tape/Info.plist @@ -19,9 +19,9 @@ CFBundleIdentifier org.valentinaproject.@EXECUTABLE@ CFBundleShortVersionString - 0.5.0 + 0.6.0 CFBundleVersion - 0.5.0.0 + 0.6.0.0 CFBundleInfoDictionaryVersion 6.0 CFBundleDocumentTypes diff --git a/dist/macx/valentina/Info.plist b/dist/macx/valentina/Info.plist index 2489748a5..b50b1c780 100755 --- a/dist/macx/valentina/Info.plist +++ b/dist/macx/valentina/Info.plist @@ -19,9 +19,9 @@ CFBundleIdentifier org.valentinaproject.@EXECUTABLE@ CFBundleShortVersionString - 0.5.0 + 0.6.0 CFBundleVersion - 0.5.0.0 + 0.6.0.0 CFBundleInfoDictionaryVersion 6.0 CFBundleDocumentTypes diff --git a/dist/rpm/_service b/dist/rpm/_service index f479678e8..af3aff1aa 100644 --- a/dist/rpm/_service +++ b/dist/rpm/_service @@ -1,7 +1,7 @@ https://github.com/dismine/Valentina.git - 0.5.0 + 0.5.999 valentina git %at diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index f03b61b42..e5fc7ce80 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -45,7 +45,7 @@ BuildRequires: libqt5-qtxmlpatterns-devel Requires: poppler-utils -Version: 0.5.0 +Version: 0.5.999 Release: 0 URL: https://bitbucket.org/dismine/valentina License: GPL-3.0+ diff --git a/dist/win/inno/valentina.iss b/dist/win/inno/valentina.iss index faab9a5a8..8a0af30b7 100644 --- a/dist/win/inno/valentina.iss +++ b/dist/win/inno/valentina.iss @@ -6,11 +6,11 @@ #define MyAppPublisher "Roman Telezhynskyi" #define MyAppURL "http://www.valentina-project.org/" #define MyAppExeName "valentina.exe" -#define MyAppCopyright "(C) 2013-2016 Valentina project" +#define MyAppCopyright "(C) 2013-2017 Valentina project" #define MyDateTimeString GetDateTimeString('yyyymmddhhnnss', '', ''); ; Appstatus: "" = release, "b" = beta, "a" = alpha ; this only modifies the resulting exe name of the installer package ;-) -#define MyAppStatus "b" +#define MyAppStatus "a" [Setup] ; NOTE: The value of AppId uniquely identifies this application. diff --git a/src/libs/vmisc/projectversion.cpp b/src/libs/vmisc/projectversion.cpp index 57f864966..21995e58b 100644 --- a/src/libs/vmisc/projectversion.cpp +++ b/src/libs/vmisc/projectversion.cpp @@ -41,10 +41,10 @@ #include extern const int MAJOR_VERSION = 0; -extern const int MINOR_VERSION = 5; +extern const int MINOR_VERSION = 6; extern const int DEBUG_VERSION = 0; -extern const QString APP_VERSION_STR(QStringLiteral("%1.%2.%3.%4").arg(MAJOR_VERSION).arg(MINOR_VERSION) +extern const QString APP_VERSION_STR(QStringLiteral("%1.%2.%3.%4a").arg(MAJOR_VERSION).arg(MINOR_VERSION) .arg(DEBUG_VERSION).arg(LATEST_TAG_DISTANCE)); //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vmisc/projectversion.h b/src/libs/vmisc/projectversion.h index 8d63889ef..4222b7143 100644 --- a/src/libs/vmisc/projectversion.h +++ b/src/libs/vmisc/projectversion.h @@ -40,13 +40,13 @@ extern const QString APP_VERSION_STR; /* APP_VERSION is (major << 16) + (minor << 8) + patch. */ -#define APP_VERSION 0x000500 +#define APP_VERSION 0x000600 // Change version number in projectversion.cpp too. // Synchronize valentina.nsi -#define VER_FILEVERSION 0,5,0,0 -#define VER_FILEVERSION_STR "0.5.0.0\0" +#define VER_FILEVERSION 0,6,0,0 +#define VER_FILEVERSION_STR "0.6.0.0a\0" #define V_PRERELEASE // Mark prerelease builds