Release 0.97.1

Desktop / GNOME / PiTiVi - Thibault Saunier [gnome.org] - 8 August 2016 10:44 UTC

Making sure the version appears correctly in the about dialog

###

diff --git a/configure b/configure
index 01beb3f..ef446b8 100755
--- a/configure
+++ b/configure
@@ -89,4 +89,5 @@ def configure_meson():

if __name__ == "__main__":
configure_meson()
- install_pre_commit_hook()
+ if os.path.exists(os.path.join(ROOTDIR, ".git")):
+ install_pre_commit_hook()
diff --git a/meson.build b/meson.build
index d6cfb0d..881eea7 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('pitivi', 'c', version: '0.97')
+project('pitivi', 'c', version: '0.97.1')

python = find_program('python3')
intltool_merge = find_program('intltool-merge')
diff --git a/pitivi/mainwindow.py b/pitivi/mainwindow.py
index 2f3d0f0..e06dbbb 100644
--- a/pitivi/mainwindow.py
+++ b/pitivi/mainwindow.py
@@ -37,6 +37,7 @@ from pitivi.configure import get_pixmap_dir
from pitivi.configure import get_ui_dir
from pitivi.configure import GITVERSION
from pitivi.configure import in_devel
+from pitivi.configure import VERSION
from pitivi.dialogs.prefs import PreferencesDialog
from pitivi.effects import EffectListWidget
from pitivi.mediafilespreviewer import PreviewWidget
@@ -609,8 +610,10 @@ class MainWindow(Gtk.ApplicationWindow, Loggable):
version_str = _("Version %(cur_ver)s — %(new_ver)s is available" %
{"cur_ver": GITVERSION,
"new_ver": self.app.getLatest()})
- else:
+ elif GITVERSION:
version_str = _("Version %s" % GITVERSION)
+ else:
+ version_str = _("Version %s" % VERSION)
abt.set_version(version_str)

comments = ["",

c3cb1b6 Release 0.97.1
configure | 3 ++-
meson.build | 2 +-
pitivi/mainwindow.py | 5 ++++-
3 files changed, 7 insertions(+), 3 deletions(-)

Upstream: git.gnome.org


  • Share