[libreoffice] 02/02: Merge remote-tracking branch 'origin/master' into debian-experimental-5.4

[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 7b5798ca172718d7498ab5b7f3da6bd38311a2b8
Merge: d325142 11a3c1a
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Aug 12 10:38:34 2017 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.4

 changelog                                          |  17 ++
 control                                            | 122 +++-----------
 control.gtk2.in                                    |   1 -
 control.in                                         |  89 +---------
 control.subsequentcheckbase.in                     |   2 +-
 control.transitionals.in                           |   4 +-
 ...sable-some-sc-tests-with-internal-cppunit.diff} |  13 +-
 patches/series                                     |   2 +-
 rules                                              | 185 ++++++++++-----------
 9 files changed, 155 insertions(+), 280 deletions(-)

diff --cc changelog
index 34be8d9,a713f13..af8dde0
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,19 +1,26 @@@
++
 +libreoffice (1:5.4.1~rc1-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release candidate
 +
 + -- Rene Engelhard <rene at debian.org>  Sat, 12 Aug 2017 10:36:57 +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
+     - set UNO_LIBS_DBG_ROOT to fix gdb helper installation for uno-libs3 again
+       and make -core-dbgsym recommends uno-libs3-dbgsym (same reason as above)
+     - 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
+   * 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
+ 
  libreoffice (1:5.4.0-1) unstable; urgency=medium
  
    * New upstream release
diff --cc control
index f1e16c8,afd1d88..5a42af9
--- a/control
+++ b/control
@@@ -180,23 -185,13 +185,13 @@@ Build-Conflicts: amd-libopencl1
                   g++-4.6 (= 4.6.1-10),
                   g++-4.6 (= 4.6.1-11),
                   g++-4.7 (<< 4.7.1-3),
-                  gcj-4.2 (= 4.2.2-6),
-                  gjdoc (= 0.7.8-2),
-                  libboost1.39-dev (<< 1.39.0-2),
-                  libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64],
-                  libc6-dev (= 2.6.1-3) [i386 amd64],
-                  libc6-dev (= 2.6.1-4) [i386 amd64],
-                  libcairo2 (= 1.4.8-1),
-                  libxul-dev (= 1.8.0.13~pre070720-0etch1),
                   nvidia-glx-dev,
                   nvidia-glx-legacy-dev,
-                  nvidia-libopencl1,
-                  qt3-dev-tools
- Standards-Version: 4.0.0
+                  nvidia-libopencl1
+ Standards-Version: 4.0.1
 -Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.4
  Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
- Bugs: 
+ Bugs: mailto:debian-openoffice at lists.debian.org
  Homepage: http://www.libreoffice.org
  
  Package: libreoffice
diff --cc control.in
index 33e57ae,eac1aa7..6eb2706
--- a/control.in
+++ b/control.in
@@@ -5,25 -5,15 +5,15 @@@ Maintainer: Debian LibreOffice Maintain
  Uploaders: Rene Engelhard <rene at debian.org>, Chris Halls <halls at debian.org>
  Build-Depends: %BUILD_DEPS%,
  Build-Depends-Indep: %BUILD_DEPS_INDEP%
- Build-Conflicts: flex (= 2.5.34-1) [amd64],
-                  g++-4.6 (= 4.6.1-10),
+ Build-Conflicts: g++-4.6 (= 4.6.1-10),
                   g++-4.6 (= 4.6.1-11),
                   g++-4.7 (<< 4.7.1-3),
-                  gcj-4.2 (= 4.2.2-6),
-                  gjdoc (= 0.7.8-2),
-                  libboost1.39-dev (<< 1.39.0-2),
-                  libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64],
-                  libc6-dev (= 2.6.1-3) [i386 amd64],
-                  libc6-dev (= 2.6.1-4) [i386 amd64],
-                  libcairo2 (= 1.4.8-1),
-                  libxul-dev (= 1.8.0.13~pre070720-0etch1),
                   nvidia-glx-dev,
                   nvidia-glx-legacy-dev,
-                  qt3-dev-tools,
                   amd-libopencl1,
                   nvidia-libopencl1
- Standards-Version: 4.0.0
+ Standards-Version: 4.0.1
 -Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.4
  Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
  Bugs: @BUGS@
  Homepage: http://www.libreoffice.org

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