[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#858462: unblock: libreoffice/1:5.2.6-2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package libreoffice

This is a new upstream release and a RC bugfix.

When filtering out the CREDITS and two new test files a upstream diffstat
for 5.2.5->5.2.6 is
$ git diff libreoffice-5.2.5.1 libreoffice-5.2.6.2 | filterdiff -x *dxf | filterdiff -x *CREDITS.fodt | diffstat
 .gitreview                                                 |    2 
 accessibility/source/standard/vclxaccessibletabcontrol.cxx |   11 
 basctl/source/basicide/moduldlg.cxx                        |    4 
 bin/lo-pack-sources                                        |    9 
 canvas/source/cairo/cairo_canvashelper.cxx                 |    6 
 canvas/source/directx/dx_9rm.cxx                           |   19 -
 comphelper/source/misc/storagehelper.cxx                   |   46 ++-
 configure.ac                                               |    2 
 connectivity/source/drivers/jdbc/Reader.cxx                |    2 
 cui/source/factory/init.cxx                                |    2 
 cui/uiconfig/ui/paraindentspacing.ui                       |    1 
 dbaccess/qa/complex/dbaccess/RowSet.java                   |    7 
 desktop/source/app/sofficemain.cxx                         |    3 
 download.lst                                               |    4 
 editeng/source/editeng/eerdll.cxx                          |   12 
 editeng/source/editeng/eerdll2.hxx                         |    4 
 editeng/source/editeng/impedit.hxx                         |    2 
 editeng/source/editeng/impedit2.cxx                        |   32 --
 editeng/source/misc/svxacorr.cxx                           |    6 
 external/curl/curl-7.26.0_win-proxy.patch                  |   12 
 external/curl/curl-msvc.patch.1                            |    8 
 extras/source/autocorr/lang/ca/DocumentList.xml            |    6 
 filter/source/graphicfilter/idxf/dxf2mtf.cxx               |    6 
 filter/source/graphicfilter/idxf/dxfentrd.cxx              |   15 -
 filter/source/graphicfilter/idxf/dxfentrd.hxx              |   25 -
 filter/source/graphicfilter/idxf/dxfgrprd.cxx              |    4 
 filter/source/graphicfilter/idxf/dxfgrprd.hxx              |    1 
 filter/source/graphicfilter/idxf/dxfreprd.cxx              |    7 
 filter/source/graphicfilter/idxf/dxfreprd.hxx              |    2 
 filter/source/graphicfilter/ieps/ieps.cxx                  |  168 ++++++++-----
 filter/source/graphicfilter/ios2met/ios2met.cxx            |    4 
 framework/source/services/frame.cxx                        |   13 -
 i18npool/Library_localedata_others.mk                      |    1 
 i18npool/source/localedata/data/en_MY.xml                  |   34 ++
 i18npool/source/localedata/localedata.cxx                  |    1 
 include/comphelper/storagehelper.hxx                       |    6 
 include/oox/core/xmlfilterbase.hxx                         |    6 
 include/sal/log-areas.dox                                  |    1 
 include/sfx2/sidebar/SidebarController.hxx                 |   10 
 include/svx/dialogs.hrc                                    |    3 
 include/svx/sdr/table/tablecontroller.hxx                  |    3 
 include/svx/selectioncontroller.hxx                        |    4 
 include/vcl/ctrl.hxx                                       |   16 -
 officecfg/registry/data/org/openoffice/Office/Common.xcu   |    2 
 oox/source/core/xmlfilterbase.cxx                          |    8 
 oox/source/drawingml/graphicshapecontext.cxx               |   17 +
 oox/source/export/drawingml.cxx                            |   28 ++
 oox/source/helper/zipstorage.cxx                           |    4 
 oox/source/ppt/extdrawingfragmenthandler.cxx               |    5 
 oox/source/ppt/pptimport.cxx                               |   28 ++
 oox/source/ppt/slidepersist.cxx                            |    5 
 package/inc/ZipFile.hxx                                    |    5 
 package/source/xstor/xfactory.cxx                          |    4 
 package/source/xstor/xstorage.cxx                          |    3 
 package/source/zipapi/ZipFile.cxx                          |  118 ++++++++-
 package/source/zippackage/ZipPackage.cxx                   |    6 
 sal/osl/w32/dllentry.c                                     |   18 +
 sc/qa/unit/subsequent_export-test.cxx                      |   18 -
 sc/source/core/data/documen2.cxx                           |   15 +
 sc/source/core/data/dpoutput.cxx                           |  112 +++++---
 sc/source/core/data/table1.cxx                             |    4 
 sc/source/core/data/table3.cxx                             |   29 +-
 sc/source/core/tool/token.cxx                              |   13 -
 sc/source/filter/excel/xetable.cxx                         |    9 
 sc/source/filter/excel/xiescher.cxx                        |    2 
 sc/source/ui/app/inputhdl.cxx                              |   11 
 sc/source/ui/condformat/condformatdlg.cxx                  |    7 
 sc/source/ui/dbgui/PivotLayoutDialog.cxx                   |   17 +
 sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx             |   23 -
 sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx            |    7 
 sc/source/ui/drawfunc/fuins2.cxx                           |   17 +
 sc/source/ui/inc/PivotLayoutDialog.hxx                     |    5 
 sc/source/ui/inc/PivotLayoutTreeListBase.hxx               |    3 
 sc/source/ui/navipi/navipi.cxx                             |   28 +-
 sc/source/ui/undo/undoblk3.cxx                             |    8 
 sc/source/ui/view/cellsh1.cxx                              |    1 
 sc/source/ui/view/viewfunc.cxx                             |    4 
 sd/qa/unit/data/odg/ooo124143-1.odg                        |binary
 sd/qa/unit/data/odp/tdf103567.odp                          |binary
 sd/qa/unit/data/pptx/tdf105739.pptx                        |binary
 sd/qa/unit/export-tests.cxx                                |   34 ++
 sd/qa/unit/import-tests.cxx                                |   96 +++++++
 sd/qa/unit/sdmodeltestbase.hxx                             |    4 
 sd/source/ui/animations/CustomAnimationDialog.cxx          |    4 
 sd/source/ui/func/futext.cxx                               |   43 +++
 sd/source/ui/sidebar/SlideBackground.cxx                   |    2 
 sfx2/source/sidebar/SidebarController.cxx                  |   14 +
 svl/source/numbers/zformat.cxx                             |   11 
 svx/source/accessibility/charmapacc.cxx                    |   29 +-
 svx/source/customshapes/EnhancedCustomShape2d.cxx          |    2 
 svx/source/inc/charmapacc.hxx                              |    1 
 svx/source/sdr/contact/viewcontactofsdrpathobj.cxx         |   39 +--
 svx/source/stbctrls/stbctrls.src                           |    5 
 svx/source/svdraw/selectioncontroller.cxx                  |    4 
 sw/inc/ToxLinkProcessor.hxx                                |    9 
 sw/qa/core/test_ToxLinkProcessor.cxx                       |   38 +-
 sw/qa/extras/odfexport/data/tdf103567.odt                  |binary
 sw/qa/extras/odfexport/odfexport.cxx                       |   37 ++
 sw/qa/extras/ooxmlexport/data/tdf104162.docx               |binary
 sw/qa/extras/ooxmlexport/ooxmlexport7.cxx                  |    8 
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx                   |   10 
 sw/qa/extras/uiwriter/data/tdf105417.odt                   |binary
 sw/qa/extras/uiwriter/uiwriter.cxx                         |   27 ++
 sw/source/core/edit/autofmt.cxx                            |    2 
 sw/source/core/layout/flowfrm.cxx                          |    2 
 sw/source/core/text/itrcrsr.cxx                            |    3 
 sw/source/core/text/itrpaint.cxx                           |    3 
 sw/source/core/text/porlay.hxx                             |    1 
 sw/source/core/text/txthyph.cxx                            |    5 
 sw/source/core/tox/ToxLinkProcessor.cxx                    |   18 -
 sw/source/core/unocore/unoobj.cxx                          |    7 
 sw/source/core/unocore/unostyle.cxx                        |    5 
 sw/source/filter/ww8/ww8atr.cxx                            |    2 
 sw/source/filter/xml/xmlimpit.cxx                          |    2 
 sw/source/uibase/dbui/dbmgr.cxx                            |    2 
 sw/source/uibase/docvw/PostItMgr.cxx                       |    2 
 sw/source/uibase/inc/hyp.hxx                               |    3 
 sw/source/uibase/lingu/hyp.cxx                             |    2 
 sw/source/uibase/uiview/view.cxx                           |   13 -
 sw/source/uibase/uno/SwXDocumentSettings.cxx               |   16 -
 sw/source/uibase/utlui/content.cxx                         |  127 ++++-----
 vcl/headless/svpgdi.cxx                                    |   23 +
 vcl/inc/textlayout.hxx                                     |    7 
 vcl/source/control/button.cxx                              |   11 
 vcl/source/control/ctrl.cxx                                |   42 ++-
 vcl/source/control/fixed.cxx                               |    4 
 vcl/source/control/tabctrl.cxx                             |    4 
 vcl/source/filter/ixpm/xpmread.cxx                         |   13 -
 vcl/source/filter/wmf/emfwr.cxx                            |    1 
 vcl/source/filter/wmf/winmtf.cxx                           |    4 
 vcl/source/gdi/metaact.cxx                                 |    2 
 vcl/source/gdi/pdfwriter_impl.cxx                          |   23 +
 vcl/source/gdi/pngread.cxx                                 |   43 ++-
 vcl/source/gdi/svmconverter.cxx                            |  164 ++++++++----
 vcl/source/gdi/textlayout.cxx                              |   56 +++-
 vcl/source/window/dialog.cxx                               |    2 
 vcl/source/window/menu.cxx                                 |    2 
 vcl/unx/gtk/gtksalframe.cxx                                |    4 
 vcl/unx/gtk3/gtk3gtkframe.cxx                              |   10 
 wizards/com/sun/star/wizards/web/BackgroundsDialog.py      |   20 -
 wizards/source/importwizard/DialogModul.xba                |    2 
 wizards/source/importwizard/FilesModul.xba                 |    2 
 wizards/source/tools/ModuleControls.xba                    |    2 
 wizards/source/tools/Strings.xba                           |    2 
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx   |    8 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx          |   27 +-
 xmloff/source/core/xmlmultiimagehelper.cxx                 |    3 
 xmloff/source/draw/ximpshap.cxx                            |   10 
 xmloff/source/text/XMLTextFrameContext.cxx                 |   29 ++
 149 files changed, 1633 insertions(+), 633 deletions(-)

When I asked about this on #debian-release I was told to upload and
see how it survived in unstable.

After 9/10 days without a new bugreport (I tend to interpret this as a good
sign...) #858199 was reported (initially per private mail.).

Which is fixed in 1:5.2.6-2, so please

unblock libreoffice/1:5.2.6-2

Debdiff of 5.2.5->5.2.6 is too big to be attached, available at
htttp://people.debian.org/~rene/libreoffice/5.2.6/5.2.5-2-to-5.2.6-1.debdiff.bz2.
(bigger than the above due to e.g translation changes. And due to (accidential)
upstream ChangeLog removal. But that one isn't installed anyway.)

5.2.6-1 -> 5.2.6-2 attached.

Regards,

Rene
diff -Nru libreoffice-5.2.6/debian/changelog libreoffice-5.2.6/debian/changelog
--- libreoffice-5.2.6/debian/changelog	2017-03-10 16:48:43.000000000 +0100
+++ libreoffice-5.2.6/debian/changelog	2017-03-20 11:46:38.000000000 +0100
@@ -1,3 +1,11 @@
+libreoffice (1:5.2.6-2) unstable; urgency=medium
+
+  * debian/rules:
+    - move /usr/include/libreoffice/sal/typesizes.h symlink to -dev
+      instead of -dev-common (closes: #858199)
+
+ -- Rene Engelhard <rene@debian.org>  Mon, 20 Mar 2017 11:46:38 +0100
+
 libreoffice (1:5.2.6-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru libreoffice-5.2.6/debian/control libreoffice-5.2.6/debian/control
--- libreoffice-5.2.6/debian/control	2017-03-10 16:48:43.000000000 +0100
+++ libreoffice-5.2.6/debian/control	2017-03-20 11:46:38.000000000 +0100
@@ -1171,8 +1171,10 @@
 Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
 Suggests: libmythes-dev, libreoffice-dev-doc, libreofficekit-dev
 Replaces: libreoffice-common (<< 1:4.1.0~beta1),
-          libreoffice-core (<< 1:4.1.0~beta1)
+          libreoffice-core (<< 1:4.1.0~beta1),
+          libreoffice-dev-common (<< 1:5.2.6-2)
 Conflicts: libreoffice (<< 1:5.2.5-2~), libreoffice-dev-doc (<< 1:5.2.5-2~)
+Breaks: libreoffice-dev-common (<< 1:5.2.6-2)
 Description: office productivity suite -- SDK -- architecture-dependent parts
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff -Nru libreoffice-5.2.6/debian/control.sdk.in libreoffice-5.2.6/debian/control.sdk.in
--- libreoffice-5.2.6/debian/control.sdk.in	2017-03-10 16:32:56.000000000 +0100
+++ libreoffice-5.2.6/debian/control.sdk.in	2017-03-19 19:21:19.000000000 +0100
@@ -9,8 +9,9 @@
          ${shlibs:Depends}
 Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
 Suggests: libmythes-dev, libreofficekit-dev, libreoffice-dev-doc
-Replaces: libreoffice-core (<< 1:4.1.0~beta1), libreoffice-common (<< 1:4.1.0~beta1)
+Replaces: libreoffice-core (<< 1:4.1.0~beta1), libreoffice-common (<< 1:4.1.0~beta1), libreoffice-dev-common (<< 1:5.2.6-2)
 Conflicts: libreoffice-dev-doc (<< 1:5.2.5-2~), libreoffice (<< 1:5.2.5-2~)
+Breaks: libreoffice-dev-common (<< 1:5.2.6-2)
 Description: office productivity suite -- SDK -- architecture-dependent parts
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff -Nru libreoffice-5.2.6/debian/rules libreoffice-5.2.6/debian/rules
--- libreoffice-5.2.6/debian/rules	2017-03-10 16:36:20.000000000 +0100
+++ libreoffice-5.2.6/debian/rules	2017-03-20 11:46:27.000000000 +0100
@@ -2316,9 +2316,10 @@
 		$(PKGDIR)-dev-common/usr/include
 	# except include/sal/typesizes.h
 	mkdir -p $(PKGDIR)-dev/usr/include/$(DEB_HOST_MULTIARCH)/libreoffice/sal
+	mkdir -p $(PKGDIR)-dev/usr/include/libreoffice/sal
 	mv $(PKGDIR)-dev-common/usr/include/libreoffice/sal/typesizes.h \
 		$(PKGDIR)-dev/usr/include/$(DEB_HOST_MULTIARCH)/libreoffice/sal
-	cd $(PKGDIR)-dev-common/usr/include/libreoffice/sal/ && \
+	cd $(PKGDIR)-dev/usr/include/libreoffice/sal/ && \
 		ln -s /usr/include/$(DEB_HOST_MULTIARCH)/libreoffice/sal/typesizes.h
 	mkdir -p $(PKGDIR)-dev-common/usr/share/idl
 	mv $(PKGDIR)-dev/usr/share/idl/libreoffice \

Reply to: