[libreoffice] 01/01: there won't be a 5.4.0-2, merge changelogs

[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 b10b93f79b8def9be45eedc2dfd447f444807b85
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Fri Aug 25 07:56:13 2017 +0200

    there won't be a 5.4.0-2, merge changelogs
---
 changelog | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/changelog b/changelog
index b44d8ed..8cd30e5 100644
--- a/changelog
+++ b/changelog
@@ -7,19 +7,6 @@ libreoffice (1:5.4.1~rc2-1) UNRELEASED; urgency=medium
     (closes: #872001)
 
   * debian/rules:
-    - run dh_strip_nondeterminism
-    - disable -kde and the (unmaintained for LO) oxygen theme.
-      Qt4 should go away. See
-      https://lists.debian.org/debian-devel-announce/2017/08/msg00006.html
-    - set locale to en-US.UTF-8 also for make check, the dbaccess tests
-      fail in some frenchy locale...
-    - remove libbz2-dev from Build-Depends, coinutils got fixed
-
- -- Rene Engelhard <rene at frodo.fritz.box>  Fri, 25 Aug 2017 07:22:03 +0200
-
-libreoffice (1:5.4.0-2) UNRELEASED; urgency=medium
-
-  * debian/rules:
     - install appstream stuff into /usr/share/metainfo. sigh.
     - make -writer-dbgsym recommend -core-dbgsym as it wants some gdb stuff
       from it
@@ -28,10 +15,17 @@ libreoffice (1:5.4.0-2) UNRELEASED; urgency=medium
     - generate and install apparmor profiles
     - be consequent and bump the build-dependencies for the DLP libs when
       we run the tests; based on patch by Rico Tzschichholz
+    - run dh_strip_nondeterminism
+    - disable -kde and the (unmaintained for LO) oxygen theme.
+      Qt4 should go away. See
+      https://lists.debian.org/debian-devel-announce/2017/08/msg00006.html
+    - set locale to en-US.UTF-8 also for make check, the dbaccess tests
+      fail in some frenchy locale...
+    - remove libbz2-dev from Build-Depends, coinutils got fixed
   * debian/control*in:
     - move to policy 4.0.1; extra -> optional
 
- -- Rene Engelhard <rene at debian.org>  Sat, 05 Aug 2017 14:15:19 +0000
+ -- Rene Engelhard <rene at debian.org>  Fri, 25 Aug 2017 07:22:03 +0200
 
 libreoffice (1:5.4.0-1) unstable; urgency=medium
 

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