From 188d7097e1c3079a45c9ebd2c8d9e87f4912e649 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 24 Oct 2020 12:23:35 +0300 Subject: [PATCH] New versioning schema. Closes #5 --- ChangeLog.txt | 3 ++- appveyor.yml | 2 +- dist/OBS_debian/debian.changelog | 4 ++-- dist/OBS_debian/debian.tape.1 | 20 +++++++++----------- dist/OBS_debian/debian.valentina.1 | 10 ++++++---- dist/debian/changelog | 4 ++-- dist/macx/tape/Info.plist | 8 ++++---- dist/macx/valentina/Info.plist | 8 ++++---- dist/rpm/_service | 2 +- dist/rpm/valentina.spec | 4 ++-- dist/valentina.dsc | 19 +++++++++++++------ dist/win/inno/valentina.iss | 6 ++---- share/bintray.json | 10 +++++----- src/libs/vmisc/projectversion.cpp | 4 ++-- src/libs/vmisc/projectversion.h | 12 ++++++++---- 15 files changed, 63 insertions(+), 53 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index a9f2106da..e8ad6a007 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,4 @@ -# Version 0.7.0 (unreleased) +# Version 0.7.36 October 24, 2020 - [#892] Show tooltip for piece node point. - [#894] Quick way to disable a passmark. - [#895] Improve path validation. Do not allow repeat the same curve twice. @@ -53,6 +53,7 @@ - New warning. Error calculating segment of curve. - Improve searching lost measurements. Additional case with underscores instead of regular spaces. - Redesign multisize measurements. +- [smart-pattern/valentina#5] New versioning schema. # Version 0.6.2 (unreleased) - [#903] Bug in tool Cut Spline path. diff --git a/appveyor.yml b/appveyor.yml index 20326bf0b..2488ff2b3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -258,7 +258,7 @@ deploy: package: valentina-win_auto-upload publish: true override: true - version: 0.7.0.0a + version: 0.7.36 on: DEPLOY: true artifact: valentina-win-$(QT_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT) diff --git a/dist/OBS_debian/debian.changelog b/dist/OBS_debian/debian.changelog index fc240c30c..384fbf8ed 100644 --- a/dist/OBS_debian/debian.changelog +++ b/dist/OBS_debian/debian.changelog @@ -1,5 +1,5 @@ -valentina (0.7.0) trusty; urgency=low +valentina (0.7.36) trusty; urgency=low * Auto build. - -- dismine Mon, 12 Oct 2018 12:27:00 +0300 + -- dismine Sat, 24 Oct 2020 12:27:00 +0300 diff --git a/dist/OBS_debian/debian.tape.1 b/dist/OBS_debian/debian.tape.1 index 83d3dfc27..97e240551 100644 --- a/dist/OBS_debian/debian.tape.1 +++ b/dist/OBS_debian/debian.tape.1 @@ -1,6 +1,6 @@ .\" Manpage for tape. .\" Contact dismine@gmail.com to correct errors. -.TH tape 1 "10 March, 2017" "tape man page" +.TH tape 1 "3 October, 2020" "tape man page" .SH NAME Tape \- Valentina's measurements editor. .SH SYNOPSIS @@ -20,12 +20,14 @@ is a part of Valentina. And used for creating and editing measurement files. Displays this help. .IP "-v, --version" Displays version information. -.IP "-e, --height " -Open with the base height. Valid values: 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158, 164, 170, 176, 182, 188, 194, 200cm. -.IP "-s, --size " -Open with the base size. Valid values: 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56cm. -.IP "-u, --unit " -Set pattern file unit: cm, mm, inch. +.IP "-a, --dimensionA " +Set base for dimension A in the table units. +.IP "-b, --dimensionB " +Set base for dimension B in the table units. +.IP "-c, --dimensionA " +Set base for dimension C in the table units. +.IP "-u, --units " +Set pattern file units: cm, mm, inch. .IP "--test" Use for unit testing. Run the program and open a file without showing the main window. .IP "--no-scaling" @@ -35,9 +37,5 @@ Disable high dpi scaling. Call this option if has problem with scaling (by defau \- the measurement file. .SH AUTHOR .RI "This manual page was written by Roman Telezhynskyi <" dismine@gmail.com ">" -.SH "SEE ALSO" -.RB "Full " "User Manual" " is availiable in" -.UR https://bitbucket.org/dismine/valentina/wiki/manual/Content -.UE .BR valentina (1) diff --git a/dist/OBS_debian/debian.valentina.1 b/dist/OBS_debian/debian.valentina.1 index 48c841dd1..44803fad8 100644 --- a/dist/OBS_debian/debian.valentina.1 +++ b/dist/OBS_debian/debian.valentina.1 @@ -139,10 +139,12 @@ The path to output destination folder. By default the directory at which the app .RB "Export only details. Export details as they positioned in the details mode. Any layout related options will be ignored." .IP "--exportSuchDetails " .RB "Export only details that match a piece name regex." -.IP "-x, --gsize " -.RB "Set size value a pattern file, that was opened with multisize measurements " "(export mode)" ". Valid values: 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56cm." -.IP "-e, --gheight " -.RB "Set height value a pattern file, that was opened with multisize measurements (" "export mode" "). Valid values: 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158, 164, 170, 176, 182, 188, 194, 200cm." +.IP "--dimensionA " +.RB "Set base for dimension A in the multisize measurements units " "(export mode)" "." +.IP "--dimensionB " +.RB "Set base for dimension B in the multisize measurements units " "(export mode)" "." +.IP "--dimensionC " +.RB "Set base for dimension C in the multisize measurements units " "(export mode)" "." .IP "--userMaterial " .RB "Use this option to override user material defined in pattern. The value must be in form @. The number should be in range from 1 to 20. For example, 1@Fabric2. The key can be used multiple times. Has no effect in GUI mode." .IP "-p, --pageformat