Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2014-02-28 19:19:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2014-02-12 09:45:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2014-02-28 19:19:34.000000000 +0100 @@ -1,0 +2,45 @@ +Fri Feb 28 09:11:39 UTC 2014 - tchva...@suse.com + +- Uk does not have the mythes too in suse. + +------------------------------------------------------------------- +Thu Feb 27 09:49:11 UTC 2014 - tchva...@suse.com + +- Latvians do not have mythes so remove it from the dep. + +------------------------------------------------------------------- +Wed Feb 26 14:32:01 UTC 2014 - tchva...@suse.com + +- Fix installing of sdk symlinks needed for working 3rd party + plugins. + +- added patches: + * fix-sdk-install.patch + +------------------------------------------------------------------- +Tue Feb 25 20:10:44 UTC 2014 - tchva...@suse.com + +- Version bump to 4.2.1: + * Fixes over 100 found bugs found during the first release + testing. + +------------------------------------------------------------------- +Wed Feb 19 09:55:10 CET 2014 - tchva...@suse.com + +- remove duped pt-PT setting + +------------------------------------------------------------------- +Wed Feb 12 13:34:12 UTC 2014 - fcro...@suse.com + +- Fix vlc macro again (thanks rudi) +- Fix typo in description +- Fix nl and nn language subpackage incorrectly requiring + unexisting thesaurus package. + +------------------------------------------------------------------- +Wed Feb 12 10:25:31 UTC 2014 - tchva...@suse.com + +- Try to provide other older translation packages to avoid + various collisions as reported by repo-checker. + +------------------------------------------------------------------- Old: ---- libreoffice-4.2.0.4.tar.xz libreoffice-help-4.2.0.4.tar.xz libreoffice-translations-4.2.0.4.tar.xz New: ---- fix-sdk-install.patch libreoffice-4.2.1.1.tar.xz libreoffice-help-4.2.1.1.tar.xz libreoffice-translations-4.2.1.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.RiaGOH/_old 2014-02-28 19:19:39.000000000 +0100 +++ /var/tmp/diff_new_pack.RiaGOH/_new 2014-02-28 19:19:39.000000000 +0100 @@ -31,9 +31,9 @@ %define numbertext_version 0.9.5 # Urls %define external_url http://dev-www.libreoffice.org/src/ -%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.2.0/ +%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.2.1/ Name: libreoffice -Version: 4.2.0.4 +Version: 4.2.1.1 Release: 0 Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C @@ -95,6 +95,8 @@ Patch13: jvmfwk-disable-gcj.diff # Fix running wizzards in py2 as the utf is not htere Patch16: wizards-create-temlates-with-python-2.6.diff +# Fix ure links, will be fixed with next release +Patch17: fix-sdk-install.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: ImageMagick @@ -238,7 +240,7 @@ Obsoletes: %{name}-l10n-prebuild < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64 -%if %{with_vlc} +%if %{with vlc} BuildRequires: vlc-devel %endif # we need a JRE for oobase and the other stuff @@ -272,7 +274,7 @@ - libreoffice-kde - libreoffice-gnome -Non-English localizations are provided by extra packges as well, for +Non-English localizations are provided by extra packages as well, for example: - libreoffice-l10n-de @@ -764,7 +766,7 @@ %langpack -l de -n German -M -T -X %langpack -l dz -n Dzongkha -s ctl -T %langpack -l el -n Greek -M -T -%langpack -l en -n English -m en-US -L en-US -T -X +%langpack -l en -n English -m en-US -L en-US -T -X -p en-GB -p en-ZA %langpack -l es -n Spanish -M -T -X %langpack -l et -n Estonian -T %langpack -l eu -n Basque -T @@ -773,9 +775,9 @@ %langpack -l fr -n French -M -T -X %langpack -l ga -n Irish -M %langpack -l gl -n Galician -T -%langpack -l gu -n Gujarati -s ctl -T +%langpack -l gu -n Gujarati -s ctl -T -p gu-IN %langpack -l he -n Hebrew -s ctl -T -%langpack -l hi -n Hindi -s ctl -T +%langpack -l hi -n Hindi -s ctl -T -p hi-IN %langpack -l hr -n Croatian -T %langpack -l hu -n Hungarian -M -T -X %langpack -l it -n Italian -M -T -X @@ -784,23 +786,23 @@ %langpack -l kn -n Kannada %langpack -l ko -n Korean -s cjk -T -c korea -X %langpack -l lt -n Lithuanian -%langpack -l lv -n Latvian -M +%langpack -l lv -n Latvian %langpack -l mai -n Maithili %langpack -l ml -n Malayalam %langpack -l mr -n Marathi %langpack -l nb -n Bokmal -M -T -%langpack -l nl -n Dutch -M -T -X -%langpack -l nn -n Nynorsk -M -T +%langpack -l nl -n Dutch -T -X +%langpack -l nn -n Nynorsk -T %define langpack_lang Southern Ndebele %langpack -l nr -n %{langpack_lang} %define langpack_lang Northern Sotho %langpack -l nso -n %{langpack_lang} %langpack -l or -n Odia -s ctl -%langpack -l pa -n Punjabi -s ctl -L pa-IN +%langpack -l pa -n Punjabi -s ctl -L pa-IN -p pa-IN %langpack -l pl -n Polish -M -T -X %define langpack_lang Brazilian Portuguese %langpack -l pt-BR -n %{langpack_lang} -m pt -p pt_BR -T -X -%langpack -l pt-PT -n Portuguese -m pt -p pt_PT -T -L pt -x pt +%langpack -l pt-PT -n Portuguese -m pt -T -L pt -x pt %langpack -l ro -n Romanian -M %langpack -l ru -n Russian -M -T -X %langpack -l si -n Sinhalese -S ctl -T @@ -817,13 +819,13 @@ %langpack -l tn -n Tswana %langpack -l tr -n Turkish -T -X %langpack -l ts -n Tsonga -%langpack -l uk -n Ukrainian -M -T +%langpack -l uk -n Ukrainian -T %langpack -l ve -n Venda %langpack -l xh -n Xhosa %define langpack_lang Simplified Chinese -%langpack -l zh-Hans -n %{langpack_lang} -p zh_CN -s cjk -T -L zh-CN -x zh-CN +%langpack -l zh-Hans -n %{langpack_lang} -p zh-CN -s cjk -T -L zh-CN -x zh-CN %define langpack_lang Traditional Chinese -%langpack -l zh-Hant -n %{langpack_lang} -p zh_TW -s cjk -T -L zh-TW -x zh-TW +%langpack -l zh-Hant -n %{langpack_lang} -p zh-TW -s cjk -T -L zh-TW -x zh-TW %langpack -l zu -n Zulu %undefine langpack_lang @@ -838,6 +840,7 @@ %patch12 %patch13 -p1 %patch16 -p1 +%patch17 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} @@ -963,7 +966,7 @@ --enable-scripting-javascript \ --enable-telepathy \ --enable-opengl \ -%if %{with_vlc} +%if %{with vlc} --enable-vlc \ %endif --enable-neon \ ++++++ fix-sdk-install.patch ++++++ diff --git a/Repository.mk b/Repository.mk index 3977ac3..578ebd4c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -618,7 +618,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) endif -$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ +$(eval $(call gb_Helper_register_libraries_for_install,RTVERLIBS,ure, \ cppuhelper \ purpenvhelper \ salhelper \ @@ -632,7 +632,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ pythonloader \ )) -$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ +$(eval $(call gb_Helper_register_libraries_for_install,UNOVERLIBS,ure, \ cppu \ sal \ )) diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 1ec649d..d55c304 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -165,6 +165,28 @@ ComponentCondition = cond; \ End +#ifdef MACOSX +// links are craeted at configure time by odk/config/setsdkenv_unix.sh.in +#define SDK_LIBRARY_LINK(id,name,target) +#elif defined(WNT) +#define SDK_LIBRARY_LINK(id,name,target) \ + File id \ + TXT_FILE_BODY; \ + Styles = (PACKED); \ + Dir = gid_Dir_Lib_Sdk; \ + Name = name; \ + End +#else +#define SDK_LIBRARY_LINK(id,name,target) \ + Unixlink id \ + BIN_FILE_BODY; \ + Styles = (); \ + Dir = gid_Dir_Lib_Sdk; \ + Name = name; \ + Target = target; \ + End +#endif + #define STD_LIB_FILE(id,name) \ File id \ Name = LIBNAME(name); \ diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 3cf19c2..0fb18d9 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -94,13 +94,6 @@ End // Public Dynamic Libraries: -File gid_File_Dl_Cppu - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_UNO_VER("cppu", "3"); - Styles = (PACKED); -End - #ifdef AIX Unixlink gid_Unixlink_File_Dl_Cppu BIN_FILE_BODY; @@ -111,13 +104,6 @@ Unixlink gid_Unixlink_File_Dl_Cppu End #endif -File gid_File_Dl_Cppuhelper - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3"); - Styles = (PACKED); -End - #ifdef AIX Unixlink gid_Unixlink_File_Dl_Cppuhelper BIN_FILE_BODY; @@ -128,13 +114,6 @@ Unixlink gid_Unixlink_File_Dl_Cppuhelper End #endif -File gid_File_Dl_PurpEnvHelper - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3"); - Styles = (PACKED); -End - #ifdef AIX Unixlink gid_Unixlink_File_Dl_PurpEnvHelper BIN_FILE_BODY; @@ -145,13 +124,6 @@ Unixlink gid_Unixlink_File_Dl_PurpEnvHelper End #endif -File gid_File_Dl_Sal - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_UNO_VER("sal", "3"); - Styles = (PACKED); -End - #ifdef AIX Unixlink gid_Unixlink_File_Dl_Sal BIN_FILE_BODY; @@ -162,13 +134,6 @@ Unixlink gid_Unixlink_File_Dl_Sal End #endif -File gid_File_Dl_Salhelper - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3"); - Styles = (PACKED); -End - #ifdef AIX Unixlink gid_Unixlink_File_Dl_Salhelper BIN_FILE_BODY; diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index c03b664..f73e3e8 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -59,6 +59,11 @@ Directory gid_Dir_Sdkoo_Bin DosName = "bin"; End +Directory gid_Dir_Lib_Sdk + ParentID = gid_Dir_Sdkoo_Sdk; + DosName = "lib"; +End + Module gid_Module_Root_SDK Name = "sdkoo"; Description = "sdkoo"; diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk index a754485..09f2378 100644 --- a/solenv/gbuild/AutoInstall.mk +++ b/solenv/gbuild/AutoInstall.mk @@ -24,9 +24,12 @@ $(call gb_AutoInstall_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoI echo "/* autogenerated installs for group $* */" > $@ $(call gb_AutoInstall__make_define,\ $(foreach lib,$(gb_Library_MODULE_$*),auto_$*_lib_$(lib)) \ + $(foreach lib,$(gb_SdkLinkLibrary_MODULE_$*),auto_$*_link_$(lib)) \ $(foreach exe,$(gb_Executable_MODULE_$*),auto_$*_exe_$(exe))) $(foreach lib,$(gb_Library_MODULE_$*),\ echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;) + $(foreach lib,$(gb_SdkLinkLibrary_MODULE_$*),\ + echo 'SDK_LIBRARY_LINK(auto_$*_link_$(lib),$(notdir $(call gb_Library_get_sdk_link_lib,$(lib))),../../ure-link/lib/$(call gb_Library_get_runtime_filename,$(lib)))' >> $@;) $(foreach exe,$(gb_Executable_MODULE_$*),\ echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst -,_,$(exe)),$(call gb_Executable_get_filename,$(exe)))" >> $@;) diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index a22f2f8..483aced 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -156,11 +156,15 @@ endef # the first argument is the group, which sets rpaths etc. # the second argument is the install module, which describes in which distro package/msi a lib should show up +# UGLY: for versioned libraries "sdk" module is hard-coded for now define gb_Helper_register_libraries_for_install $(call gb_Helper_register_libraries,$(1),$(3)) gb_Library_MODULE_$(2) += $(filter-out $(gb_MERGEDLIBS) $(gb_URELIBS),$(3)) +$(if $(filter UNOVERLIBS RTVERLIBS,$(1)),\ + gb_SdkLinkLibrary_MODULE_sdk += $(3)) + endef define gb_Helper_register_jars diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk b/solenv/gbuild/extensions/post_PackageInfo.mk index aa16e0d..e0916b4 100644 --- a/solenv/gbuild/extensions/post_PackageInfo.mk +++ b/solenv/gbuild/extensions/post_PackageInfo.mk @@ -27,6 +27,7 @@ gb_PackageInfo_InstallModules := \ define gb_PackageInfo_emit_binaries_command @touch $(foreach suf,executables libraries files,$(gb_PackageInfo_get_target)/$(1).$(suf)) @$(foreach executable,$(gb_Executable_MODULE_$(1)),echo "$(patsubst $(INSTDIR)/%,%,$(call gb_Executable_get_target,$(executable)))" >> $(gb_PackageInfo_get_target)/$(1).executables &&) true +@$(foreach library,$(gb_SdkLinkLibrary_MODULE_$(1)),echo "sdk/lib/$(call gb_Library_get_linktarget,$(library))" >> $(gb_PackageInfo_get_target)/$(1).sdklinklibraries &&) true @$(foreach library,$(gb_Library_MODULE_$(1)),echo "$(patsubst $(INSTDIR)/%,%,$(call gb_Library_get_target,$(library)))" >> $(gb_PackageInfo_get_target)/$(1).libraries &&) true endef @@ -89,6 +90,10 @@ install-package-%: $(foreach filelist,files executables libraries,$(gb_PackageIn do \ install -D $(INSTDIR)/$${executable} $(INSTALLDIR)/$${executable} ;\ done + for library in `cat $(gb_PackageInfo_get_target)/$*.sdklinklibraries`; \ + do \ + install -D -m644 $(INSTDIR)/$${library} $(INSTALLDIR)/$${library}; \ + done for library in `cat $(gb_PackageInfo_get_target)/$*.libraries`; \ do \ install -D -m644 $(INSTDIR)/$${library} $(INSTALLDIR)/$${library}; \ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 4c5454c..603f0e0 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -348,6 +348,7 @@ define gb_Library_get_ilibfilename $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_ILIBFILENAMES))) endef +gb_Library_get_sdk_link_lib = $(gb_Library_get_ilib_target) # StaticLibrary class diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index c46cba1..cd5c0c3 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -246,6 +246,8 @@ endef gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script) +gb_Library_get_sdk_link_lib = $(gb_Library_get_versionlink_target) + # bundle is a special kind of library that exists only on Darwin/OSX # set the TARGETTYPE to Bundle, and clear install_name(RPATH) define gb_Library_Bundle diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index ac5218c..870004f 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -265,6 +265,8 @@ define gb_Library_get_ilibfilename $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_ILIBFILENAMES))) endef +gb_Library_get_sdk_link_lib = $(gb_Library_get_ilib_target) + # Executable class gb_Executable_EXT := .exe diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 2115a4a..8019fcd 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -273,6 +273,8 @@ endef gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script) +gb_Library_get_sdk_link_lib = $(gb_Library_get_versionlink_target) + # Executable class gb_Executable_EXT := diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 75d5d21..1276e57 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -271,6 +271,7 @@ endef gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script) +gb_Library_get_sdk_link_lib = $(gb_Library_get_versionlink_target) # Executable class -- 1.7.9.5 ++++++ libreoffice-4.2.0.4.tar.xz -> libreoffice-4.2.1.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-4.2.0.4.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-4.2.1.1.tar.xz differ: char 26, line 1 ++++++ libreoffice-help-4.2.0.4.tar.xz -> libreoffice-help-4.2.1.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-4.2.0.4/ChangeLog-helpcontent2 new/libreoffice-4.2.1.1/ChangeLog-helpcontent2 --- old/libreoffice-4.2.0.4/ChangeLog-helpcontent2 2014-01-27 23:27:17.000000000 +0100 +++ new/libreoffice-4.2.1.1/ChangeLog-helpcontent2 2014-02-13 01:48:23.000000000 +0100 @@ -1,42 +1,43 @@ -2014-01-27 Christian Lohmaier <lohmaier+libreoff...@googlemail.com> [e0cd45b60d5060b0cf46e7e57bddf0929d76576f] +2014-02-13 Christian Lohmaier <lohmaier+libreoff...@googlemail.com> [a4f28dd1ee5a7dd54098c4afb6b2b9b4692fdaac] -Version 4.2.0.4, tag libreoffice-4.2.0.4 +Version 4.2.1.1, tag libreoffice-4.2.1.1 -Change-Id: I82d24b3a45c7077e379442a1517825ab5494080a +Change-Id: I6a5196bc2be6197f847e18d273199749e649d2d0 -2014-01-13 Zolnai Tamás <tamas.zol...@collabora.com> [ca49962e87a88c3d3bd21bed5786150aa9e40f3d] +2014-02-13 Christian Lohmaier <lohmaier+libreoff...@googlemail.com> [1fe8b6e3c8b0114446df4c9032cbed955c023acd] + +Branch libreoffice-4-2-1 + +This is 'libreoffice-4-2-1' - the stable branch for the 4.2.1 release. +Only very safe changes, reviewed by three people are allowed. + +If you want to commit more complicated fix for the next 4.2.x release, +please use the 'libreoffice-4-2' branch. + +If you want to build something cool, unstable, and risky, use master. + +Change-Id: I8f624ff77adc101fa94c41988506ca66f4d0a31b + +2014-01-11 Zolnai Tamás <tamas.zol...@collabora.com> [7d73db5cf05eb0cd0c01536667fc021367b0aa92] fdo#72420: Startcenter: make all helpid point to startcenter's main help page Until the specific ui elements don't have own help pages. With this we can avoid to open an empty help page by pushing F1 or clicking on Help button. -Four ui elements' helpid is not set yet: 'Extensions' button, 'Help' button, -recent docs view. +Only two ui element's helpid is not set yet: 'Extensions' button +and recent docs view. (cherry picked from commit 0f7b9d00562b8d87d1fb12bb21555907d3f0e874) -Conflicts: - source/text/shared/guide/startcenter.xhp - Change-Id: Ic0c1bd1dba4c08fd6b3d9daf8fbc9e622a54b6f2 -Reviewed-on: https://gerrit.libreoffice.org/7396 -Reviewed-by: Andras Timar <andras.ti...@collabora.com> -Tested-by: Andras Timar <andras.ti...@collabora.com> - -2014-01-07 Christian Lohmaier <lohmaier+libreoff...@googlemail.com> [7cf30c2b3454e97ca342ffb655b08fe51bdaae65] -Branch libreoffice-4-2-0 - -This is 'libreoffice-4-2-0' - the stable branch for the 4.2.0 release. -Only very safe changes, reviewed by three people are allowed. +2014-01-10 Zolnai Tamás <tamas.zol...@collabora.com> [575bdc7ccc52b73b55f12c3d82f5b6b2750d784d] -If you want to commit more complicated fix for the next 4.2.x release, -please use the 'libreoffice-4-2' branch. - -If you want to build something cool, unstable, and risky, use master. +fdo#72420 Startcenter: help button point to local/wiki help, help part -Change-Id: I96d06ae92e4994c2f16ca0933c6377ab19a1d1c6 +Change-Id: Iec82887c2b8476037f4069aa979763d363e17690 +(cherry picked from commit 72d802a9eb9fb042e18ad74dc15c956a301b0462) 2013-12-12 Eike Rathke <er...@redhat.com> [ced1a84353e7bc399b078b55b2f911dabcce9ba2] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-4.2.0.4/helpcontent2/source/text/shared/guide/startcenter.xhp new/libreoffice-4.2.1.1/helpcontent2/source/text/shared/guide/startcenter.xhp --- old/libreoffice-4.2.0.4/helpcontent2/source/text/shared/guide/startcenter.xhp 2014-01-27 22:35:31.000000000 +0100 +++ new/libreoffice-4.2.1.1/helpcontent2/source/text/shared/guide/startcenter.xhp 2014-02-13 01:31:03.000000000 +0100 @@ -33,7 +33,8 @@ <bookmark xml-lang="en-US" branch="hid/FWK_HID_BACKINGWINDOW" id="bm_id0820200802550234" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:Info" id="bm_id0820200802550235" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:Extensions" id="bm_id0820200802550236" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/sfx2/ui/startcenter/all_recent" id="bm_id0820200802550237" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/sfx2/ui/startcenter/StartCenter" id="bm_id0820200802550237" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/sfx2/ui/startcenter/all_recent" id="bm_id0820200802550238" localize="false"/> <paragraph xml-lang="en-US" id="hd_id0820200802524447" role="heading" level="1" l10n="NEW"><variable id="startcenter"><link href="text/shared/guide/startcenter.xhp">Start Center</link> </variable></paragraph> <paragraph xml-lang="en-US" id="par_id0820200803204063" role="paragraph" l10n="NEW">Welcome to %PRODUCTNAME. Thank you for using the %PRODUCTNAME <link href="text/shared/05/00000110.xhp">application help</link>. Press F1 whenever you need help using the %PRODUCTNAME software.</paragraph> ++++++ libreoffice-translations-4.2.0.4.tar.xz -> libreoffice-translations-4.2.1.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-4.2.0.4.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-4.2.1.1.tar.xz differ: char 26, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
