[libreoffice] 01/01: fix bin/distro-install-sdk; cat and sed are in /bin

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit 51d4ec3337ee6ff6a3c47dab1f9ac9ab2dce5b30
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Jun 26 18:49:36 2017 +0000

    fix bin/distro-install-sdk; cat and sed are in /bin
---
 changelog                    |  2 ++
 patches/sdk-cat-sed-bin.diff | 15 +++++++++++++++
 patches/series               |  1 +
 3 files changed, 18 insertions(+)

diff --git a/changelog b/changelog
index cae8714..ae4c4a1 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ libreoffice (1:5.3.4-2) UNRELEASED; urgency=medium
 
   * debian/patches/icu-59-uchar.diff: backport patch from 5.4 to fix build
     with ICU 59 (this only affects some internal libs, but...)
+  * debian/patches/sdk-cat-sed-bin.diff: fix bin/distro-install-sdk;
+    cat and sed are in /bin... How did this ever work?
 
   * debian/rules:
     - clean up JRE Depends; we consider java6_architectures as Java arch, so
diff --git a/patches/sdk-cat-sed-bin.diff b/patches/sdk-cat-sed-bin.diff
new file mode 100644
index 0000000..a1dff93
--- /dev/null
+++ b/patches/sdk-cat-sed-bin.diff
@@ -0,0 +1,15 @@
+diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
+index a92c3b5d650c..76eadfd9d020 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," \
+-        -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_JAVA_HOME@,$JAVA_HOME," \
+         -e "s, at OO_SDK_OUTPUT_DIR@,\$HOME," \
+         -e "s, at SDK_AUTO_DEPLOYMENT@,NO," \
diff --git a/patches/series b/patches/series
index 28fb7ef..bff4631 100644
--- a/patches/series
+++ b/patches/series
@@ -34,3 +34,4 @@ gtk3-opengl-slideshow.diff
 m68k-use-mlong-jump-table-offsets.diff
 odk-settings-JAVA_PROC_TYPE.diff
 icu-59-uchar.diff
+sdk-cat-sed-bin.diff

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