This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit da1cae78a36454c50aa375ce9b181309b6cc01a2
Author: Rene Engelhard <r...@debian.org>
Date: Tue Apr 5 00:46:37 2016 +0200
update to libreoffice-5-1 again; remove upstreamed setsdkenv-tripplet.diff
and sdkname-lo.diff
---
changelog | 6 ++++++
patches/sdkname-lo.diff | 13 -------------
patches/series | 2 --
patches/setsdkenv-tripplet.diff | 13 -------------
4 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/changelog b/changelog
index 380dafd..bcae8fe 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.1.3~rc1~git20160404-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <r...@debian.org> Sat, 02 Apr 2016 12:48:35 +0200
+
libreoffice (1:5.1.2~rc2-1) UNRELEASED; urgency=medium
* New upstream release candidate
diff --git a/patches/sdkname-lo.diff b/patches/sdkname-lo.diff
deleted file mode 100644
index 8baa2cd..0000000
--- a/patches/sdkname-lo.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-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 1a66b22..11fca58 100644
--- a/patches/series
+++ b/patches/series
@@ -35,5 +35,3 @@ GCC-6-PR69273-workaround.diff
bash-completion-dir.diff
OPENCL_DLL_NAME.diff
no-packagekit-per-default.diff
-setsdkenv-tripplet.diff
-sdkname-lo.diff
diff --git a/patches/setsdkenv-tripplet.diff b/patches/setsdkenv-tripplet.diff
deleted file mode 100644
index 2385e32..0000000
--- a/patches/setsdkenv-tripplet.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
-index 4f9b879..1ca7249 100644
---- a/odk/config/setsdkenv_unix.sh.in
-+++ b/odk/config/setsdkenv_unix.sh.in
-@@ -154,7 +154,7 @@ case ${sdk_platform} in
- export DYLD_LIBRARY_PATH
- ;;
-
-- linux-gnu)
-+ linux-gnu*)
- directoryname=linux
- comid=gcc3
- soext=so
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
