[libreoffice] 01/02: Merge remote-tracking branch 'origin/debian-experimental-4.4' into debian-experimental-4.5

[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-4.5
in repository libreoffice.

commit 2688b97df1bb56b1408613e1af2b23c9d0ff7cc2
Merge: 3bc5e29 b0002aa
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Jan 27 07:43:37 2015 +0100

    Merge remote-tracking branch 'origin/debian-experimental-4.4' into debian-experimental-4.5
    
    Conflicts:
    	changelog

 changelog |  9 +++++++++
 rules     | 27 ++++++++++++++-------------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --cc changelog
index d858101,3a967d4..13b67d5
--- a/changelog
+++ b/changelog
@@@ -1,12 -1,12 +1,21 @@@
 +libreoffice (1:4.5.0~alpha1~git20150119-1) UNRELEASED; urgency=medium
 +
 +  * new upstream snapshot
 +
 +  * debian/rules:
 +    - adapt for ure folded into /usr/lib/libreoffice/program directly
 +
 + -- Rene Engelhard <rene@debian.org>  Tue, 02 Dec 2014 21:56:42 +0100
 +
+ libreoffice (1:4.4.0~rc3-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/rules:
+     - move /var/spool/libreoffice into -core, not -common (closes: #775150)
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 22 Jan 2015 23:45:29 +0100
+ 
  libreoffice (1:4.4.0~rc2-1) experimental; urgency=medium
  
    * New upstream release candidate

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