[libreoffice] branch master updated (839a8f3 -> 11a3c1a)

[Rene Engelhard]

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

rene pushed a change to branch master
in repository libreoffice.

      from  839a8f3   regen control
       new  65e0a3b   regen control. WTF?
       new  8c19982   move the collada stuff down after the OOO_*_ARCHS settings and move OOO_GDRIVE_ARCHS setting "to the rest"
       new  fb04045   be consequent and bump the build-dependencies for the DLP libs when we run the tests
       new  48344fc   Drop libtextcat Breaks since it is gone for good
       new  2bdcbe6   Drop libreoffice-zotero-integration Breaks which is sufficient since wheezy
       new  db60c26   Drop mozilla-plugin-vlc Breaks which is sufficient since wheezy
       new  e676109   Drop superfluous Breaks against libjaxe-java and libreoffice-accessodf
       new  2a0bd0f   Drop Conflicts/Replaces for python3.3-uno which got removed before 4.2
       new  11a3c1a   Merge remote-tracking branch 'ubuntu/wip/queue-debian-master'

The 9 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  |  2 ++
 control    | 20 ++++++++++----------
 control.in | 10 +++-------
 rules      | 62 +++++++++++++++++++++++++++++++++-----------------------------
 4 files changed, 48 insertions(+), 46 deletions(-)

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