From 480d94f7f54ed3c2f12f48359988d4fbe9b805a9 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Mon, 28 Mar 2016 18:05:33 +0200 Subject: [PATCH] preparing 0.11.0 --- debian/control | 2 +- debian/patches/fix-new-grep-behaviour.patch | 25 --------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 debian/patches/fix-new-grep-behaviour.patch delete mode 100644 debian/patches/series diff --git a/debian/control b/debian/control index 37068c6..06eb358 100644 --- a/debian/control +++ b/debian/control @@ -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, diff --git a/debian/patches/fix-new-grep-behaviour.patch b/debian/patches/fix-new-grep-behaviour.patch deleted file mode 100644 index 9d97b24..0000000 --- a/debian/patches/fix-new-grep-behaviour.patch +++ /dev/null @@ -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() diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index cfb6b79..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -fix-new-grep-behaviour.patch