diff -Nru accessodf-0.1/debian/changelog accessodf-0.1/debian/changelog --- accessodf-0.1/debian/changelog 2012-11-09 23:23:58.000000000 +0000 +++ accessodf-0.1/debian/changelog 2014-04-04 16:56:35.000000000 +0000 @@ -1,29 +1,52 @@ -accessodf (0.1-1.3ubuntu1) raring; urgency=low +accessodf (0.1-4ubuntu1~precise1) precise; urgency=medium - * Merge from Debian unstable. Remaining changes: - - Remove B-Ds on openjdk-* in favour of default-jdk - - Add /usr/lib/libreoffice/program to PATH in the maintainer scripts. - Ubuntu doesn't have unopkg in /usr/bin + * Copied from trusty - -- Oussama Bounaim Fri, 09 Nov 2012 18:50:22 +0100 + -- Rico Tzschichholz Fri, 04 Apr 2014 18:54:50 +0200 + +accessodf (0.1-4ubuntu1) trusty; urgency=medium + + * fix for underdocumented change of published API inherited from + https://issues.apache.org/ooo/show_bug.cgi?id=121544 (Closes: #743634) + + -- Bjoern Michaelsen Fri, 04 Apr 2014 16:42:06 +0200 + +accessodf (0.1-4) unstable; urgency=low + + * add Replaces/Breaks for new packages, to not coexist with older versions + of the package + + -- Sebastian Humenda Mon, 20 May 2013 11:26:41 +0200 + +accessodf (0.1-3) unstable; urgency=low + + [ Sebastian Humenda ] + * do not depend on openjdk-6 (Closes: #674578) + * split package into a library and an extension, rename extension to + libreoffice-accessodf (Closes: #684921) + * bump standards-version + + [ Samuel Thibault ] + * Fix duplicate installation of accessodf.jar. + + -- Sebastian Humenda Thu, 16 May 2013 17:13:16 +0200 + +accessodf (0.1-2) unstable; urgency=low + + * {pre,post}{inst|rm}: removed. The cleaner (now working) solution is to + just unzip the package. This method won't leave unowned files behind. + (Closes: #679717) + + -- Sebastian Humenda Mon, 21 Jan 2013 19:01:52 +0200 accessodf (0.1-1.3) unstable; urgency=low * Non-maintainer upload. * oops, forgot a unopkg in preinst, thanks Andreas Beckmann - (closes: #679717) + (closes: #679717) -- Rene Engelhard Fri, 02 Nov 2012 12:32:50 +0100 -accessodf (0.1-1.2ubuntu1) raring; urgency=low - - * Merge from Debian unstable. Remaining changes: - - Remove B-Ds on openjdk-* in favour of default-jdk - - Add /usr/lib/libreoffice/program to PATH in the maintainer scripts. - Ubuntu doesn't have unopkg in /usr/bin - - -- Logan Rosen Wed, 31 Oct 2012 11:29:12 -0400 - accessodf (0.1-1.2) unstable; urgency=low * Non-maintainer upload. @@ -32,15 +55,6 @@ -- Rene Engelhard Tue, 23 Oct 2012 19:53:57 +0200 -accessodf (0.1-1.1ubuntu1) quantal; urgency=low - - * Merge from Debian unstable. Remaining changes: - - Remove B-Ds on openjdk-* in favour of default-jdk (Closes: #674578) - * Add /usr/lib/libreoffice/program to PATH in the maintainer scripts. Ubuntu - doesn't have unopkg in /usr/bin (Closes: #679700). - - -- Stefano Rivera Sat, 30 Jun 2012 22:31:04 +0200 - accessodf (0.1-1.1) unstable; urgency=low * Non-maintainer upload. @@ -50,17 +64,8 @@ -- Samuel Thibault Sat, 30 Jun 2012 00:28:15 -0300 -accessodf (0.1-1ubuntu1) quantal; urgency=low - - * Remove B-D on openjdk-6-jre-headless | openjdk-7-jre-headless, default-jdk - depends on default jre and a preferance for OpenJDK 6, doesn't agree with - Ubuntu's default-jdk using OpenJDK 7 (Closes: #674578) - - -- Stefano Rivera Fri, 25 May 2012 17:09:49 +0100 - accessodf (0.1-1) unstable; urgency=low * Initial release, packaged as a dependency for odt2braille. (Closes: #668144) -- Sebastian Humenda Mon, 09 Apr 2012 11:21:13 +0200 - diff -Nru accessodf-0.1/debian/control accessodf-0.1/debian/control --- accessodf-0.1/debian/control 2012-11-09 23:23:17.000000000 +0000 +++ accessodf-0.1/debian/control 2014-04-04 16:56:15.000000000 +0000 @@ -4,14 +4,24 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Sebastian Humenda Build-Depends: debhelper (>= 7.0.50~), ant (>= 1.8~), ant-optional, - default-jdk, - libcommons-collections3-java, libreoffice-java-common (>= 1:3.5.0~) -Standards-Version: 3.9.2 + libcommons-collections3-java, libreoffice-java-common (>= 1:4.2.0~), unzip, + default-jdk +Standards-Version: 3.9.5 Homepage: http://sourceforge.net/p/accessodf Package: accessodf Architecture: all -Depends: ${misc:Depends}, libcommons-collections3-java, libreoffice-java-common, libreoffice-writer, default-jre +Section: oldlibs +Depends: ${misc:Depends}, libreoffice-accessodf +Description: Transitional package for accessodf to libreoffice-accessodf + This package garantees a smooth upgrade to the new libreoffice-accessodf + package. It can be removed after the upgrade. + +Package: libreoffice-accessodf +Architecture: all +Replaces: accessodf (<< 0.1-3) +Breaks: accessodf (<< 0.1-3) +Depends: ${misc:Depends}, libaccessodf-java Description: Libreoffice extension to check accessibility of ODF documents 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 @@ -32,3 +42,32 @@ talking books. For each accessibility issue, AccessODF provides a description and repair suggestions. + +Package: libaccessodf-java +Architecture: all +Replaces: 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 (>= 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 + in their documents, i.e. issues that make their documents difficult or even + impossible to read for people with disabilities. This includes issues such as: + * insufficient colour contrast between text and background, + * missing text alternatives for images and other objects (such text + alternatives are necessary for blind users and other users of + text-to-speech software), + * missing language identification for the document and for language changes + inside the document (language information is needed for conversion into + Braille and synthetic speech), + * the use of proper Heading styles instead of big bold text to identify + headings (this enables document navigation based on headings), + * the use of proper tables instead of visually mimicking tables by using tabs + or spaces, + * the compatibility of images with DAISY, the de-facto standard for digital + talking books. + For each accessibility issue, AccessODF provides a description and repair + suggestions. + . + This package just contains the library for use in other programs. diff -Nru accessodf-0.1/debian/docs accessodf-0.1/debian/docs --- accessodf-0.1/debian/docs 2012-11-09 23:23:17.000000000 +0000 +++ accessodf-0.1/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/user-guide diff -Nru accessodf-0.1/debian/install accessodf-0.1/debian/install --- accessodf-0.1/debian/install 2012-11-09 23:23:17.000000000 +0000 +++ accessodf-0.1/debian/install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -dist/AccessODF.oxt usr/share/accessodf -dist/lib/accessodf.jar usr/share/java diff -Nru accessodf-0.1/debian/libaccessodf-java.install accessodf-0.1/debian/libaccessodf-java.install --- accessodf-0.1/debian/libaccessodf-java.install 1970-01-01 00:00:00.000000000 +0000 +++ accessodf-0.1/debian/libaccessodf-java.install 2013-05-16 22:59:45.000000000 +0000 @@ -0,0 +1 @@ +dist/lib/accessodf.jar usr/share/java diff -Nru accessodf-0.1/debian/libreoffice-accessodf.docs accessodf-0.1/debian/libreoffice-accessodf.docs --- accessodf-0.1/debian/libreoffice-accessodf.docs 1970-01-01 00:00:00.000000000 +0000 +++ accessodf-0.1/debian/libreoffice-accessodf.docs 2013-05-16 22:59:45.000000000 +0000 @@ -0,0 +1 @@ +debian/user-guide diff -Nru accessodf-0.1/debian/libreoffice-accessodf.install accessodf-0.1/debian/libreoffice-accessodf.install --- accessodf-0.1/debian/libreoffice-accessodf.install 1970-01-01 00:00:00.000000000 +0000 +++ accessodf-0.1/debian/libreoffice-accessodf.install 2013-05-16 22:59:45.000000000 +0000 @@ -0,0 +1,2 @@ +dist/AccessODF.oxt usr/share/accessodf +debian/tmp/usr/lib/libreoffice/share/extensions/accessodf/* diff -Nru accessodf-0.1/debian/libreoffice-accessodf.links accessodf-0.1/debian/libreoffice-accessodf.links --- accessodf-0.1/debian/libreoffice-accessodf.links 1970-01-01 00:00:00.000000000 +0000 +++ accessodf-0.1/debian/libreoffice-accessodf.links 2013-05-16 22:59:45.000000000 +0000 @@ -0,0 +1 @@ +/usr/share/accessodf/accessodf-addon.jar /usr/lib/libreoffice/share/extensions/accessodf/accessodf-addon.jar diff -Nru accessodf-0.1/debian/libreoffice-accessodf.lintian-overrides accessodf-0.1/debian/libreoffice-accessodf.lintian-overrides --- accessodf-0.1/debian/libreoffice-accessodf.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ accessodf-0.1/debian/libreoffice-accessodf.lintian-overrides 2013-05-16 22:59:45.000000000 +0000 @@ -0,0 +1 @@ +libreoffice-accessodf binary: image-file-in-usr-lib 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 00:00:00.000000000 +0000 +++ accessodf-0.1/debian/patches/fix-for-i121544.diff 2014-04-04 14:49:02.000000000 +0000 @@ -0,0 +1,21 @@ +From: Bjoern Michaelsen +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(); + } + diff -Nru accessodf-0.1/debian/patches/remove-hgtags.diff accessodf-0.1/debian/patches/remove-hgtags.diff --- accessodf-0.1/debian/patches/remove-hgtags.diff 1970-01-01 00:00:00.000000000 +0000 +++ accessodf-0.1/debian/patches/remove-hgtags.diff 2013-05-16 22:59:45.000000000 +0000 @@ -0,0 +1,17 @@ +Description: remove .hgtags and .hgignore from source tree + +Index: accessodf/.hgignore +=================================================================== +--- accessodf.orig/.hgignore 2012-03-01 22:50:55.000000000 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,4 +0,0 @@ +-syntax: glob +-.DS_Store +-build +-dist +Index: accessodf/.hgtags +=================================================================== +--- accessodf.orig/.hgtags 2012-03-01 22:50:55.000000000 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1 +0,0 @@ +-65d27cf8b60a12a258bbc3fd83155c8440bb4e05 release-0.1.0 diff -Nru accessodf-0.1/debian/patches/series accessodf-0.1/debian/patches/series --- accessodf-0.1/debian/patches/series 2012-11-09 23:23:17.000000000 +0000 +++ accessodf-0.1/debian/patches/series 2014-04-04 14:38:42.000000000 +0000 @@ -1 +1,2 @@ debian_build_dependencies +fix-for-i121544.diff diff -Nru accessodf-0.1/debian/postinst accessodf-0.1/debian/postinst --- accessodf-0.1/debian/postinst 2012-11-09 23:23:17.000000000 +0000 +++ accessodf-0.1/debian/postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#!/bin/sh -# This maintainer script was originally written by Harri Pitkänen, Teemu Likonen -# and Timo Jyrinki and was adopted from the openoffice.org-voikko package. It -# was modified by Sebastian Humenda to fit for the AccessODF package. - -PATH=/bin:/usr/bin:/usr/lib/libreoffice/program -set -e - -add_extension() { - echo -n "Adding extension $1..." - INSTDIR=`mktemp -d` - HOME=$INSTDIR unopkg add --shared $1 \ - "-env:UserInstallation=file:///$INSTDIR" \ - '-env:UNO_JAVA_JFW_INSTALL_DATA=$ORIGIN/../share/config/javasettingsunopkginstall.xml' \ - "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1" - if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi - echo " done." -} - -if [ "$1" = "configure" -o "$1" = "upgrade" ]; then - add_extension /usr/share/accessodf/AccessODF.oxt -fi - -#DEBHELPER# diff -Nru accessodf-0.1/debian/preinst accessodf-0.1/debian/preinst --- accessodf-0.1/debian/preinst 2012-11-09 23:23:58.000000000 +0000 +++ accessodf-0.1/debian/preinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -#!/bin/sh -# This maintainer script was originally written by Harri Pitkänen, Teemu Likonen -# and Timo Jyrinki and was adoptet from the openoffice.org-voikko package. It -# was modified by Sebastian Humenda to fit for the accessodf package. - -PATH=/bin:/usr/bin:/usr/lib/libreoffice/program -set -e - -flush_unopkg_cache() { - INSTDIR=`mktemp -d` - HOME=$INSTDIR unopkg list --shared "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1" > /dev/null 2>&1 -} - -remove_extension() { - INSTDIR=`mktemp -d` - if HOME=$INSTDIR unopkg list --shared $1 >/dev/null; then - echo -n "Removing extension $1..." - HOME=$INSTDIR unopkg remove --shared $1 \ - "-env:UserInstallation=file://$INSTDIR" \ - '-env:UNO_JAVA_JFW_INSTALL_DATA=$ORIGIN/../share/config/javasettingsunopkginstall.xml' \ - "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1" - if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi - echo " done." - flush_unopkg_cache - fi -} - -case "$1" in - upgrade|install) - INSTDIR=`mktemp -d` - echo Removing old accessodf extensions. - id=" " - while [ "$id" != "" ]; do - id=`HOME=$INSTDIR unopkg list --shared | egrep '^(Name|Identifier):.*accessodf' | cut -d":" -f2 | head -n 1` - if [ "$id" != "" ]; then remove_extension $id; fi - done - ;; -esac - - -#DEBHELPER# diff -Nru accessodf-0.1/debian/prerm accessodf-0.1/debian/prerm --- accessodf-0.1/debian/prerm 2012-11-09 23:23:17.000000000 +0000 +++ accessodf-0.1/debian/prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -#!/bin/sh -# This maintainer script was originally written by Harri Pitkänen, Teemu Likonen -# and Timo Jyrinki and was adoptet from the openoffice.org-voikko package. It -# was modified by Sebastian Humenda to fit for the accessodf package. - -PATH=/bin:/usr/bin:/usr/lib/libreoffice/program -set -e - -flush_unopkg_cache() { - HOME=$INSTDIR unopkg list --shared "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1" > /dev/null 2>&1 -} - -remove_extension() { - INSTDIR=`mktemp -d` - if HOME=$INSTDIR unopkg list --shared $1 >/dev/null; then - echo -n "Removing extension $1..." - HOME=$INSTDIR unopkg remove --shared $1 \ - "-env:UserInstallation=file://$INSTDIR" \ - '-env:UNO_JAVA_JFW_INSTALL_DATA=$ORIGIN/../share/config/javasettingsunopkginstall.xml' \ - "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1" - if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi - echo " done." - flush_unopkg_cache - fi -} - -case "$1" in - remove) - remove_extension be.docarch.accessodf.ooo.accessodfaddon - ;; -esac - - -#DEBHELPER# diff -Nru accessodf-0.1/debian/rules accessodf-0.1/debian/rules --- accessodf-0.1/debian/rules 2012-11-09 23:23:17.000000000 +0000 +++ accessodf-0.1/debian/rules 2013-05-16 22:59:45.000000000 +0000 @@ -19,17 +19,22 @@ override_dh_auto_build: ant -Don-debian=True uno-package -get-orig-source: - rm -rf get-orig-source $(TARBALL) - mkdir get-orig-source - hg clone http://hg.code.sf.net/p/accessodf/code \ - get-orig-source/$(SRC_PACKAGE)-$(SRC_VERSION).orig - # Remove $SRC/lib and $SRC/ant-build/resources, because it's not necessary in Debian, dependencies are in Debian itself available - rm -rf get-orig-source/$(SRC_PACKAGE)-$(SRC_VERSION).orig/lib - # remove .hg - rm -rf get-orig-source/$(SRC_PACKAGE)-$(SRC_VERSION).orig/.hg - - GZIP='--best --no-name' tar czf $(TARBALL) -C get-orig-source $(SRC_PACKAGE)-$(SRC_VERSION).orig - rm -rf get-orig-source - mv $(TARBALL) .. +override_dh_auto_install: + mkdir -p debian/tmp/usr/lib/libreoffice/share/extensions/accessodf + unzip -d debian/tmp/usr/lib/libreoffice/share/extensions/accessodf/ dist/AccessODF.oxt + -rm -rf debian/tmp/usr/lib/libreoffice/share/extensions/accessodf/lib + -rm -rf debian/tmp/usr/lib/libreoffice/share/extensions/accessodf/accessodf-addon.jar + +get-orig-source: + git clone git://git.code.sf.net/p/accessodf/code \ + $(SRC_PACKAGE)-$(SRC_VERSION).orig + cd $(SRC_PACKAGE)-$(SRC_VERSION).orig; \ + git checkout release-0.1.0 + # Remove $SRC/lib and $SRC/ant-build/resources, because it's not necessary in Debian, dependencies are in Debian itself available, furthermore some scm-files + rm -rf $(SRC_PACKAGE)-$(SRC_VERSION).orig/lib + rm -rf $(SRC_PACKAGE)-$(SRC_VERSION).orig/.git + rm -rf $(SRC_PACKAGE)-$(SRC_VERSION).orig/.gitignore + rm -rf $(SRC_PACKAGE)-$(SRC_VERSION).orig/.hgignore + tar czf ../$(TARBALL) $(SRC_PACKAGE)-$(SRC_VERSION).orig + rm -rf $(SRC_PACKAGE)-$(SRC_VERSION).orig