[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-228-g7fe5c14



The following commit has been merged in the debian-experimental-4.0 branch:
commit 7fe5c149dfb5f971334b8e1efa7d5f168b383944
Merge: 28d3a5bc8dbb27369394ca79cc397a7e41ef0714 4c70661c3a49c96f0863eb3c30f1644c64c8007e
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Jan 30 18:08:19 2013 +0100

    Merge remote-tracking branch 'origin/debian-experimental-3.6' into debian-experimental-4.0
    
    Conflicts:
    	changelog

diff --combined changelog
index a3bd824,45d6bea..475da36
--- a/changelog
+++ b/changelog
@@@ -1,35 -1,6 +1,37 @@@
 +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~rc2-2) UNRELEASED; urgency=low
+ libreoffice (1:3.6.5-1) experimental; urgency=low
+ 
+   * LibreOffice 3.6.5 release (idential to rc2)
  
    * debian/rules:
      - stop using lsb_release -cs, parse dpkg-parsechangelog instead.
@@@ -39,7 -10,7 +41,7 @@@
      - enable tr,vi help, fully translated according to
        https://gerrit.libreoffice.org/1895
  
-  -- Rene Engelhard <rene@debian.org>  Tue, 22 Jan 2013 00:29:09 +0100
+  -- Rene Engelhard <rene@debian.org>  Mon, 28 Jan 2013 21:29:19 +0100
  
  libreoffice (1:3.6.5~rc2-1) experimental; urgency=low
  

-- 
LibreOffice packaging repository


Reply to: