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

[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.5-1-232-gcee279c



The following commit has been merged in the debian-experimental-4.0 branch:
commit cee279c2d6e82018d65cebc41cff9bb6f884319f
Merge: cd5f0b5efd4809e9fcfe4e20b34e737cdc5a7181 8de03ab8710290f89d5506f065f1c40f6d15ab8c
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Feb 3 15:30:29 2013 +0100

    Merge remote-tracking branch 'origin/debian-experimental-3.6' into debian-experimental-4.0
    
    Conflicts:
    	changelog
    	libreoffice-filter-binfilter.mime

diff --combined changelog
index 475da36,f0cc494..7547edd
--- a/changelog
+++ b/changelog
@@@ -1,34 -1,11 +1,42 @@@
 +libreoffice (1:4.0.0~rc3-1) UNRELEASED; urgency=low
 +
 +  * new upstream release candidate
 +    - contains new driver for mozab (mork). Automatically enabled thus
 +      this closes: #321099
 +    - now has a basic(!) gnumeric import in experimental mode
 +      (closes: #595708)
 +    - supports IFERROR (closes: #662398)
 +
 +  * debian/control.in:
 +    - make -impress suggest bluez (for impress remote control)
 +    - make libreoffice depend on / -common recommend python-uno for the
 +      new python-based wizards 
 +  * debian/rules:
 +    - add new conditionals for new dependencies: liblangtag, liborcus,
 +      libmspub, (u)cpp; remove them for gone saxon, librsvg, db
 +    - enable sdrmeote on all archs; b-d on libbluetooth-dev on where we
 +      enable bluetooth (!kfreebsd-*)
 +    - use gstreamer1.0
 +    - use --disable-dependency-tracking instead of gb_FULLDEPS= and
 +      --enable-hardlink-deliver instead of gb_Deliver_HARDLINK=T
 +    - python3 is default now; reverse logic (use python3 per default and
 +      and build python2 in a extra step)
 +    - add option to build with --enable-mergelibs, not yet enabled.
 +    - remove stlport hacks for i386 - not used/needed anymore upstream
 +  * debian/uno-libs3.symbols: update
 +  * debian/control*.in, debian/rules, debian/scripts/gid2pkgdirs.sh: binfilter
 +    is gone. yay.
 +
 + -- Rene Engelhard <rene@debian.org>  Sat, 22 Dec 2012 18:03:18 +0100
 +
+ libreoffice (1:3.6.5-2) UNRELEASED; urgency=low
+ 
+   * debian/*.mime:
+     - don't use obsolete -no-oosplash anymore, thanks Matthijs Kooijman
+       for the patch (closes: #698845)
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 03 Feb 2013 15:23:55 +0100
+ 
  libreoffice (1:3.6.5-1) experimental; urgency=low
  
    * LibreOffice 3.6.5 release (idential to rc2)

-- 
LibreOffice packaging repository


Reply to: