[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-135-g9f9f13d
The following commit has been merged in the debian-experimental-4.0 branch:
commit eee991db56f649f2eba1525b3420663a7837cdc6
Merge: 99fe06878fddc87da8e6c312cb53e68dedef528c 2bf44053d1e22be142ba031195ea514efca47051
Author: Rene Engelhard <rene@debian.org>
Date: Sat Nov 24 18:45:49 2012 +0100
Merge remote-tracking branch 'origin/debian-experimental-3.6' into debian-experimental-4.0
diff --combined changelog
index 8475445,a87c902..6444e1d
--- a/changelog
+++ b/changelog
@@@ -1,31 -1,8 +1,34 @@@
+libreoffice (1:4.0.0~alpha1+git20121124-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+ - contains new driver for mozab (mork). Automatically enabled thus
+ this closes: #321099
+
+ * 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:
+ - disable langpacks for now; translations not yet updated causing
+ weird stuff
+ - 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
+ - temporarily disable python3-uno as the new python-based wizards
+ (in comon!) don't work with it...
+ * debian/uno-libs3.symbols: update
+ * debian/control*.in, debian/rules, debian/scripts/gid2pkgdirs.sh: binfilter
+ is gone. yay.
+
+ -- Rene Engelhard <rene@debian.org> Tue, 20 Nov 2012 14:16:33 +0100
+
libreoffice (1:3.6.4~rc1-2) UNRELEASED; urgency=low
+ * debian/patches/poppler_0_21_x.diff: moove from poppler_0_21_0.diff; fix
+ build with 0.21.1 again
+
* debian/rules:
- don't rely on dictionaries submodule. unused.
* debian/control.in:
@@@ -56,9 -33,21 +59,21 @@@ libreoffice (1:3.6.4~rc1-1) experimenta
* debian/libreoffice-{core,gtk3}.bug-script.in:
- find out whether we have Experimental features enabled
+ <<<<<<< HEAD
-- Rene Engelhard <rene@debian.org> Fri, 16 Nov 2012 22:20:37 +0100
libreoffice (1:3.6.3~rc2-1) experimental; urgency=low
+ =======
+ -- Rene Engelhard <rene@debian.org> Sat, 24 Nov 2012 18:31:33 +0100
+
+ libreoffice (1:3.5.4+dfsg-4) unstable; urgency=medium
+
+ * debian/control.in:
+ - remove obsolete Pre-Depends on ure (>= 1.5.1+OOo3.1.1-15)
+ (by the way closes: #693626)
+ * debian/libreoffice-core.bug-control:
+ - report-with: fonts-opensymbol instead of transitional ttf-opensymbol
+ >>>>>>> origin/debian-experimental-3.5
* new upstream release candidate
--
LibreOffice packaging repository
Reply to: