[libreoffice] 02/02: remove sdk-cat-sed-bin.diff - upstream

[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 03c9ca83bc7dedbce1646b78b6a5f658652537b2
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Jul 3 18:51:52 2017 +0200

    remove sdk-cat-sed-bin.diff - upstream
---
 changelog                    |  4 +++-
 patches/sdk-cat-sed-bin.diff | 33 ---------------------------------
 patches/series               |  1 -
 3 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/changelog b/changelog
index 7222c48..f0e2269 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,6 @@
-libreoffice (1:5.4.0~rc1-2) UNRELEASED; urgency=medium
+libreoffice (1:5.4.0~rc2~git20170702-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot
 
   * debian/patches/sdk-cat-sed-bin.diff: fix bin/distro-install-sdk;
     cat and sed are in /bin... How did this ever work?
diff --git a/patches/sdk-cat-sed-bin.diff b/patches/sdk-cat-sed-bin.diff
deleted file mode 100644
index 522debf..0000000
--- a/patches/sdk-cat-sed-bin.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-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 a92c3b5..e8cf28d 100755
---- a/bin/distro-install-sdk
-+++ b/bin/distro-install-sdk
-@@ -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_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," \
diff --git a/patches/series b/patches/series
index 9e03b13..2b0640e 100644
--- a/patches/series
+++ b/patches/series
@@ -33,5 +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
 fix-m68k-build-again.diff

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