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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeScripts') 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() -- cgit v1.2.3 From 90867e5163a560f8905badd1a91f1688b6d9b36c Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Fri, 17 Jan 2014 14:29:51 +0100 Subject: i18n. Symbols are now translatable (see Bug #1261198); POT file and French translation updated. (bzr r12946) --- CMakeScripts/cmake_consistency_check_config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/cmake_consistency_check_config.py b/CMakeScripts/cmake_consistency_check_config.py index 3ee6d4449..24cb22002 100644 --- a/CMakeScripts/cmake_consistency_check_config.py +++ b/CMakeScripts/cmake_consistency_check_config.py @@ -40,8 +40,9 @@ IGNORE = ( # header files "share/filters/filters.svg.h", "share/palettes/palettes.h", - "share/palettes/palettes.h", "share/patterns/patterns.svg.h", + "share/templates/templates.h", + "share/symbols/symbols.h", "src/libcola/cycle_detector.h", "src/libnr/in-svg-plane-test.h", "src/libnr/nr-point-fns-test.h", -- cgit v1.2.3