From 744053120dad8edd7085dda1a02e9f9ecd65d701 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Tue, 14 Jan 2014 10:46:05 -0800 Subject: Fix bzr revision number in version string (LP #1071923) Patch from David Evans. (bzr r12928) --- CMakeScripts/inkscape-version.cmake | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index 1d98a5799..a72946ac5 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -11,7 +11,7 @@ set(INKSCAPE_REVISION "unknown") if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/) execute_process(COMMAND - bzr revno ${INKSCAPE_SOURCE_DIR} + bzr revno --tree ${INKSCAPE_SOURCE_DIR} OUTPUT_VARIABLE INKSCAPE_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE) endif() diff --git a/src/Makefile.am b/src/Makefile.am index 2f91c3c24..7fbc135c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -223,7 +223,7 @@ endif # someone updates the BZR working directory. inkscape-version.cpp: $(inkscape_version_deps) VER_PREFIX="$(VERSION)";\ - VER_BZRREV=" r`bzr revno`"; \ + VER_BZRREV=" r`bzr revno --tree`"; \ if test ! -z "`bzr status -S -V $(srcdir)`"; then \ VER_CUSTOM=" custom"; \ fi; \ -- cgit v1.2.3