[libreoffice] branch debian-experimental-6.0 updated (11d6f00 -> 1ed8f31)

[Rene Engelhard]

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

rene pushed a change to branch debian-experimental-6.0
in repository libreoffice.

      from  11d6f00   Merge remote-tracking branch 'origin/master' into debian-experimental-6.0
      adds  e8cb65f   Merge tag 'libreoffice_5.4.0-1' into debian-experimental-5.4
      adds  1596f2c   5.4.1 branch; remove upstreamed patches, update no-packagekit-per-default.diff
      adds  674e243   Merge branch 'master' into debian-experimental-5.4
      adds  fe9b835   fix GIT_* and Vcs-Git:
      adds  545f96c   *really* update Vcs-Git:
      adds  d325142   5.4.1 rc1
      adds  65e0a3b   regen control. WTF?
      adds  8c19982   move the collada stuff down after the OOO_*_ARCHS settings and move OOO_GDRIVE_ARCHS setting "to the rest"
      adds  fb04045   be consequent and bump the build-dependencies for the DLP libs when we run the tests
      adds  48344fc   Drop libtextcat Breaks since it is gone for good
      adds  2bdcbe6   Drop libreoffice-zotero-integration Breaks which is sufficient since wheezy
      adds  db60c26   Drop mozilla-plugin-vlc Breaks which is sufficient since wheezy
      adds  e676109   Drop superfluous Breaks against libjaxe-java and libreoffice-accessodf
      adds  2a0bd0f   Drop Conflicts/Replaces for python3.3-uno which got removed before 4.2
      adds  11a3c1a   Merge remote-tracking branch 'ubuntu/wip/queue-debian-master'
      adds  7b5798c   Merge remote-tracking branch 'origin/master' into debian-experimental-5.4
      adds  04fd52f   fix changelog
      adds  e63dd03   run dh_missing only if dh_install succeeded
      adds  adebcb6   stop shipping mimelnk desktop files (closes: #872001)
      adds  9ea7e7c   backport middle click fix from master (closes: #871588)
       new  1ed8f31   Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-6.0

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 changelog  | 15 ++++++++++++++-
 control    | 20 ++++++++++----------
 control.in | 10 +++-------
 rules      | 64 +++++++++++++++++++++++++++++++++-----------------------------
 4 files changed, 61 insertions(+), 48 deletions(-)

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