[libreoffice] 01/02: merge sdk-examples fix into 5.4.0~rc1-1

[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 29428ff7024c80e9c67d890e5266810d18df8b2b
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Jun 26 19:52:58 2017 +0200

    merge sdk-examples fix into 5.4.0~rc1-1
---
 changelog | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/changelog b/changelog
index 6e7c4e3..8b096b8 100644
--- a/changelog
+++ b/changelog
@@ -1,10 +1,3 @@
-libreoffice (1:5.4.0~rc1-2) UNRELEASED; urgency=medium
-
-  * debian/tests/sdk-examples: DevelopersGuide/OfficeDev/DesktopEnvironment
-    needs -ljawt. Build this to check this and the JAVA_PROC_TYPE setting also.
-
- -- Rene Engelhard <rene at debian.org>  Mon, 26 Jun 2017 19:25:59 +0200
-
 libreoffice (1:5.4.0~rc1-1) experimental; urgency=medium
 
   * New upstream release candidate
@@ -26,8 +19,10 @@ libreoffice (1:5.4.0~rc1-1) experimental; urgency=medium
   * debian/copyright, debian/source/include-binaries: remove xmlsec
   * debian/rules:
     - fix dh_missing call
+  * debian/tests/sdk-examples: DevelopersGuide/OfficeDev/DesktopEnvironment
+    needs -ljawt. Build this to check this and the JAVA_PROC_TYPE setting also.
 
- -- Rene Engelhard <rene at debian.org>  Sun, 25 Jun 2017 20:04:27 +0200
+ -- Rene Engelhard <rene at debian.org>  Mon, 26 Jun 2017 19:25:59 +0200
 
 libreoffice (1:5.4.0~beta2-4) experimental; urgency=medium
 

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