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

[Rene Engelhard <rene@moszumanska.debian.org>]

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

rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.

commit 261b4a891abdef921904b781bbc5930dfdb95388
Merge: aefe327 477dcfc
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Jun 27 21:38:43 2015 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
    
    Conflicts:
    	rules

 rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc rules
index e7a4352,bdc0881..c525a58
--- a/rules
+++ b/rules
@@@ -633,7 -632,7 +633,7 @@@ endi
  # Debian Jessie
  ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "jessie-backports"
    BUGS=mailto:debian-backports@lists.debian.org
-   SYSTEM_STUFF := $(filter-out opencollada collada2gltf libmwaw libcmis mdds glm libwps libetonyek liborcus,$(SYSTEM_STUFF))
 -  SYSTEM_STUFF := $(filter-out opencollada collada2gltf libmwaw libcmis mdds libwps orcus,$(SYSTEM_STUFF))
++  SYSTEM_STUFF := $(filter-out opencollada collada2gltf libmwaw libcmis mdds glm libwps libetonyek orcus,$(SYSTEM_STUFF))
    JESSIE_BACKPORT=y
  endif
  ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"

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