[libreoffice] 01/02: update sdk-cat-sed-bin.diff to upstreamed version using dirname

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit a8780f2684a47a108dfad23aa6c4fd2f595c0664
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Jul 2 12:38:41 2017 +0200

    update sdk-cat-sed-bin.diff to upstreamed version using dirname
---
 patches/sdk-cat-sed-bin.diff | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/patches/sdk-cat-sed-bin.diff b/patches/sdk-cat-sed-bin.diff
index a1dff93..522debf 100644
--- a/patches/sdk-cat-sed-bin.diff
+++ b/patches/sdk-cat-sed-bin.diff
@@ -1,15 +1,33 @@
+From ec79f208f922b077250d8e52f1908542288d90fa Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene at debian.org>
+Date: Mon, 26 Jun 2017 21:18:00 +0200
+Subject: [PATCH] fix SDK paths (especially cat/sed) in bin/distro-install-sdk
+
+wonder how that ever worked. cat and sed are in /bin, not /usr/bin.
+Appparetly the BSDs have them there, though, so generalize though this
+is for distros and it probably shouldn't matter.
+
+Change-Id: I6efb3e92b8f8d15f3671090a3eaa9d8836f9998f
+---
+
 diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
-index a92c3b5d650c..76eadfd9d020 100755
+index a92c3b5..e8cf28d 100755
 --- a/bin/distro-install-sdk
 +++ b/bin/distro-install-sdk
-@@ -71,8 +71,8 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; then
-         -e "s, at OO_SDK_MAKE_HOME@,/usr/bin," \
-         -e "s, at OO_SDK_ZIP_HOME@,/usr/bin," \
-         -e "s, at OO_SDK_CPP_HOME@,/usr/bin," \
+@@ -68,11 +68,11 @@
+     sed -e "s, at OO_SDK_NAME@,libreoffice${PRODUCTVERSION}_sdk," \
+         -e "s, at OO_SDK_HOME@,$INSTALLDIR/sdk," \
+         -e "s, at OFFICE_HOME@,$INSTALLDIR," \
+-        -e "s, at OO_SDK_MAKE_HOME@,/usr/bin," \
+-        -e "s, at OO_SDK_ZIP_HOME@,/usr/bin," \
+-        -e "s, at OO_SDK_CPP_HOME@,/usr/bin," \
 -        -e "s, at OO_SDK_SED_HOME@,/usr/bin," \
 -        -e "s, at OO_SDK_CAT_HOME@,/usr/bin," \
-+        -e "s, at OO_SDK_SED_HOME@,/bin," \
-+        -e "s, at OO_SDK_CAT_HOME@,/bin," \
++        -e "s, at OO_SDK_MAKE_HOME@,$(dirname $(command -v make))," \
++        -e "s, at OO_SDK_ZIP_HOME@,$(dirname $(command -v zip))," \
++        -e "s, at OO_SDK_CPP_HOME@,$(dirname $(command -v cpp))," \
++        -e "s, at OO_SDK_SED_HOME@,$(dirname $(command -v sed))," \
++        -e "s, at OO_SDK_CAT_HOME@,$(dirname $(command -v cat))," \
          -e "s, at OO_SDK_JAVA_HOME@,$JAVA_HOME," \
          -e "s, at OO_SDK_OUTPUT_DIR@,\$HOME," \
          -e "s, at SDK_AUTO_DEPLOYMENT@,NO," \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git