preparing 0.11.0

ubuntu/disco
Alf Gaida 8 years ago
parent d09888c454
commit 480d94f7f5

2
debian/control vendored

@ -9,7 +9,7 @@ Priority: optional
Build-Depends: debhelper (>= 9.20151219),
cmake (>= 3.0.2),
libfm-dev (>= 1.2.0),
libfm-qt-dev (>= 0.10.0+20151214),
libfm-qt-dev (>= 0.11.0),
libglib2.0-dev,
liblxqt0-dev (>= 0.10.0),
libmenu-cache-dev,

@ -1,25 +0,0 @@
Description: to be descided upstream
no need to put this upstream, but we are not
sure how to implement the new translation
routines - time will tell, this fixes the new
behaviour until we maybe rework translation upstream.
--- a/cmake/LXQtTranslateDesktop.cmake
+++ b/cmake/LXQtTranslateDesktop.cmake
@@ -71,13 +71,13 @@
set(_pattern "'\\[.*]\\s*='")
if (_translations)
add_custom_command(OUTPUT ${_outFile}
- COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
- COMMAND grep -h ${_pattern} ${_translations} >> ${_outFile}
+ COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
+ COMMAND grep -h -a ${_pattern} ${_translations} >> ${_outFile}
COMMENT "Generating ${_fileName}${_fileExt}"
)
else()
add_custom_command(OUTPUT ${_outFile}
- COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
+ COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
COMMENT "Generating ${_fileName}${_fileExt}"
)
endif()

@ -1 +0,0 @@
fix-new-grep-behaviour.patch
Loading…
Cancel
Save