[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0-2-57-ga3cbdce
The following commit has been merged in the debian-experimental-3.5 branch:
commit a3cbdce5fbddab3492cd1a75a75c650c5fe35e3f
Author: Rene Engelhard <rene@debian.org>
Date: Mon Mar 5 19:48:03 2012 +0100
update to rc2
diff --git a/changelog b/changelog
index e301ad0..5fa561a 100644
--- a/changelog
+++ b/changelog
@@ -1,15 +1,16 @@
-libreoffice (1:3.5.1~rc1-1) UNRELEASED; urgency=low
+libreoffice (1:3.5.1~rc2-1) UNRELEASED; urgency=low
[ Rene Engelhard ]
* new upstream release candidate
- fixes up excessive numbers of "JRE is defective" messages
(closes: #602127)
+ - fixes populating "Recent Documents" after a profile upgrade
+ (closes: #660185)
+ - fixes nsplugin to create a correct
+ com.sun.star.ucb.SimpleFileAccess instance (closes: #661747
* debian/patches/armhf-bridges-doubles.diff: some more armhf fixes
(+ testcase) from master
- * debian/patches/nsplugin-fix-SimpleFileAccess-instance.diff:
- fix nsplugin to create a correct com.sun.star.ucb.SimpleFileAccess
- instance (closes: #661747)
* debian/patches/debian-hardened-buildflags.diff: use hardened
buildflags from dpkg-buildflags (closes: #656643)
* debian/patches/debian-opt.diff: fix to actually make test and grep
@@ -48,7 +49,7 @@ libreoffice (1:3.5.1~rc1-1) UNRELEASED; urgency=low
* debian/patches/fix-quickstart-shutdown.diff: fix logout with
quickstarter (closes: #632920, #605268)
- -- Rene Engelhard <rene@debian.org> Sat, 03 Mar 2012 21:08:09 +0000
+ -- Rene Engelhard <rene@debian.org> Mon, 05 Mar 2012 17:14:58 +0100
libreoffice (1:3.5.0-2) experimental; urgency=low
diff --git a/patches/nsplugin-fix-SimpleFileAccess-instance.diff b/patches/nsplugin-fix-SimpleFileAccess-instance.diff
deleted file mode 100644
index 58387ba..0000000
--- a/patches/nsplugin-fix-SimpleFileAccess-instance.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3d22544462e4fde4440d383c8792936df5f57990 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@debian.org>
-Date: Wed, 29 Feb 2012 23:19:00 +0100
-Subject: [PATCH] fix nsplugin to create correct com.sun.star.ucb.SimpleFileAccess instance
-
----
- extensions/source/nsplugin/source/so_instance.cxx | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx
-index b87b83f..8b243ae 100644
---- a/extensions/source/nsplugin/source/so_instance.cxx
-+++ b/extensions/source/nsplugin/source/so_instance.cxx
-@@ -239,7 +239,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
-
- //create stream for the document
- Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess(
-- mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccessw")) ),
-+ mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")) ),
- uno::UNO_QUERY );
- if(!xSimpleFileAccess.is())
- {
---
-1.7.2.5
-
diff --git a/patches/series b/patches/series
index cd43f98..0c1a548 100644
--- a/patches/series
+++ b/patches/series
@@ -30,6 +30,5 @@ armhf-bridges-fix-armv4t-armel.diff
move-binfilter-mimetypes-in-extra-desktop-file.diff
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
armhf-bridges-doubles.diff
-nsplugin-fix-SimpleFileAccess-instance.diff
debian-hardened-buildflags.diff
fix-quickstart-shutdown.diff
diff --git a/rules b/rules
index 8e302ef..1f56f29 100755
--- a/rules
+++ b/rules
@@ -63,9 +63,9 @@ export QUILT_OPTIONS="-p1 -F0"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.5.1.1 libreoffice-3.5.1.1
-GIT_TAG=libreoffice-3.5.1.1
-GIT_BRANCH=tag-libreoffice-3.5.1.1
+# use ./g checkout -b tag-libreoffice-3.5.1.2 libreoffice-3.5.1.2
+GIT_TAG=libreoffice-3.5.1.2
+GIT_BRANCH=tag-libreoffice-3.5.1.2
SOURCE_TREE=.
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/src
--
LibreOffice packaging repository
Reply to: