[libreoffice] 06/07: fix OO_SDK_NAME; s/openoffice.org/libreoffice/
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 38bc366163db81793478df299819add143290494
Author: Rene Engelhard <rene@debian.org>
Date: Mon Apr 4 18:31:31 2016 +0200
fix OO_SDK_NAME; s/openoffice.org/libreoffice/
---
changelog | 2 ++
patches/sdkname-lo.diff | 13 +++++++++++++
patches/series | 1 +
3 files changed, 16 insertions(+)
diff --git a/changelog b/changelog
index 6addf4b..5ff9124 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,8 @@ libreoffice (1:5.1.2~rc2-1) UNRELEASED; urgency=medium
per default and make it conditional on --enable-packagekit.
* debian/patches/setsdkenv-tripplet.diff: fix setsdkenv_unix.sh to work
with *-linux-gnu* (as on e.g. armhf)
+ * debian/patches/sdkname-lo.diff: fix OO_SDK_NAME;
+ s/openoffice.org/libreoffice/
* debian/control*in: add loads of ${misc:Pre-Depends} to packages having
.maintscripts calling dir_to_symlink to get proper dpkg Pre-Dependency.
diff --git a/patches/sdkname-lo.diff b/patches/sdkname-lo.diff
new file mode 100644
index 0000000..8baa2cd
--- /dev/null
+++ b/patches/sdkname-lo.diff
@@ -0,0 +1,13 @@
+diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
+index f2b6e30..a92c3b5 100755
+--- a/bin/distro-install-sdk
++++ b/bin/distro-install-sdk
+@@ -65,7 +65,7 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; then
+ echo "$DOCDIR/sdk/examples" >>$DESTDIR/gid_Module_Root_SDK
+
+ # generate default profiles
+- sed -e "s,@OO_SDK_NAME@,openoffice.org${PRODUCTVERSION}_sdk," \
++ sed -e "s,@OO_SDK_NAME@,libreoffice${PRODUCTVERSION}_sdk," \
+ -e "s,@OO_SDK_HOME@,$INSTALLDIR/sdk," \
+ -e "s,@OFFICE_HOME@,$INSTALLDIR," \
+ -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
diff --git a/patches/series b/patches/series
index 676c85e..1a66b22 100644
--- a/patches/series
+++ b/patches/series
@@ -36,3 +36,4 @@ bash-completion-dir.diff
OPENCL_DLL_NAME.diff
no-packagekit-per-default.diff
setsdkenv-tripplet.diff
+sdkname-lo.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: