[SCM] breeze packaging branch, master, updated. debian/5.4.3-1-17-g8eee914

Maximiliano Curia maxy at moszumanska.debian.org
Wed Mar 30 12:49:17 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/breeze.git;a=commitdiff;h=8eee914

The following commit has been merged in the master branch:
commit 8eee914ab6b9086e0af5c3b2d4461f18463713a5
Author: Eduard Sanou <dhole at openmailbox.org>
Date:   Wed Mar 30 14:48:53 2016 +0200

    Fix misdetection as binary input in grep when LC_ALL=C
---
 debian/changelog        | 3 +++
 debian/wrapperthemes.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 54e6e10..d3a58f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ breeze (4:5.5.5-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.5.5).
 
+  [ Eduard Sanou ]
+  * Fix misdetection as binary input in grep when LC_ALL=C
+
  -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Mar 2016 17:31:31 +0100
 
 breeze (4:5.5.4-1) experimental; urgency=medium
diff --git a/debian/wrapperthemes.sh b/debian/wrapperthemes.sh
index e2172c3..4f3e983 100755
--- a/debian/wrapperthemes.sh
+++ b/debian/wrapperthemes.sh
@@ -13,7 +13,7 @@ while [ $# -gt 0 ]; do
 
     mkdir -p ${CURDIR}/debian/tmp${WRAPPERDIR}
     cd ${CURDIR}/debian/tmp${ICONDIR}
-    grep -v Inherits ${CURDIR}/debian/tmp${ICONDIR}/${theme}/index.theme > "$tmp"
+    grep -a -v Inherits ${CURDIR}/debian/tmp${ICONDIR}/${theme}/index.theme > "$tmp"
     echo "Inherits=${theme}" >> "$tmp"
     install -m 644 "$tmp" ${CURDIR}/debian/tmp${WRAPPERDIR}/${theme}.theme
     rm "$tmp"

-- 
breeze packaging



More information about the pkg-kde-commits mailing list