diff -Nru accessodf-0.1/debian/changelog accessodf-0.1/debian/changelog --- accessodf-0.1/debian/changelog 2012-11-02 11:33:21.000000000 +0000 +++ accessodf-0.1/debian/changelog 2012-11-09 23:23:58.000000000 +0000 @@ -1,3 +1,12 @@ +accessodf (0.1-1.3ubuntu1) 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 + + -- Oussama Bounaim Fri, 09 Nov 2012 18:50:22 +0100 + accessodf (0.1-1.3) unstable; urgency=low * Non-maintainer upload. @@ -6,6 +15,15 @@ -- 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. @@ -14,6 +32,15 @@ -- 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. @@ -23,8 +50,17 @@ -- 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-06-30 03:23:20.000000000 +0000 +++ accessodf-0.1/debian/control 2012-11-09 23:23:17.000000000 +0000 @@ -1,9 +1,10 @@ Source: accessodf Section: java Priority: extra -Maintainer: Sebastian Humenda +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Sebastian Humenda Build-Depends: debhelper (>= 7.0.50~), ant (>= 1.8~), ant-optional, - default-jdk, openjdk-6-jre-headless | openjdk-7-jre-headless, + default-jdk, libcommons-collections3-java, libreoffice-java-common (>= 1:3.5.0~) Standards-Version: 3.9.2 Homepage: http://sourceforge.net/p/accessodf diff -Nru accessodf-0.1/debian/postinst accessodf-0.1/debian/postinst --- accessodf-0.1/debian/postinst 2012-10-23 17:53:33.000000000 +0000 +++ accessodf-0.1/debian/postinst 2012-11-09 23:23:17.000000000 +0000 @@ -3,8 +3,7 @@ # 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 - +PATH=/bin:/usr/bin:/usr/lib/libreoffice/program set -e add_extension() { diff -Nru accessodf-0.1/debian/preinst accessodf-0.1/debian/preinst --- accessodf-0.1/debian/preinst 2012-11-02 11:32:32.000000000 +0000 +++ accessodf-0.1/debian/preinst 2012-11-09 23:23:58.000000000 +0000 @@ -3,7 +3,7 @@ # 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 +PATH=/bin:/usr/bin:/usr/lib/libreoffice/program set -e flush_unopkg_cache() { diff -Nru accessodf-0.1/debian/prerm accessodf-0.1/debian/prerm --- accessodf-0.1/debian/prerm 2012-10-23 17:48:44.000000000 +0000 +++ accessodf-0.1/debian/prerm 2012-11-09 23:23:17.000000000 +0000 @@ -3,6 +3,7 @@ # 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() {