[libreoffice] 01/02: 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 debian-experimental-5.4
in repository libreoffice.

commit c988e23dd2ece56ed58ebfbbcf0690e139b4c6e2
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                    |  7 +++++++
 patches/sdk-cat-sed-bin.diff | 15 +++++++++++++++
 patches/series               |  1 +
 3 files changed, 23 insertions(+)

diff --git a/changelog b/changelog
index 8b096b8..d243076 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.4.0~rc1-2) UNRELEASED; urgency=medium
+
+  * debian/patches/sdk-cat-sed-bin.diff: fix bin/distro-install-sdk;
+    cat and sed are in /bin... How did this ever work?
+
+ -- Rene Engelhard <rene at debian.org>  Mon, 26 Jun 2017 18:47:50 +0000
+
 libreoffice (1:5.4.0~rc1-1) experimental; urgency=medium
 
   * New upstream release candidate
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 1c3d355..d2c3a88 100644
--- a/patches/series
+++ b/patches/series
@@ -33,3 +33,4 @@ disable-sc_subsequent_filters_test-with-internal-cppunit.diff
 cppunit-optional.diff
 disable-unused-test-programs.diff
 gb_SUPPRESS_TESTS.diff
+sdk-cat-sed-bin.diff

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