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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-6-61-gc62978b



The following commit has been merged in the debian-experimental-3.6 branch:
commit f6baa7676dd07ad3993e8f0c5ea2f2020f68a1f8
Merge: 7a208db556b2ecf90b9ef527c5a66fa0732015d3 50c6ec4df613bab1f50e4281f59329f48c489f84
Author: Rene Engelhard <rene@debian.org>
Date:   Thu May 3 23:53:32 2012 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-3.6
    
    Conflicts:
    	changelog
    	patches/series

diff --combined changelog
index 89fc160,d05ae9f..9e1a37e
--- a/changelog
+++ b/changelog
@@@ -1,18 -1,11 +1,26 @@@
 +libreoffice (1:3.6.0~alpha0~git20120503-1) UNRELEASED; urgency=low
 +
 +  * new upstream snapshot 
 +    - fixes splashscreen location in multi-monitor setups
 +      (closes: #657444, #431473)
 +
 +  * debian/patches/build-dont-run-slowcheck.diff: as name says
 +
 +  * debian/rules:
 +    - new conditionals for: doxygen, libcdr, liblcms2
 +    - remove liblucene2-java stuff; now clucene is used
 +    - build-depend on libxml2-utils, xmllint now needed
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 03 May 2012 13:44:05 +0200
 +
+ libreoffice (1:3.5.2-7) UNRELEASED; urgency=low
+ 
+   * debian/patches/mozilla-profile-absolute-paths.diff: add patch from
+     upstream master to respect absolute paths for mozilla profile
+     (closes: #659733) 
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 03 May 2012 23:37:38 +0200
+ 
  libreoffice (1:3.5.2-6) unstable; urgency=low
  
    [ Rene Engelhard ]

-- 
LibreOffice packaging repository


Reply to: