[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-151-gfd53637
The following commit has been merged in the debian-experimental-3.5 branch:
commit fd53637b3e725e9a587a5edb21211c1f29e69815
Merge: 35c019676ce9b2545972fd9dcb86155e50f3ecc9 e330a4ff022c380f545e042adcb9560b1d1edd7a
Author: Rene Engelhard <rene@debian.org>
Date: Mon Dec 19 20:51:32 2011 +0100
Merge remote branch 'origin/master' into debian-experimental-3.5
diff --combined changelog
index 808a026,2633df2..7e43606
--- a/changelog
+++ b/changelog
@@@ -1,61 -1,18 +1,70 @@@
+libreoffice (1:3.5.0~beta1-1) UNRELEASED; urgency=low
+
+ [ Rene Engelhard ]
+ * new upstream beta release
+
+ * debian/*:
+ - use "core" sources, no libreoffice-build anymore. Loads of updates.
+
+ * debian/patches/*: move from patches/hotfixes to patch the code
+ directly without libreoffice-build
+
+ * debian/rules, debian/vars.*, debian/*.links.in:
+ - loads of updates for new envfile name and gone LIBSUFFIX
+ * debian/rules:
+ - enable new build against Gtk3
+ - bump python b-d to >= 2.6 as we don't work with earlier anymore.
+ Also build python3-uno
+ - add new conditionals and build-deps for new (libvisio,librsvg,gettext,
+ libcmis) libraries and libexttextcat switch - and those we needed to move
+ from libreoffice-builds' distro-configs. Adapt for changed configure
+ options
+ - add new conditionals and build-deps for new libvisio,librsvg,gettext,
+ libcmis usage and libexttextcat switch - and those we needed to move
+ from libreoffice-builds' distro-configs
+ - run new "make check" instead of solenv/bin/subsequenttests and
+ manual smoketest
+ - remove fakeroot hackaround
+ * debian/rules, debian/control.in:
+ - move from self-defined UPSTREAM_VERSION/ARCH etc. to use
+ /usr/share/dpkg/*.mk
+ * debian/control.in:
+ - update descriptions for new Gtk(3) print dialog
+
+ [ Bjoern Michaelsen ]
+ * debian/rules:
+ - set CURDIR before first use and use safe method to set it
+ - update GIT_ vars, add GIT_BASEURL for local mirrors
+ - update get-orig-source
+ - build needs the ext-sources
+ * debian/README:
+ - update most outdated README sections
+ * debian/patches:
+ - migrate mention-java-common-package.diff from libreoffice/build
+ - migrate help-msg-add-package-info.diff from libreoffice/build
+ - update help-msg-add-package-info.diff, replace openoffice.org with
+ libreoffice
+ - migrate sensible-ooomua.diff from libreoffice/build and rename to
+ sensible-lomua; add icedove and thunderbird as fallbacks
+ - migrate sensible-browser.diff from libreoffice/build
+
+ -- Rene Engelhard <rene@debian.org> Tue, 13 Dec 2011 20:17:01 +0000
+
libreoffice (1:3.4.4-3) UNRELEASED; urgency=low
+ [ Rene Engelhard ]
* debian/libreoffice-core.postrm.in:
- on remove, delete created services.rdb (closes: #650341)
+ * debian/control.in:
+ - move libreoffice, libreoffice-l10n-{in,za} to new metapackages
+ section
+ * debian/vars.armhf: add
+
+ [ Björn Michaelsen ]
+ * debian/patches/fix-armhf-build-in-bridges.patch: fix armhf build in
+ bridges
- -- Rene Engelhard <rene@debian.org> Wed, 30 Nov 2011 17:39:08 +0000
+ -- Rene Engelhard <rene@debian.org> Wed, 07 Dec 2011 18:23:51 +0100
libreoffice (1:3.4.4-2) unstable; urgency=medium
diff --combined control
index a5a1d49,0ce34ab..fd74785
--- a/control
+++ b/control
@@@ -3,8 -3,8 +3,8 @@@ Section: editor
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel !sparc], libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, dpkg-dev (>= 1.15.6), python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armh
f i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), mingw-w64 (>= 1.0), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!armel !hppa !kfreebsd-amd64
!kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.37~), xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev [!armel], libpq-dev (>= 9.0~), libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuit
esparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, liborbit2-dev, libldap2-dev
-Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge, translate-toolkit (>= 1.9)
+Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), tcsh, openjdk-6-jdk (>
= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), mingw-w64 (>= 1.0), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>=
1.1.7) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), xulrunner-dev, dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libsampleicc-dev, libicc-utils2, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcmis-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel], libpq-dev (>= 9.0~), libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-j
ava (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, liborbit2-dev, gettext, libldap2-dev
+Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11), base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
XS-Python-Version: current
@@@ -15,6 -15,7 +15,7 @@@ Homepage: http://www.libreoffice.or
Package: libreoffice
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+ Section: metapackages
Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer, libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math, libreoffice-base [!armel], libreoffice-report-builder-bin [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], ttf-dejavu, ttf-sil-gentium-basic, libreoffice-filter-mobiledev, ${lucene-depends}, ${java-common-depends}, ${misc:Depends}
Recommends: ttf-liberation | ttf-mscorefonts-installer, libpaper-utils
Suggests: hunspell-dictionary, myspell-dictionary, libreoffice-help-${help-l10n-virtual-version}, libreoffice-l10n-${help-l10n-virtual-version}, unixodbc, cups-bsd, libsane, hyphen-hyphenation-patterns, mythes-thesaurus, libxrender1, libgl1, libreoffice-gnome | libreoffice-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-libreoffice, pstoedit, imagemagick | graphicsmagick-imagemagick-compat, ${gstreamer-plugins-suggests}, ${libldap-suggests}, ${ooo-binfilter-dep}, ${ooo-officebean-dep}
@@@ -64,7 -65,7 +65,7 @@@ Description: office productivity suit
* libreoffice-filter-binfilter: legacy filters (e.g. StarOffice 5.2)
Package: libreoffice-l10n-za
- Section: localization
+ Section: metapackages
Architecture: all
Depends: libreoffice-l10n-af, libreoffice-l10n-en-za, libreoffice-l10n-nr, libreoffice-l10n-nso, libreoffice-l10n-ss, libreoffice-l10n-st, libreoffice-l10n-tn, libreoffice-l10n-ts, libreoffice-l10n-ve, libreoffice-l10n-xh, libreoffice-l10n-zu, ${misc:Depends}
Description: office productivity suite -- South African language packages
@@@ -75,7 -76,7 +76,7 @@@
African languages.
Package: libreoffice-l10n-in
- Section: localization
+ Section: metapackages
Architecture: all
Depends: libreoffice-l10n-as, libreoffice-l10n-bn, libreoffice-l10n-gu, libreoffice-l10n-hi, libreoffice-l10n-ml, libreoffice-l10n-mr, libreoffice-l10n-or, libreoffice-l10n-pa-in, libreoffice-l10n-ta, libreoffice-l10n-te, ${misc:Depends}
Recommends: ttf-indic-fonts
@@@ -90,7 -91,7 +91,7 @@@ Package: libreoffice-cor
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-common (>> ${base-version}), fonts-opensymbol | ttf-opensymbol (>= 1:3.0), ${shlibs:Depends}, ure (>= 1.5.1+OOo3.1.1-15), fontconfig, ${mozilla-nss-depends}, ${misc:Depends}
Conflicts: libreoffice-calc (<< ${binary:Version}), libreoffice-writer (<< ${binary:Version}), libreoffice-impress (<< ${binary:Version}), libreoffice-draw (<< ${binary:Version}), libreoffice-base (<< ${binary:Version}), libreoffice-gtk (<< ${binary:Version}), libreoffice-gnome (<< ${binary:Version}), libreoffice-kde (<< ${binary:Version}), libreoffice-evolution (<< ${binary:Version}), libreoffice-filter-so52 (<< ${binary:Version}), libreoffice-officebean (<< ${binary:Version}), libreoffice-dev (<< ${binary:Version}), libreoffice-style-crystal (<< 1:3.3.0-1), libreoffice-style-oxygen (<< 1:3.3.0-1), libreoffice-style-tango (<< 1:3.3.0-1), libreoffice-style-hicontrast (<< 1:3.3.0-1), libreoffice-style-galaxy (<< 1:3.3.0-1), libreoffice-style-andromeda (<< 1:3.3.0-1), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), cacao-oj6-jre, mozilla-plugin-vlc (<< 1.0)
-Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1), myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), m
yspell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<< 1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<< 1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3), myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3), hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<< 1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr (<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), libreoffice-filter-binfilter (<< 1:3.4.1~), libreoffice-evolution (<< 1:3.4.1~), li
breoffice-kab (<< 1:3.4.1~)
+Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1), myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), m
yspell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<< 1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<< 1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3), myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3), hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<< 1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr (<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), libreoffice-filter-binfilter (<< 1:3.4.1~), libreoffice-evolution (<< 1:3.4.1~), li
breoffice-kab (<< 1:3.4.1~), libreoffice-sdbc-postgresql (<< 0.8.1~)
Provides: libreoffice-bundled
Replaces: libreoffice-calc (<< 1:3.3.2-5)
Description: office productivity suite -- arch-dependent files
@@@ -304,21 -305,8 +305,21 @@@ Description: office productivity suite
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the Gtk plugin for drawing LibreOffices widgets
- with Gtk+ and a Gtk/GNOMEish File Picker when running under GNOME. It
- also contains a QuickStarter for the "notification area".
+ with Gtk+ and a Gtk/GNOMEish File Picker and print dialog when running
+ under GNOME. It also contains a QuickStarter for the "notification area".
+
+Package: libreoffice-gtk3
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Recommends: libreoffice-style-tango
+Section: gnome
+Enhances: libreoffice
+Description: office productivity suite -- GTK+ 3.0 integration
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the Gtk plugin for drawing LibreOffices widgets
+ with Gtk+ 3.0 and Gtk/GNOMEish print dialog when running under GNOME.
Package: libreoffice-gnome
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
@@@ -358,22 -346,6 +359,22 @@@ Section: pytho
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Enhances: libreoffice
Depends: libreoffice-core (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Conflicts: python3-uno
+Description: Python-UNO bridge
+ The Python-UNO bridge allows use of the standard LibreOffice API
+ with the Python scripting language. It additionally allows
+ others to develop UNO components in Python, thus Python UNO components
+ may be run within the LibreOffice process and can be called from C++
+ or the built in StarBasic scripting language.
+Homepage: http://udk.openoffice.org/python/python-bridge.html
+
+Package: python3-uno
+Provides: libreoffice-script-provider-python
+Section: python
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Enhances: libreoffice
+Depends: libreoffice-core (= ${binary:Version}), ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Conflicts: python-uno
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@@ -424,7 -396,7 +425,7 @@@ Description: office productivity suite
Package: libreoffice-script-provider-bsh
Architecture: all
Section: java
-Depends: libreoffice-java-common, ${java-runtime-depends}, ${bsh-depends}, ${misc:Depends}
+Depends: libreoffice-java-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${java-runtime-depends}, ${bsh-depends}, ${misc:Depends}
Replaces: libreoffice-java-common (<< 1:3.4~)
Description: BeanShell script support provider for LibreOffice scripting framework
LibreOffice is a full-featured office productivity suite that provides
@@@ -441,7 -413,7 +442,7 @@@ Package: libreoffice-script-provider-j
Architecture: all
Section: web
Replaces: libreoffice-common (<< 1:3.4~)
-Depends: libreoffice-java-common, ${java-runtime-depends}, ${misc:Depends}
+Depends: libreoffice-java-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${java-runtime-depends}, ${misc:Depends}
Description: JavaScript script support provider for LibreOffice scripting framework
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -3145,7 -3117,7 +3146,7 @@@ Package: libreoffice-wiki-publishe
Section: misc
Architecture: all
Pre-Depends: ${java-runtime-depends}
-Depends: ${mediawiki-jar-depends}, libreoffice-core, libreoffice-java-common, ${java:Depends}, ${misc:Depends}
+Depends: ${mediawiki-jar-depends}, libreoffice-core (>= 3.4~), libreoffice-java-common, ${java:Depends}, ${misc:Depends}
Enhances: libreoffice-writer
Recommends: ${lucene-depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
diff --combined control.in
index 8f82e98,f087e34..e372eb3
--- a/control.in
+++ b/control.in
@@@ -3,8 -3,7 +3,8 @@@ Section: editor
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release,
+Build-Depends: dpkg-dev (>= 1.16.1),
+ lsb-release,
bzip2,
bison,
flex | flex-old,
@@@ -25,13 -24,20 +25,13 @@@
libxext-dev,
libxtst-dev,
libice-dev,
- libsane-dev,
- libxrender-dev,
libcups2-dev,
libarchive-zip-perl,
- libpng12-dev,
- libjpeg-dev,
- libxml2-dev,
- libexpat1-dev,
fastjar,
xsltproc,
libxkbfile-dev,
libxinerama-dev,
x11proto-render-dev,
- unixodbc-dev (>= 2.2.11),
libxml-parser-perl,
gperf,
po-debconf,
@@@ -49,6 -55,7 +49,7 @@@ Homepage: http://www.libreoffice.or
Package: libreofficeVER
Architecture: %OOO_ARCHS%
+ Section: metapackages
Depends: libreofficeVER-core (= ${binary:Version}),
libreofficeVER-writer,
libreofficeVER-calc,
@@@ -128,7 -135,7 +129,7 @@@ Description: office productivity suit
* libreofficeVER-filter-binfilter: legacy filters (e.g. StarOffice 5.2)
Package: libreofficeVER-l10n-za
- Section: localization
+ Section: metapackages
Architecture: all
Depends: libreofficeVER-l10n-af, libreofficeVER-l10n-en-za, libreofficeVER-l10n-nr, libreofficeVER-l10n-nso, libreofficeVER-l10n-ss, libreofficeVER-l10n-st, libreofficeVER-l10n-tn, libreofficeVER-l10n-ts, libreofficeVER-l10n-ve, libreofficeVER-l10n-xh, libreofficeVER-l10n-zu,
${misc:Depends}
@@@ -140,7 -147,7 +141,7 @@@ Description: office productivity suite
African languages.
Package: libreofficeVER-l10n-in
- Section: localization
+ Section: metapackages
Architecture: all
Depends: libreofficeVER-l10n-as, libreofficeVER-l10n-bn, libreofficeVER-l10n-gu, libreofficeVER-l10n-hi, libreofficeVER-l10n-ml, libreofficeVER-l10n-mr, libreofficeVER-l10n-or, libreofficeVER-l10n-pa-in, libreofficeVER-l10n-ta, libreofficeVER-l10n-te,
${misc:Depends}
@@@ -185,7 -192,7 +186,7 @@@ Conflicts: libreofficeVER-unbundled
cli-uno-bridge (<< 1:3.0.0~dev300m22),
cacao-oj6-jre,
mozilla-plugin-vlc (<< 1.0)
-Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1), myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), m
yspell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<< 1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<< 1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3), myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3), hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<< 1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr (<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), libreoffice-filter-binfilter (<< 1:3.4.1~), libreoffice-evolution (<< 1:3.4.1~), li
breoffice-kab (<< 1:3.4.1~)
+Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1), myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), m
yspell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<< 1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<< 1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3), myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3), hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<< 1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr (<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), libreoffice-filter-binfilter (<< 1:3.4.1~), libreoffice-evolution (<< 1:3.4.1~), li
breoffice-kab (<< 1:3.4.1~), libreoffice-sdbc-postgresql (<< 0.8.1~)
Provides: libreofficeVER-bundled
Replaces: libreofficeVER-calc (<< 1:3.3.2-5)
Description: office productivity suite -- arch-dependent files
@@@ -439,23 -446,8 +440,23 @@@ Description: office productivity suite
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the Gtk plugin for drawing LibreOffices widgets
- with Gtk+ and a Gtk/GNOMEish File Picker when running under GNOME. It
- also contains a QuickStarter for the "notification area".
+ with Gtk+ and a Gtk/GNOMEish File Picker and print dialog when running
+ under GNOME. It also contains a QuickStarter for the "notification area".
+
+Package: libreofficeVER-gtk3
+Architecture: %OOO_ARCHS%
+Depends: libreofficeVER-core (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Recommends: libreofficeVER-style-tango
+Section: gnome
+Enhances: libreofficeVER
+Description: office productivity suite -- GTK+ 3.0 integration
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the Gtk plugin for drawing LibreOffices widgets
+ with Gtk+ 3.0 and Gtk/GNOMEish print dialog when running under GNOME.
Package: libreofficeVER-gnome
Architecture: %OOO_ARCHS%
@@@ -502,25 -494,6 +503,25 @@@ Depends: libreofficeVER-core (= ${binar
${python:Depends},
${shlibs:Depends},
${misc:Depends}
+Conflicts: python3-uno
+Description: Python-UNO bridge
+ The Python-UNO bridge allows use of the standard LibreOffice API
+ with the Python scripting language. It additionally allows
+ others to develop UNO components in Python, thus Python UNO components
+ may be run within the LibreOffice process and can be called from C++
+ or the built in StarBasic scripting language.
+Homepage: http://udk.openoffice.org/python/python-bridge.html
+
+Package: python3-uno
+Provides: libreofficeVER-script-provider-python
+Section: python
+Architecture: %OOO_ARCHS%
+Enhances: libreofficeVER
+Depends: libreofficeVER-core (= ${binary:Version}),
+ ${python3:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Conflicts: python-uno
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@@ -580,7 -553,7 +581,7 @@@ Description: office productivity suite
Package: libreoffice-script-provider-bsh
Architecture: all
Section: java
-Depends: libreoffice-java-common, ${java-runtime-depends}, ${bsh-depends} , ${misc:Depends}
+Depends: libreoffice-java-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${java-runtime-depends}, ${bsh-depends} , ${misc:Depends}
Replaces: libreoffice-java-common (<< 1:3.4~)
Description: BeanShell script support provider for LibreOffice scripting framework
LibreOffice is a full-featured office productivity suite that provides
@@@ -597,7 -570,7 +598,7 @@@ Package: libreoffice-script-provider-j
Architecture: all
Section: web
Replaces: libreoffice-common (<< 1:3.4~)
-Depends: libreoffice-java-common, ${java-runtime-depends}, ${misc:Depends}
+Depends: libreoffice-java-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${java-runtime-depends}, ${misc:Depends}
Description: JavaScript script support provider for LibreOffice scripting framework
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --combined patches/fix-armhf-build-in-bridges.diff
index 61ae202,07712dd..61ae202
--- a/patches/fix-armhf-build-in-bridges.diff
+++ b/patches/fix-armhf-build-in-bridges.diff
@@@ -1,38 -1,41 +1,38 @@@
---- /dev/null 2011-12-15 01:37:17.931118287 +0100
-+++ libreoffice-3.4.4/libreoffice-build/patches/hotfixes/fix-armhf-build-in-bridges.diff 2011-12-19 13:54:28.000000000 +0100
-@@ -0,0 +1,38 @@
-+From f233f3973631c664e0953f04f88a58234390c088 Mon Sep 17 00:00:00 2001
-+From: Matthias Klose <matthias.klose@canonical.com>
-+Date: Mon, 19 Dec 2011 10:51:43 +0100
-+Subject: [PATCH 2/2] fix armhf build in bridges
-+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
-+Content-Transfer-Encoding: 8bit
-+
-+Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-+Signed-off-by: Caolán McNamara <caolanm@redhat.com>
-+---
-+ bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 4 ++--
-+ 1 files changed, 2 insertions(+), 2 deletions(-)
-+
-+diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
-+index 5b02678..9502b87 100644
-+--- bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
-++++ bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
-+@@ -173,14 +173,14 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference *
-+ pRegisterReturn[0] = r0;
-+ break;
-+ case typelib_TypeClass_FLOAT:
-+-#if defined(__ARM_EABI__) || defined(__SOFTFP__)
-++#if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__))
-+ pRegisterReturn[0] = r0;
-+ #else
-+ *(float*)pRegisterReturn = fret;
-+ #endif
-+ break;
-+ case typelib_TypeClass_DOUBLE:
-+-#if defined(__ARM_EABI__) || defined(__SOFTFP__)
-++#if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__))
-+ pRegisterReturn[1] = r1;
-+ pRegisterReturn[0] = r0;
-+ #else
-+--
-+1.7.5.4
-+
+From f233f3973631c664e0953f04f88a58234390c088 Mon Sep 17 00:00:00 2001
+From: Matthias Klose <matthias.klose@canonical.com>
+Date: Mon, 19 Dec 2011 10:51:43 +0100
+Subject: [PATCH 2/2] fix armhf build in bridges
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Signed-off-by: Caolán McNamara <caolanm@redhat.com>
+---
+ bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+index 5b02678..9502b87 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
++++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+@@ -173,14 +173,14 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference *
+ pRegisterReturn[0] = r0;
+ break;
+ case typelib_TypeClass_FLOAT:
+-#if defined(__ARM_EABI__) || defined(__SOFTFP__)
++#if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__))
+ pRegisterReturn[0] = r0;
+ #else
+ *(float*)pRegisterReturn = fret;
+ #endif
+ break;
+ case typelib_TypeClass_DOUBLE:
+-#if defined(__ARM_EABI__) || defined(__SOFTFP__)
++#if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__))
+ pRegisterReturn[1] = r1;
+ pRegisterReturn[0] = r0;
+ #else
+--
+1.7.5.4
+
diff --combined patches/fix-racecondition-in-sdext-source-pdfimport-makefile.diff
index 57f6377,0000000..57f6377
mode 100644,000000..100644
--- a/patches/fix-racecondition-in-sdext-source-pdfimport-makefile.diff
+++ b/patches/fix-racecondition-in-sdext-source-pdfimport-makefile.diff
@@@ -1,32 -1,0 +1,32 @@@
+From f2a1882be486986a76682ed51f481595e1cf0d5c Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Fri, 16 Dec 2011 19:55:37 +0100
+Subject: [PATCH 1/2] fix racecondition in sdext/source/pdfimport/makefile.mk
+
+---
+ sdext/source/pdfimport/makefile.mk | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk
+index 641e90f..d33680f 100644
+--- a/sdext/source/pdfimport/makefile.mk
++++ b/sdext/source/pdfimport/makefile.mk
+@@ -156,11 +156,14 @@ $(COMPONENT_DIALOGS) : dialogs$/$$(@:f)
+ @@-$(MKDIRHIER) $(@:d)
+ $(COPY) $< $@
+
+-$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
++$(COMPONENT_DESCRIPTION) : $(MISC)/descriptions
++
++$(MISC)/descriptions : $(DESCRIPTION)
+ $(COPY) description-en-US.txt $(EXTENSIONDIR)
+ .IF "$(WITH_LANG)" != ""
+ $(COPY) $(MISC)/$(EXTENSIONNAME)_in/description-*.txt $(EXTENSIONDIR)
+ .ENDIF
++ $(TOUCH) $@
+
+ $(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
+ @@-$(MKDIRHIER) $(@:d)
+--
+1.7.5.4
+
diff --combined patches/series
index 5ebce31,a3494c7..93ae9a7
--- a/patches/series
+++ b/patches/series
@@@ -1,21 -1,27 +1,21 @@@
splash-progressbarcolor.diff
-buildfix-patches.diff
no-minimaltoc.diff
-update-debian-opt.diff
-gcc4.6.0.diff
+debian-opt.diff
odk-jni-include.diff
jurt-soffice-location.diff
packcomponents-remove-split-components.diff
debian-debug.diff
-disable-rhino.diff
-bsh-hardcode-path.diff
-mips-openjdk-jre-paths.diff
-autogen.diff
+rhino-build-optional.diff
disable-dynamic-list-cpp.diff
libebook-1.2.so.12.diff
-vbaobj-visibility-fix.diff
make-gengal-work-again.diff
-fix-distro-config.diff
-mipsel-jfw-plugin-arch.diff
-no-deprecated-options-in-qstart-wrappers.diff
-update-sdbc-postgresql.diff
-jdk-1.7.0-vendorname.diff
-s390x.diff
-update-libreoffice.1.diff
-wordml2ooo_draw.xsl-add-missing-include.diff
+fix-system-lpsolve-build.diff
+install-fixes.diff
+smoketest-only-en-US.diff
+getMIMEDescription-mismatch.diff
+mention-java-common-package.diff
+help-msg-add-package-info.diff
+sensible-lomua.diff
+sensble-browser.diff
- fix-racecondition-in-sdext-source-pdfimport-makefile.patch
- fix-armhf-build-in-bridges.patch
++fix-racecondition-in-sdext-source-pdfimport-makefile.diff
+ fix-armhf-build-in-bridges.diff
--
LibreOffice packaging repository
Reply to: