Hello community, here is the log from the commit of package koffice2 checked in at Mon Jul 21 22:48:27 CEST 2008. -------- --- KDE/koffice2/koffice2.changes 2008-06-24 22:33:05.000000000 +0200 +++ koffice2/koffice2.changes 2008-07-18 14:22:11.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 18 14:22:07 CEST 2008 - stbinner@suse.de + +- update to KOffice 2.0 Alpha 9 + +------------------------------------------------------------------- koffice2-doc.changes: same change Old: ---- disable-kplato.diff koffice-1.9.95.8.tar.bz2 New: ---- FIXME.diff koffice-1.9.95.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ koffice2-doc.spec ++++++ --- /var/tmp/diff_new_pack.G32203/_old 2008-07-21 22:47:48.000000000 +0200 +++ /var/tmp/diff_new_pack.G32203/_new 2008-07-21 22:47:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package koffice2-doc (Version 1.9.95.8) +# spec file for package koffice2-doc (Version 1.9.95.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,7 +19,7 @@ Group: Productivity/Office/Suite Summary: Documentation of the KDE Office Suite Url: http://www.koffice.org -Version: 1.9.95.8 +Version: 1.9.95.9 Release: 1 Source0: koffice-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,6 +68,8 @@ %doc %lang(en) /usr/share/doc/kde/HTML/en/thesaurus %changelog +* Fri Jul 18 2008 stbinner@suse.de +- update to KOffice 2.0 Alpha 9 * Tue Jun 24 2008 stbinner@suse.de - update to KOffice 2.0 Alpha 8 * Wed May 07 2008 dmueller@suse.de ++++++ koffice2.spec ++++++ --- /var/tmp/diff_new_pack.G32203/_old 2008-07-21 22:47:49.000000000 +0200 +++ /var/tmp/diff_new_pack.G32203/_new 2008-07-21 22:47:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package koffice2 (Version 1.9.95.8) +# spec file for package koffice2 (Version 1.9.95.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -22,18 +22,16 @@ Group: Productivity/Office/Suite Summary: Libraries and Base Files for the KDE Office Suite Url: http://www.koffice.org -Version: 1.9.95.8 +Version: 1.9.95.9 Release: 1 Source0: koffice-%version.tar.bz2 Source1: _upstream Patch: desktop-files.diff -Patch1: disable-kplato.diff +Patch1: FIXME.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Suggests: koffice2-kformula koffice2-kword koffice2-kchart -%if 0 -Suggest: koffice2-kplato -%endif +Suggests: koffice2-kplato Suggests: koffice2-karbon koffice2-krita koffice2-kspread koffice2-doc Suggests: koffice2-kexi koffice2-kivio koffice2-kpresenter koffice2-kthesaurus @@ -59,9 +57,7 @@ %install cd build %makeinstall -%if 0 %create_subdir_filelist -d kplato -v devel -%endif %create_subdir_filelist -d kexi -v devel %create_subdir_filelist -d kformula -v devel %create_subdir_filelist -d krita -v devel @@ -84,10 +80,8 @@ %endif %suse_update_desktop_file kformula Office WordProcessor %suse_update_desktop_file kivio Office FlowChart -%if 0 %suse_update_desktop_file kplato Office ProjectManagement %suse_update_desktop_file kplatowork Office ProjectManagement -%endif %suse_update_desktop_file -r krita Graphics RasterGraphics %suse_update_desktop_file kspread Office Spreadsheet %suse_update_desktop_file kword Office WordProcessor @@ -253,7 +247,8 @@ /usr/share/kde4/apps/kpresenter/kpartplugins/scan-kpresenter.rc /usr/%_lib/kde4/libpowerpointimport.so /usr/share/kde4/services/kpresenter_powerpoint_import.desktop -%if 0 +/usr/%_lib/kde4/libFilterkpr2odf.so +/usr/share/kde4/services/Filterkpr2odf.desktop %package kplato License: GPL v2 or later; LGPL v2.1 or later @@ -280,7 +275,8 @@ %defattr(-,root,root) %doc COPYING COPYING.LIB README /usr/share/kde4/apps/kplatowork -%endif +%dir /usr/share/icons/hicolor/45x45 +%dir /usr/share/icons/hicolor/45x45/mimetypes %package karbon License: GPL v2 or later; LGPL v2.1 or later @@ -439,9 +435,7 @@ License: GPL v2 or later; LGPL v2.1 or later Group: Productivity/Office/Suite Summary: The Build Enviroment from KOffice -%if 0 Requires: koffice2-kplato -%endif Requires: koffice2-kexi koffice2-kformula koffice2-krita koffice2-kword Requires: koffice2-kspread koffice2-karbon koffice2-kchart koffice2-kpresenter koffice2-kivio @@ -501,7 +495,6 @@ /usr/%_lib/kde4/textvariables.so /usr/%_lib/kde4/divineproportionshape.so /usr/%_lib/kde4/simpletextshape.so -/usr/%_lib/kde4/tableshape.so /usr/%_lib/libflake.so.* /usr/%_lib/libkochart.so.* /usr/%_lib/libkoffice_graya_u16.so.* @@ -540,7 +533,6 @@ %_kde_share_dir/services/xslt_import.desktop %_kde_share_dir/services/kofficedockers.desktop %_kde_share_dir/services/simpletextshape.desktop -%_kde_share_dir/services/tableshape.desktop %_kde_share_dir/servicetypes/flake.desktop %_kde_share_dir/servicetypes/flakeshape.desktop %_kde_share_dir/servicetypes/flakedevice.desktop @@ -574,12 +566,6 @@ %dir /usr/share/color %dir /usr/share/color/icc %dir /usr/share/kde4/apps/koffice -%dir /usr/share/kde4/apps/koffice/icons/oxygen/16x16 -%dir /usr/share/kde4/apps/koffice/icons/oxygen/16x16/actions -%dir /usr/share/kde4/apps/koffice/icons/oxygen/32x32 -%dir /usr/share/kde4/apps/koffice/icons/oxygen/32x32/actions -%dir /usr/share/kde4/apps/koffice/icons/oxygen/48x48 -%dir /usr/share/kde4/apps/koffice/icons/oxygen/48x48/actions %dir /usr/share/kde4/apps/koffice/icons %dir /usr/share/kde4/apps/koffice/icons/crystalsvg %dir /usr/share/kde4/apps/koffice/icons/crystalsvg/scalable @@ -781,7 +767,6 @@ /usr/%_lib/kde4/libkchartsvgexport.so /usr/share/kde4/apps/koffice/icons/hicolor/*/actions/view-sort-ascending.* /usr/share/kde4/apps/koffice/icons/hicolor/*/actions/view-sort-descending.* -/usr/share/kde4/apps/koffice/icons/oxygen/*/actions/table.* /usr/share/kde4/services/kchart_bmp_export.desktop /usr/share/kde4/services/kchart_jpeg_export.desktop /usr/share/kde4/services/kchart_mng_export.desktop @@ -789,8 +774,24 @@ /usr/share/kde4/services/kchart_svg_export.desktop /usr/share/kde4/services/kchart_xbm_export.desktop /usr/share/kde4/services/kchart_xpm_export.desktop +/usr/share/kde4/servicetypes/presentationeventaction.desktop +/usr/share/kde4/servicetypes/scripteventaction.desktop +/usr/share/icons/oxygen/*/actions/table.* +/usr/share/icons/oxygen/*/actions/aoleft.* +/usr/share/icons/oxygen/*/actions/object-arrange-back.* +/usr/share/icons/oxygen/*/actions/object-arrange-front.* +/usr/share/icons/oxygen/*/actions/object-arrange-lower.* +/usr/share/icons/oxygen/*/actions/object-arrange-raise.* +/usr/share/icons/oxygen/*/actions/shape-choose.* +/usr/share/icons/oxygen/*/actions/x-shape-chart.* +/usr/share/icons/oxygen/*/actions/x-shape-connection.* +/usr/share/icons/oxygen/*/actions/x-shape-formula.* +/usr/share/icons/oxygen/*/actions/x-shape-image.* +/usr/share/icons/oxygen/*/actions/x-shape-text.* %changelog +* Fri Jul 18 2008 stbinner@suse.de +- update to KOffice 2.0 Alpha 9 * Tue Jun 24 2008 stbinner@suse.de - update to KOffice 2.0 Alpha 8 * Wed May 07 2008 dmueller@suse.de ++++++ FIXME.diff ++++++ Index: filters/kword/msword-odf/mswordodfimport.cpp =================================================================== --- filters/kword/msword-odf/mswordodfimport.cpp (revision 834920) +++ filters/kword/msword-odf/mswordodfimport.cpp (working copy) @@ -75,6 +75,8 @@ stylesWriter->startElement( "office:automatic-styles" ); stylesWriter->endElement(); //office:automatic-styles //need to close office:document-styles & endDocument() below! + + return true; } //bool MSWordOdfImport::Private::createManifest(KoOdfWriteStore* store) Index: plugins/textshape/Layout.cpp =================================================================== --- plugins/textshape/Layout.cpp (revision 834920) +++ plugins/textshape/Layout.cpp (working copy) @@ -869,6 +869,8 @@ case KoCharacterStyle::LengthLineWeight: return width; } + + return 0.0; } // Decorate any tabs ('\t's) in 'currentFragment' and laid out in 'line'. ++++++ koffice-1.9.95.8.tar.bz2 -> koffice-1.9.95.9.tar.bz2 ++++++ KDE/koffice2/koffice-1.9.95.8.tar.bz2 koffice2/koffice-1.9.95.9.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de