From 6c079839c2bf5fd4a7555d6316666374ee561c06 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Mon, 21 Jul 2025 03:23:45 +0200 Subject: [PATCH] Release: version of upcoming release -- with Git-flow Starting with ''preview release'' `v0.pre.04`, branch and version tags will be handled in accordance to the **Git-flow** naming scheme. Notably this implies that from now on the version in-tree will indicate the ''next expected release,'' adorned by a suffix to mark the preview. To accommodate this transition to Git-flow - the new branch `integration` will be introduced - the version number will once (and the last time for this release) be adjusted ''before'' forking the release branch - branch `master` will transition to reflect the latest released state - several existing branches will be discontinued, notably `gui`, `steam`, `vault`, `release`, `play` --- README | 2 +- admin/scons/Setup.py | 2 +- data/config/setup.ini | 2 +- doc/devel/Doxyfile | 2 +- doc/devel/Doxyfile.browse | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README b/README index 3c1f70c6c..08f1a3e21 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ Lumiera -- the video NLE for Linux ==================================== -Version: 0.pre.03 +Version: 0.pre.04~rc.1 :Date: 11/2015 ************************************************************* diff --git a/admin/scons/Setup.py b/admin/scons/Setup.py index 32c7a5bcf..c2c19cca7 100644 --- a/admin/scons/Setup.py +++ b/admin/scons/Setup.py @@ -22,7 +22,7 @@ import Options #-------------------------------------------------------Configuration TARGDIR = 'target' -VERSION = '0.pre.03' +VERSION = '0.pre.04~rc.1' TOOLDIR = './admin/scons' # SCons plugins OPTCACHE = 'optcache' CUSTOPTFILE = 'custom-options' diff --git a/data/config/setup.ini b/data/config/setup.ini index 01f9dd73d..18a1aec11 100644 --- a/data/config/setup.ini +++ b/data/config/setup.ini @@ -12,7 +12,7 @@ gui = gtk_gui.lum modulepath = $ORIGIN/modules configpath = $ORIGIN/../../share/lumiera/config:$ORIGIN/config:~/.lumiera # currently unused (2/2011) title = Lumiera -version = 0.pre.03 +version = 0.pre.04~rc.1 website = http://www.lumiera.org authors = Joel Holdsworth|Christian Thäter|Hermann Voßeler|Stefan Kangas|Michael Fisher|Michael Ploujnikov|and others... copyright = 2007 - 2025 diff --git a/doc/devel/Doxyfile b/doc/devel/Doxyfile index 443965d1a..6d0e56002 100644 --- a/doc/devel/Doxyfile +++ b/doc/devel/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = Lumiera -PROJECT_NUMBER = 0.pre.03 +PROJECT_NUMBER = 0.pre.04~rc.1 PROJECT_BRIEF = "»edit your freedom«" PROJECT_LOGO = draw/rendered/LumiLogo-small.png OUTPUT_DIRECTORY = diff --git a/doc/devel/Doxyfile.browse b/doc/devel/Doxyfile.browse index 20fe76cc9..af34414b4 100644 --- a/doc/devel/Doxyfile.browse +++ b/doc/devel/Doxyfile.browse @@ -14,7 +14,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = Lumiera -PROJECT_NUMBER = 0.pre.03 +PROJECT_NUMBER = 0.pre.04~rc.1 PROJECT_LOGO = draw/rendered/LumiLogo-small.png OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO