[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-169-g6214058
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 43123efe14a7edbbbd6294e761d5189df57fc18e
Merge: e75bdf8ee7438ba48b6c01d8738e06ea510799da 940651ebaf74aab83e646d6fc81054497071ae8a
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Feb 27 01:30:06 2013 +0100
Merge branch 'doko-ubuntu2' into ubuntu-raring-4.0
- revert the temporary system mspub hack, now that its MIRed
Conflicts:
changelog
diff --combined changelog
index 5d72c00,290702e..572c81b
--- a/changelog
+++ b/changelog
@@@ -1,56 -1,9 +1,62 @@@
+ libreoffice (1:4.0.0~beta2-0ubuntu2) raring; urgency=low
+
+ * Build using the internal libmspub for a first build.
+
+ -- Matthias Klose <doko@ubuntu.com> Tue, 19 Feb 2013 00:05:26 +0100
+
+libreoffice (1:4.0.0-2ubuntu1~ppa1) raring; urgency=low
+
+ * bump ubuntu version
+ * add transitionals for -presenter-console and -binfilter
+ * add sessioninstaller for remaining wizards (LP: #780399)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 13 Feb 2013 14:42:23 +0100
+
+libreoffice (1:4.0.0-2) UNRELEASED; urgency=low
+
+ * debian/patches/gendocu-no-notimestamp-with-gjdoc.diff: don't run
+ with -notimestamp for javadoc if we use gjdoc (-> kfreebsd-*)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 08 Feb 2013 22:14:15 +0100
+
+libreoffice (1:4.0.0-1) experimental; urgency=low
+
+ * new upstream release
+ - contains new driver for mozab (mork). Automatically enabled thus
+ this closes: #321099
+ - now has a basic(!) gnumeric import in experimental mode
+ (closes: #595708)
+ - fixes LibreOffice Calc unshows comments importing MS Office xlsx (LP: #990868)
+ - supports IFERROR (closes: #662798)
+
+ * debian/control.in:
+ - make -impress suggest bluez (for impress remote control)
+ - make libreoffice depend on / -common recommend python(3)-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.
+ * debian/*.mime:
+ - don't use obsolete -no-oosplash anymore, thanks Matthijs Kooijman
+ for the patch (closes: #698845)
+ * debian/copyright: update
+ * debian/control.mozilla.in: OOo -> "old OOo and OpenDocument"
+ (closes: #699708)
+
+ -- Rene Engelhard <rene@debian.org> Thu, 07 Feb 2013 00:53:51 +0100
+
libreoffice (1:4.0.0~beta2-0ubuntu1) raring; urgency=low
* new upstream prerelease 4.0 beta2:
@@@ -95,37 -48,37 +101,37 @@@
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 13 Feb 2013 00:41:55 +0100
-libreoffice (1:4.0.0~beta2-1) UNRELEASED; urgency=low
+libreoffice (1:3.6.5-1) experimental; urgency=low
- * new upstream snapshot
- - contains new driver for mozab (mork). Automatically enabled thus
- this closes: #321099
- - now has a basic(!) gnumeric import in experimental mode
- (closes: #595708)
- - fixes LibreOffice Calc unshows comments importing MS Office xlsx (LP: #990868)
+ * LibreOffice 3.6.5 release (idential to rc2)
- * 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
- - temporarily disable python3-uno as the new python-based wizards
- (in comon!) don't work with it...
- - use --disable-dependency-tracking instead of gb_FULLDEPS=
- - 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.
+ - stop using lsb_release -cs, parse dpkg-parsechangelog instead.
+ avoids the base-files issue.
+ * debian/libreoffice-common.triggers.in, debian/rules:
+ - fix trigger to actually be in effect
+ - enable tr,vi help, fully translated according to
+ https://gerrit.libreoffice.org/1895
+
+ -- Rene Engelhard <rene@debian.org> Mon, 28 Jan 2013 21:29:19 +0100
- -- Rene Engelhard <rene@debian.org> Sat, 22 Dec 2012 18:03:18 +0100
+libreoffice (1:3.6.5~rc2-1) experimental; urgency=low
+
+ * new upstream release candidate
+ - fixes --view (closes: #697723)
+
+ * debian/rules:
+ - make -help-en-us break "the others" to work around 682838
+ (closes: #682838)
+ - temporarily remove wheezy backport conditionals as base-files would make
+ us think we should build for wheezy right now
+ - fix gdb helper installation; use upstreams install-gdb-printers
+ * debian/rules, debian/*.triggers.in, debian/libreoffice-common.postinst.in:
+ - re-introduce @OODIR@/share/extensions trigger as we still need to tell
+ LO to sync if a subdir inside share/extension *changes*, but "touch" is
+ enough now
+
+ -- Rene Engelhard <rene@debian.org> Wed, 16 Jan 2013 14:25:29 +0100
libreoffice (1:3.6.4-1) experimental; urgency=low
@@@ -161,6 -114,7 +167,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: