Begin new branch v0.6.0.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-05-12 08:47:05 +03:00
parent 426b73dcce
commit 34f3737c9e
11 changed files with 20 additions and 20 deletions

View File

@ -1,4 +1,4 @@
valentina (0.5.0) trusty; urgency=low valentina (0.5.999) trusty; urgency=low
* Auto build. * Auto build.

View File

@ -23,10 +23,10 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=valentina PRGNAM=valentina
VERSION=${VERSION:-0.4.4} VERSION=${VERSION:-0.5.0}
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=${TAG:-dismine} TAG=${TAG:-dismine}
COMMIT=610ac13345d7 COMMIT=31c95eadca8b
# Use parallel building if possible # Use parallel building if possible
if [ -z "$NUMJOBS" ]; then if [ -z "$NUMJOBS" ]; then

View File

@ -1,8 +1,8 @@
PRGNAM="valentina" PRGNAM="valentina"
VERSION="0.4.4" VERSION="0.5.0"
HOMEPAGE="http://www.valentina-project.org/" HOMEPAGE="http://www.valentina-project.org/"
DOWNLOAD="https://bitbucket.org/dismine/valentina/get/v0.4.4.tar.gz" DOWNLOAD="https://bitbucket.org/dismine/valentina/get/v0.5.0.tar.gz"
MD5SUM="4d2d030e7251bd5b2ca34d3e629831e3" MD5SUM="f23019c92e3209dbfa7699a1c13bb98b"
DOWNLOAD_x86_64="" DOWNLOAD_x86_64=""
MD5SUM_x86_64="" MD5SUM_x86_64=""
REQUIRES="qt5" REQUIRES="qt5"

View File

@ -1,4 +1,4 @@
valentina (0.5.0) trusty; urgency=low valentina (0.5.999) trusty; urgency=low
* Auto build. * Auto build.

View File

@ -19,9 +19,9 @@
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.valentinaproject.@EXECUTABLE@</string> <string>org.valentinaproject.@EXECUTABLE@</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.5.0</string> <string>0.6.0</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>0.5.0.0</string> <string>0.6.0.0</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleDocumentTypes</key> <key>CFBundleDocumentTypes</key>

View File

@ -19,9 +19,9 @@
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.valentinaproject.@EXECUTABLE@</string> <string>org.valentinaproject.@EXECUTABLE@</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.5.0</string> <string>0.6.0</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>0.5.0.0</string> <string>0.6.0.0</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleDocumentTypes</key> <key>CFBundleDocumentTypes</key>

2
dist/rpm/_service vendored
View File

@ -1,7 +1,7 @@
<services> <services>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">https://github.com/dismine/Valentina.git</param> <param name="url">https://github.com/dismine/Valentina.git</param>
<param name="versionprefix">0.5.0</param> <param name="versionprefix">0.5.999</param>
<param name="filename">valentina</param> <param name="filename">valentina</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="versionformat">%at</param> <param name="versionformat">%at</param>

View File

@ -45,7 +45,7 @@ BuildRequires: libqt5-qtxmlpatterns-devel
Requires: poppler-utils Requires: poppler-utils
Version: 0.5.0 Version: 0.5.999
Release: 0 Release: 0
URL: https://bitbucket.org/dismine/valentina URL: https://bitbucket.org/dismine/valentina
License: GPL-3.0+ License: GPL-3.0+

View File

@ -6,11 +6,11 @@
#define MyAppPublisher "Roman Telezhynskyi" #define MyAppPublisher "Roman Telezhynskyi"
#define MyAppURL "http://www.valentina-project.org/" #define MyAppURL "http://www.valentina-project.org/"
#define MyAppExeName "valentina.exe" #define MyAppExeName "valentina.exe"
#define MyAppCopyright "(C) 2013-2016 Valentina project" #define MyAppCopyright "(C) 2013-2017 Valentina project"
#define MyDateTimeString GetDateTimeString('yyyymmddhhnnss', '', ''); #define MyDateTimeString GetDateTimeString('yyyymmddhhnnss', '', '');
; Appstatus: "" = release, "b" = beta, "a" = alpha ; Appstatus: "" = release, "b" = beta, "a" = alpha
; this only modifies the resulting exe name of the installer package ;-) ; this only modifies the resulting exe name of the installer package ;-)
#define MyAppStatus "b" #define MyAppStatus "a"
[Setup] [Setup]
; NOTE: The value of AppId uniquely identifies this application. ; NOTE: The value of AppId uniquely identifies this application.

View File

@ -41,10 +41,10 @@
#include <QtGlobal> #include <QtGlobal>
extern const int MAJOR_VERSION = 0; 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 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)); .arg(DEBUG_VERSION).arg(LATEST_TAG_DISTANCE));
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

View File

@ -40,13 +40,13 @@ extern const QString APP_VERSION_STR;
/* /*
APP_VERSION is (major << 16) + (minor << 8) + patch. APP_VERSION is (major << 16) + (minor << 8) + patch.
*/ */
#define APP_VERSION 0x000500 #define APP_VERSION 0x000600
// Change version number in projectversion.cpp too. // Change version number in projectversion.cpp too.
// Synchronize valentina.nsi // Synchronize valentina.nsi
#define VER_FILEVERSION 0,5,0,0 #define VER_FILEVERSION 0,6,0,0
#define VER_FILEVERSION_STR "0.5.0.0\0" #define VER_FILEVERSION_STR "0.6.0.0a\0"
#define V_PRERELEASE // Mark prerelease builds #define V_PRERELEASE // Mark prerelease builds