[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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



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

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

commit e2d233ffcb5cb5a4b6f37ecc6d3fb40bb80a3da8
Merge: 8ecac4d f8bb0bd
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Jan 5 17:56:18 2016 +0100

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
    
    Conflicts:
    	changelog
    	control

 changelog | 5 ++++-
 control   | 4 ++--
 rules     | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --cc changelog
index 218be58,84945cb..190b8d0
--- a/changelog
+++ b/changelog
@@@ -17,23 -11,27 +17,26 @@@ libreoffice (1:5.1.0~rc2~git20151222-1
      of which we don't have the (build-)deps in -subsequentcheckbases deps.
    * debian/control.debug.in: recommend gdb
    * debian/control.debug.in, debian/rules: move python(3)-six to recommends
+     and recommend python3-six on sid as "gdb" uses python3. 
+   * debian/rules:
+     - build-depend on libpng-dev instead of libpng12-dev (closes: #662411)
  
-  -- Rene Engelhard <rene@debian.org>  Sun, 20 Dec 2015 11:05:15 +0100
+  -- Rene Engelhard <rene@debian.org>  Tue, 05 Jan 2016 15:45:29 +0100
  
 -libreoffice (1:5.0.4~rc2-2) unstable; urgency=medium
 -
 -  * reupload with correct 1:5.0.4~rc1-1 base... 
 -
 - -- Rene Engelhard <rene@debian.org>  Mon, 14 Dec 2015 16:30:44 +0100
 -
 -libreoffice (1:5.0.4~rc2-1) unstable; urgency=medium
 +libreoffice (1:5.1.0~rc1-1) experimental; urgency=medium
  
    * New upstream release candidate
 +    - doesn't link evoab2 to gtk2 anymore (closes: #807640)
  
 - -- Rene Engelhard <rene@debian.org>  Fri, 11 Dec 2015 08:11:41 +0100
 +  * debian/patches/disable-npapi-plugin-support.diff: as name says,
 +    the only serious usecase is the doomed Flash anyway and it's
 +    causes a link against gtk2 in -core (closes: #807601)
  
 -libreoffice (1:5.0.4~rc1-1) unstable; urgency=medium
 + -- Rene Engelhard <rene@debian.org>  Wed, 16 Dec 2015 10:15:06 +0100
  
 -  * New upstream release candidate
 +libreoffice (1:5.1.0~beta2-1) experimental; urgency=medium
 +
 +  * New upstream beta release
      - fixes crash when selecting the border style in some window managers
        (closes: #801504)
  

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


Reply to: