[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.4-7-154-g30b998a
The following commit has been merged in the debian-experimental-3.6 branch:
commit 4d5e0a029bdbf7c1d7870d3fa741c9228ca2ecc5
Author: Rene Engelhard <rene@debian.org>
Date: Tue Aug 14 18:17:54 2012 +0200
update to 3.6.1 rc1
diff --git a/changelog b/changelog
index bf4f6c1..bdee305 100644
--- a/changelog
+++ b/changelog
@@ -1,15 +1,13 @@
-libreoffice (1:3.6.0-1) UNRELEASED; urgency=low
+libreoffice (1:3.6.1~rc1-1) UNRELEASED; urgency=low
[ Rene Engelhard ]
- * new upstream release
+ * new upstream release candidate
- fixes splashscreen location in multi-monitor setups
(closes: #657444, #431473)
- caches fontconfig font substitutions (closes: #631308)
+ - fixes dot handling in KDE File Picker (closes: #645946)
* debian/patches/build-dont-run-checks.diff: as name says
- * debian/patches/dont-let-autoextension-interfere-with-kfiledialog.diff:
- backport upstream fix from libreoffice-3-6 to fix dot handling in
- KDE File Picker (closes: #645946)
* debian/rules:
- new conditionals for: doxygen, libcdr, liblcms2
@@ -34,9 +32,6 @@ libreoffice (1:3.6.0-1) UNRELEASED; urgency=low
- use generic python3.pc instead of pythonX.Y(mu).pc
* debian/uno-libs3.symbols: update
- [Björn Michaelsen]
- * backport patch to evade fdo#51324 (LP: #1017125)
-
-- Rene Engelhard <rene@debian.org> Thu, 03 May 2012 13:44:05 +0200
libreoffice (1:3.5.4-8) UNRELEASED; urgency=low
diff --git a/patches/dont-let-autoextension-interfere-with-kfiledialog.diff b/patches/dont-let-autoextension-interfere-with-kfiledialog.diff
deleted file mode 100644
index 9ce7a75..0000000
--- a/patches/dont-let-autoextension-interfere-with-kfiledialog.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-From c921fc0ae2b20de1953e7558fce6b9ddb94c56d3 Mon Sep 17 00:00:00 2001
-From: Luboš Luňák <l.lunak@suse.cz>
-Date: Wed, 01 Aug 2012 09:11:44 +0000
-Subject: do not let LO's autoextension handling interfere with KFileDialog's(fdo#52546)
-
-Change-Id: I73263a74d7b9bbf4a99e86773854e69f747e19d5
-Signed-off-by: Tomas Chvatal <tchvatal@suse.cz>
----
-diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
-index df08ed7..4917bf7 100644
---- a/vcl/unx/kde4/KDE4FilePicker.cxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
-@@ -398,9 +398,12 @@ uno::Any SAL_CALL KDE4FilePicker::getValue( sal_Int16 controlId, sal_Int16 )
- switch (controlId)
- {
- case ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION:
-- // we ignore this one and rely on KFileDialog to provide the function,
-- // always return true, here meaning "it's been taken care of"
-- res = uno::Any( true );
-+ // We ignore this one and rely on KFileDialog to provide the function.
-+ // Always return false, to pretend we do not support this, otherwise
-+ // LO core would try to be smart and cut the extension in some places,
-+ // interfering with KFileDialog's handling of it. KFileDialog also
-+ // saves the value of the setting, so LO core is not needed for that either.
-+ res = uno::Any( false );
- break;
- case ExtendedFilePickerElementIds::CHECKBOX_PASSWORD:
- case ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS:
---
-cgit v0.9.0.2-2-gbebe
diff --git a/patches/fdo-51324-lp-1017125-rhbz-806236-rhbz-823272-erase-o.diff b/patches/fdo-51324-lp-1017125-rhbz-806236-rhbz-823272-erase-o.diff
deleted file mode 100644
index ed64425..0000000
--- a/patches/fdo-51324-lp-1017125-rhbz-806236-rhbz-823272-erase-o.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From a0ff39aef11e6e390f01b395c0f7063f6179b98e Mon Sep 17 00:00:00 2001
-From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-Date: Tue, 7 Aug 2012 11:36:47 +0200
-Subject: [PATCH] fdo#51324 lp#1017125 rhbz#806236 rhbz#823272: erase on
- invalid iterators
-
-* the iterators returned by equal_range are invalidated by modification
- (which deleting them clearly is)
-* possibly only a partial fix as there is more abuse of equal_range in that
- file
-
-Change-Id: Ie9ba01e91cb449a32d77a69590bda2125f0924e1
----
- sd/source/ui/toolpanel/TaskPaneFocusManager.cxx | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
-index 6be7076..4f9698a 100644
---- a/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
-+++ b/sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
-@@ -226,8 +226,7 @@ void FocusManager::RemoveLinks (::Window* pWindow)
- pWindow->RemoveEventListener (LINK (this, FocusManager, WindowEventListener));
-
- // Remove the links from the given window.
-- ::std::pair<LinkMap::iterator,LinkMap::iterator> aCandidates(mpLinks->equal_range(pWindow));
-- mpLinks->erase(aCandidates.first, aCandidates.second);
-+ mpLinks->erase(pWindow);
-
- // Remove links to the given window.
- bool bLinkRemoved;
---
-1.7.9.5
-
diff --git a/patches/series b/patches/series
index 19dabf4..9c8d497 100644
--- a/patches/series
+++ b/patches/series
@@ -26,5 +26,3 @@ pyuno-py3-module.diff
ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
-dont-let-autoextension-interfere-with-kfiledialog.diff
-fdo-51324-lp-1017125-rhbz-806236-rhbz-823272-erase-o.diff
diff --git a/rules b/rules
index c393a85..ee7f8f9 100755
--- a/rules
+++ b/rules
@@ -69,11 +69,11 @@ USE_SOURCE_TARBALLS=y
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=3.6.0.4
+lo_sources_ver=3.6.1.1
# NOT in proper libreoffice-3-6 branch
-# use ./g checkout -b tag-libreoffice-3.6.0.4 libreoffice-3.6.0.4
+# use ./g checkout -b tag-libreoffice-3.6.1.1 libreoffice-3.6.1.1
GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-3-6-0
+GIT_BRANCH=libreoffice-3-6-1
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
--
LibreOffice packaging repository
Reply to: