Hi, On Mon, May 12, 2014 at 08:50:36PM +0200, Rene Engelhard wrote: > On Thu, May 08, 2014 at 04:00:52PM +0200, Rene Engelhard wrote: > > Note that 4.2.4 includes > > http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-2-4&id=f0c38c8505a523f3bde3ee4fca3e513cdd6044d5 > > > > so you can extend (and should tell upstream to do so if (s)he adapts > > him/herself) the patch in the way that the required > > OpenOffice.org-minimal-versionversion is 4.1. > > Updated debdiff with that one included attached.
Actually that was wrong, that was the original Ubuntu one. Updated debdiff with that one included *now really* attached. Regards, Rene
diff -Nru accessodf-0.1/debian/changelog accessodf-0.1/debian/changelog --- accessodf-0.1/debian/changelog 2013-05-23 00:35:15.000000000 +0200 +++ accessodf-0.1/debian/changelog 2014-05-12 20:45:22.000000000 +0200 @@ -1,3 +1,10 @@ +accessodf (0.1-4.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * add patch to work with AOO 4.1/LO 4.2 (closes: #743634, 747831) + + -- Rene Engelhard <[email protected]> Mon, 12 May 2014 20:34:11 +0200 + accessodf (0.1-4) unstable; urgency=low * add Replaces/Breaks for new packages, to not coexist with older versions diff -Nru accessodf-0.1/debian/control accessodf-0.1/debian/control --- accessodf-0.1/debian/control 2013-05-23 00:40:11.000000000 +0200 +++ accessodf-0.1/debian/control 2014-05-12 20:42:30.000000000 +0200 @@ -3,9 +3,9 @@ Priority: extra Maintainer: Sebastian Humenda <[email protected]> Build-Depends: debhelper (>= 7.0.50~), ant (>= 1.8~), ant-optional, - libcommons-collections3-java, libreoffice-java-common (>= 1:3.5.0~), unzip, + libcommons-collections3-java, libreoffice-java-common (>= 1:4.2.0~), unzip, default-jdk -Standards-Version: 3.9.3 +Standards-Version: 3.9.5 Homepage: http://sourceforge.net/p/accessodf Package: accessodf @@ -45,9 +45,9 @@ Package: libaccessodf-java Architecture: all Replaces: accessodf (<< 0.1-3) -Breaks: accessodf (<< 0.1-3) +Breaks: accessodf (<< 0.1-3), libreoffice-java-common (<< 1:4.2.0~) Depends: ${misc:Depends}, libcommons-collections3-java, - libreoffice-java-common, libreoffice-writer + libreoffice-java-common (>= 1:4.2.0~), libreoffice-writer Description: library for checking accessibility in ODF/ODT documents using Libreoffice AccessODF is an extension that can be used in OpenOffice.org Writer and in LibreOffice Writer. It enables authors to find and repair accessibility issues diff -Nru accessodf-0.1/debian/patches/fix-for-i121544.diff accessodf-0.1/debian/patches/fix-for-i121544.diff --- accessodf-0.1/debian/patches/fix-for-i121544.diff 1970-01-01 01:00:00.000000000 +0100 +++ accessodf-0.1/debian/patches/fix-for-i121544.diff 2014-05-12 20:45:37.000000000 +0200 @@ -0,0 +1,36 @@ +From: Bjoern Michaelsen <[email protected]> +Date: Wed, 02 Apr 2014 11:49:08 +0200 +Subject: adjust for underdocumented change of published API from i#121544 + +this was inherited from AOO + +see also: http://cgit.freedesktop.org/libreoffice/core/commit/?id=805c6101b3427cc98b53f1c48f22f705206c384d + +--- accessodf-0.1.orig/addon/be/docarch/accessodf/ooo/UnoAwtUtils.java ++++ accessodf-0.1/addon/be/docarch/accessodf/ooo/UnoAwtUtils.java +@@ -111,9 +111,7 @@ public class UnoAwtUtils { + // Initialize the message box factory + XMessageBoxFactory messageBoxFactory = (XMessageBoxFactory) UnoRuntime.queryInterface(XMessageBoxFactory.class, parentWindowPeer.getToolkit()); + +- Rectangle messageBoxRectangle = new Rectangle(); +- +- XMessageBox box = messageBoxFactory.createMessageBox(parentWindowPeer, messageBoxRectangle, messageBoxType, messageBoxButtons, messageBoxTitle, message); ++ XMessageBox box = messageBoxFactory.createMessageBox(parentWindowPeer, com.sun.star.awt.MessageBoxType.MESSAGEBOX, messageBoxButtons, messageBoxTitle, message); + return box.execute(); + } + +From: Rene Engelhard <[email protected]> +Date: Mon, 12 May 2014 20:34:11 +0200 +Subject: require correct OO/LO + +--- accessodf-0.1.orig/addon/description.xml-old 2014-05-12 20:43:31.198649017 +0200 ++++ accessodf-0.1/addon/description.xml 2014-05-12 20:43:44.422649400 +0200 +@@ -6,7 +6,7 @@ + <identifier value="be.docarch.accessodf.ooo.accessodfaddon"/> + <!-- OpenOffice.org Minimal Version --> + <dependencies> +- <OpenOffice.org-minimal-version value="3.3" name="OpenOffice.org 3.3"/> ++ <OpenOffice.org-minimal-version value="4.1" name="OpenOffice.org 4.1"/> + </dependencies> + <!-- Auto Update Link: TODO--> + diff -Nru accessodf-0.1/debian/patches/series accessodf-0.1/debian/patches/series --- accessodf-0.1/debian/patches/series 2013-05-17 00:10:47.000000000 +0200 +++ accessodf-0.1/debian/patches/series 2014-05-12 20:42:30.000000000 +0200 @@ -1 +1,2 @@ debian_build_dependencies +fix-for-i121544.diff
