[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4-1-222-g4eb5743
The following commit has been merged in the debian-experimental-4.0 branch:
commit 4eb5743d1c9eb5f91ddefc3c5721b07ec744d4ac
Merge: 0e44e6cc1d8c38a1921f787b11f92bf7e67a32b7 aa91bec1e3c1ea0f897d3843ee4e330f3bccb467
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jan 15 19:12:11 2013 +0100
Merge remote-tracking branch 'origin/debian-experimental-3.6' into debian-experimental-4.0
Conflicts:
changelog
patches/series
rules
diff --combined changelog
index 1e649bb,d7c3108..dae4090
--- a/changelog
+++ b/changelog
@@@ -1,36 -1,4 +1,36 @@@
+libreoffice (1:4.0.0~rc2~git20130114-1) UNRELEASED; urgency=low
+
+ * new upstream release snapshot
+ - 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
+ - fix gdb helper installation; use upstreams install-gdb-printers
+ * 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~rc1~git20130114-1) UNRELEASED; urgency=low
+ libreoffice (1:3.6.5~rc1-1) UNRELEASED; urgency=low
* new upstream snspshot
- fixes --view (closes: #697723)
@@@ -38,6 -6,9 +38,9 @@@
* debian/rules:
- make -help-en-us break "the others" to work around 682838
(closes: #682838)
+ * debian/rules, debian/*.triggers.in, debian/libreoffice-common.postinst.in:
+ - re-introduce @OODIR@/share/extensions trigger, but "touch" is enough
+ now
-- Rene Engelhard <rene@debian.org> Mon, 14 Jan 2013 21:37:10 +0100
@@@ -75,7 -46,6 +78,6 @@@ libreoffice (1:3.6.4~rc1-1) experimenta
* merge from Ubuntu:
- fix quoting of PYTHON_{CFLAGS,LIBS} (Matthias Klose)
-
* debian/rules:
- mention CVE-2012-4233 in 1:3.6.1~rc2-1's changelog
- re-enable mozilla plugin
--
LibreOffice packaging repository
Reply to: