[libreoffice] 02/02: credits

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 53adaea8407c306f2a66e3657f51fa4748f0aaff
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Jul 24 20:50:58 2017 +0200

    credits
---
 changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/changelog b/changelog
index d20bfbc..79632cd 100644
--- a/changelog
+++ b/changelog
@@ -15,6 +15,12 @@ libreoffice (1:5.4.0-1) unstable; urgency=medium
   * debian/rules. debian/control.in:
     - add libsane-suggests substvar to prepare for libsane1
 
+  * merge from Ubuntu, thanks Rico Tzschichholz
+    - don't recommend libreoffice-sdbc-firebird if firebird is disabled
+
+  [ Rico Tzschichholz ]
+  - fix get_libebook_dep.sh for libebook1.2-dev (>= 3.24)
+
  -- Rene Engelhard <rene at debian.org>  Fri, 21 Jul 2017 16:42:39 +0200
 
 libreoffice (1:5.4.0~rc2-1) experimental; urgency=medium

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