[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4_dfsg-4-54-gfe15067
The following commit has been merged in the debian-experimental-3.5 branch:
commit fe15067368832d0e22665bfa6118844dd66b37fb
Merge: 2b4522cd246d0cfed62b7d6f8e245f97e7650423 399932bf2132a73524d49f38c3740c3037c36713
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jan 14 23:16:19 2013 +0100
Merge remote-tracking branch 'origin/master' into debian-experimental-3.5
Conflicts:
changelog
patches/series
diff --combined changelog
index 591a645,bd4b861..3ac655b
--- a/changelog
+++ b/changelog
@@@ -1,34 -1,14 +1,45 @@@
+libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
+
+ * new upstream release
+ - caches fontconfig font substitutions (closes: #681308)
+
+ * debian/patches/poppler_0_2*.diff: fix build of sdext with poppler
+ 0.21.x and fix the test with 0.20.x, thanks Pino Toscano
+
+ * debian/rules:
+ - use generic python3.pc in default case instead of pythonX.Y.pc.
+ Use pythonX.Y.pc otherwise and actually make version-switching work.
+ - hack around broken "*" directory in debian/tmp/pkg on kfreebsd-*
+ extremely slowing down the install target...
+ - document truth and remove alpha from supported architectures
+ - fix typo in finding gcj dir detection, thanks Rico Tzschichholz
+ - don't add version from librsvg*.shlibs (as for libebook) as we
+ dlopen() it anyway.
+ - don't rely on dictionaries submodule. unused.
+ * debian/control.in:
+ - remove obsolete sharutils, po-debconf and wget | curl build-deps
+ - recommend fonts-liberation instead of ttf-liberation
+ (closes: #691949)
+ * debian/control.mozilla.in, debian/rules: rename
+ mozilla-libreoffice -> browser-plugin-libreoffice
+ * debian/libreoffice-core.bug-control:
+ - report-with: fonts-opensymbol instead of transitional ttf-opensymbol
+ * debian/libreoffice-{core,gtk3}.bug-script.in:
+ - find out whether we have Experimental features enabled
+
+ -- Rene Engelhard <rene@debian.org> Sat, 24 Nov 2012 18:31:33 +0100
+
+ libreoffice (1:3.5.4+dfsg-5) UNRELEASED; urgency=low
+
+ * debian/patches/fix-view-option.diff: backport fix to fix --view
+ from libreoffice-3-6 (closes: #697723)
+
+ * debian/rules:
+ - make -help-en-us break "the others" to work around 682838
+ (closes: #682838)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 14 Jan 2013 21:37:10 +0100
+
libreoffice (1:3.5.4+dfsg-4) unstable; urgency=medium
* debian/control.in:
diff --combined control
index 2437673,e6040bc..c9742cf
--- a/control
+++ b/control
@@@ -3,7 -3,7 +3,7 @@@ Section: editor
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-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, gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!alpha !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 (>= 3.2), debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), 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), g++-mingw-w64-i686 [i386 amd64], libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!hppa !kfreebsd-amd64 !kfreebsd-i386], li
bloader-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!hppa !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), 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, libsampleicc-dev, libicc-utils-dev, 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:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev, l
ibpq-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), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.70), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2), libldap2-dev
+Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, 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, bc,, gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-private-dev, 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-de
v (>= 1.12), gdb, junit4 (>= 4.8.2-2), openjdk-6-jdk (>= 6b23~pre8-2) [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), g++-mingw-w64-i686 [i386 amd64], libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-
i386], libformula-java (>= 1.1.7) [!hppa !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), 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, libsampleicc-dev, libicc-utils-dev, 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:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev, 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), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.70), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2), 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], libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, 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), gcc (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
@@@ -14,10 -14,10 +14,10 @@@ Bugs
Homepage: http://www.libreoffice.org
Package: libreoffice
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: 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, libreoffice-report-builder-bin [!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
+Recommends: fonts-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, libreoffice-grammarcheck, 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}
Description: office productivity suite
LibreOffice is a full-featured office productivity suite that provides
@@@ -88,7 -88,7 +88,7 @@@ Description: office productivity suite
indic languages.
Package: libreoffice-core
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: 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, ${shlibs:Depends}, fontconfig, ${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~), libreoffice-sdbc-postgresql (<< 0.8.1~), mozilla-libreoffice (<< 1:3.5.0~beta~)
@@@ -142,7 -142,7 +142,7 @@@ Description: office productivity suite
the Java support for LibreOffice (Java classes, scripts, config snippets).
Package: libreoffice-writer
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}, ${java-common-depends}, libreoffice-emailmerge, libreoffice-math
Replaces: libreoffice-core (<< 1:3.3.2-5)
@@@ -154,7 -154,7 +154,7 @@@ Description: office productivity suite
This package contains the wordprocessor component for LibreOffice.
Package: libreoffice-calc
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (= ${binary:Version}), ${shlibs:Depends}, ${lpsolve-dep}, ${misc:Depends}
Description: office productivity suite -- spreadsheet
LibreOffice is a full-featured office productivity suite that provides
@@@ -163,7 -163,7 +163,7 @@@
This package contains the spreadsheet component for LibreOffice.
Package: libreoffice-impress
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), libreoffice-draw (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: office productivity suite -- presentation
LibreOffice is a full-featured office productivity suite that provides
@@@ -172,7 -172,7 +172,7 @@@
This package contains the presentation component for LibreOffice.
Package: libreoffice-draw
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: 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}
Description: office productivity suite -- drawing
LibreOffice is a full-featured office productivity suite that provides
@@@ -181,7 -181,7 +181,7 @@@
This package contains the drawing component for LibreOffice.
Package: libreoffice-math
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: 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}, fonts-opensymbol
Description: office productivity suite -- equation editor
LibreOffice is a full-featured office productivity suite that provides
@@@ -190,7 -190,7 +190,7 @@@
This package contains the equation editor component for LibreOffice.
Package: libreoffice-base-core
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: 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}
Replaces: libreoffice-base (<< 1:3.5.3~rc2-1)
Suggests: libreoffice-base
@@@ -205,7 -205,7 +205,7 @@@ Description: office productivity suite
install libreoffice-base.
Package: libreoffice-base
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Section: database
Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${java:Depends}, ${java-common-depends}, ${misc:Depends}
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java | libjtds-java, libreoffice-gcj, libreoffice-report-builder
@@@ -296,7 -296,7 +296,7 @@@ Description: office productivity suite
enabled in the LibreOffice option menu.
Package: libreoffice-gtk
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: 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
@@@ -311,7 -311,7 +311,7 @@@ Description: office productivity suite
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
+Architecture: 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
@@@ -324,7 -324,7 +324,7 @@@ Description: office productivity suite
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
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), libreoffice-gtk, gconf2, ${shlibs:Depends}, ${misc:Depends}
Suggests: libreoffice-evolution
Section: gnome
@@@ -358,7 -358,7 +358,7 @@@ Package: python-un
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Section: python
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: 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, libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
@@@ -372,7 -372,7 +372,7 @@@ Homepage: http://udk.openoffice.org/pyt
Package: python3-uno
Section: python
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: 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
@@@ -385,7 -385,7 +385,7 @@@ Description: Python-UNO bridg
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: libreoffice-officebean
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Section: java
Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${java-common-depends}, ${java:Depends}, ${misc:Depends}
Description: office productivity suite -- Java bean
@@@ -2599,6 -2599,7 +2599,7 @@@ Description: office productivity suite
the language packs.
Package: libreoffice-help-en-us
+ Breaks: libreoffice-help-ca, libreoffice-help-ca-xv, libreoffice-help-cs, libreoffice-help-da, libreoffice-help-de, libreoffice-help-dz, libreoffice-help-el, libreoffice-help-en-gb, libreoffice-help-es, libreoffice-help-et, libreoffice-help-eu, libreoffice-help-fi, libreoffice-help-fr, libreoffice-help-gl, libreoffice-help-hi, libreoffice-help-hu, libreoffice-help-it, libreoffice-help-ja, libreoffice-help-km, libreoffice-help-ko, libreoffice-help-nl, libreoffice-help-om, libreoffice-help-pl, libreoffice-help-pt, libreoffice-help-pt-br, libreoffice-help-ru, libreoffice-help-sk, libreoffice-help-sl, libreoffice-help-sv, libreoffice-help-zh-cn, libreoffice-help-zh-tw,
Replaces: libreoffice-common (<< 1:3.0.0~dev300m28)
Architecture: all
Section: doc
@@@ -3035,7 -3036,7 +3036,7 @@@ Description: office productivity suite
Package: uno-libs3
Section: libs
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: ure (<< 1.4+OOo3.0.0~beta2-1)
Description: LibreOffice UNO runtime environment -- public shared libraries
@@@ -3058,7 -3059,7 +3059,7 @@@
Package: uno-libs3-dbg
Section: debug
Priority: extra
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends}
Replaces: ure-dbg (<< 1.4+OOo3.0.0~beta2-1)
Description: LibreOffice UNO runtime environment -- public shared library debug symbols
@@@ -3080,7 -3081,7 +3081,7 @@@
Package: ure
Section: libs
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: uno-libs3 (= ${ure:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: java5-runtime
Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22)
@@@ -3099,7 -3100,7 +3100,7 @@@ Description: LibreOffice UNO runtime en
Package: ure-dbg
Section: debug
Priority: extra
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: ure (= ${ure:Version}), uno-libs3-dbg (= ${ure:Version}), ${misc:Depends}
Description: LibreOffice UNO runtime environment -- debug symbols
The Uno Runtime Environment (URE) is the well-known UNO component model
@@@ -3130,7 -3131,7 +3131,7 @@@ Description: office productivity suite
Package: libreoffice-ogltrans
Section: graphics
Priority: extra
-Architecture: alpha amd64 armhf hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 armhf hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress, libreoffice-common, ${misc:Depends}
Enhances: libreoffice-impress
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
@@@ -3179,7 -3180,7 +3180,7 @@@ Homepage: http://extensions.services.op
Package: libreoffice-report-builder-bin
Section: misc
-Architecture: alpha amd64 armel armhf i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
+Architecture: amd64 armel armhf i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-base, ${misc:Depends}
Description: LibreOffice extension for building database reports -- libraries
LibreOffice is a full-featured office productivity suite that provides
@@@ -3190,7 -3191,7 +3191,7 @@@
Package: libreoffice-presentation-minimizer
Section: misc
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress, ${misc:Depends}
Enhances: libreoffice-impress
Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
@@@ -3209,7 -3210,7 +3210,7 @@@ Homepage: http://extensions.services.op
Package: libreoffice-presenter-console
Section: misc
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress, ${misc:Depends}
Enhances: libreoffice-impress
@@@ -3234,7 -3235,7 +3235,7 @@@ Homepage: http://extensions.services.op
Package: libreoffice-pdfimport
Section: misc
Priority: extra
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Description: LibreOffice extension for importing PDF documents
@@@ -3268,7 -3269,7 +3269,7 @@@ Description: transitional package for f
Package: libreoffice-dbg
Section: debug
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Priority: extra
Depends: libreoffice-core (= ${binary:Version}) | libreoffice-gcj (= ${binary:Version}) | libreoffice-dev (= ${binary:Version}) | libreoffice-gnome (= ${binary:Version}) | libreoffice-kde (= ${binary:Version}) | libreoffice-calc (= ${binary:Version}) | libreoffice-base-core (= ${binary:Version}) | libreoffice-base (= ${binary:Version}) | libreoffice-impress (= ${binary:Version}) | libreoffice-filter-binfilter (= ${binary:Version}) | libreoffice-draw (= ${binary:Version}) | libreoffice-writer (= ${binary:Version}) | python-uno (= ${binary:Version}) | cli-uno-bridge (= ${binary:Version}) | mozilla-libreoffice (= ${binary:Version}) | libreoffice-ogltrans (= ${binary:Version}), ${misc:Depends}
Recommends: ure-dbg
@@@ -3283,7 -3284,7 +3284,7 @@@ Description: office productivity suite
Package: libreoffice-dev
Section: devel
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: 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: dmake, g++, ${java-runtime-depends}, ${java-common-depends}
Suggests: libreoffice-dev-doc, libmythes-dev, c-shell
@@@ -3315,7 -3316,7 +3316,7 @@@ Description: office productivity suite
It also contains the gsicheck utility.
Package: libreoffice-kde
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: 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: ${kde-iconset-dep}
Suggests: konqueror, kmail, libreoffice-kab
@@@ -3335,7 -3336,7 +3336,7 @@@ Description: office productivity suite
Package: libreoffice-sdbc-postgresql
Section: misc
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core (>= 1:3.5.0~beta), ${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Suggests: postgresql (>= 8.4)
@@@ -3349,7 -3350,7 +3350,7 @@@ Homepage: http://wiki.documentfoundatio
Package: libreoffice-mysql-connector
Section: misc
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
Suggests: mysql-server (>= 5.1)
Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
@@@ -3362,7 -3363,7 +3363,7 @@@ Description: MySQL Connector extension
LibreOffice without any wrapper layer such as ODBC or JDBC.
Package: libreoffice-evolution
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Section: gnome
Depends: libreoffice-core (= ${binary:Version}), libreoffice-common (>= 1:3.4.0~), libreoffice-base, ${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
Recommends: evolution
@@@ -3377,7 -3378,7 +3378,7 @@@ Description: office productivity suite
Package: libreoffice-filter-binfilter
Section: misc
-Architecture: alpha amd64 hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: amd64 hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), libreoffice-common (>= 1:3.4.0~), ${shlibs:Depends}, ${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Description: office productivity suite -- legacy filters (e.g. StarOffice 5.2)
diff --combined patches/series
index 3f6154d,fb2aa8d..c30fc92
--- a/patches/series
+++ b/patches/series
@@@ -27,15 -27,26 +27,16 @@@ move-binfilter-mimetypes-in-extra-deskt
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
debian-hardened-buildflags.diff
gtk3-hack-explicit-gmodule.diff
-gcc-4.7.diff
-gcc-4.7-i386.diff
-gcc-4.7-amd64.diff
-jdk7.diff
lp-926940-visio-mime-for-draw.diff
gcc-4.4.diff
lp-904212-add-missing-mimetypes-to-impress.desktop.diff
ignore-sc_cellrangesbase-fails.diff
fix-Test-BigPtrArray-on-64bit-bigendian.diff
-yyinput-fix-for-unsigned-char.diff
-fix-signed-char-mess.diff
-make-shortcuts-in-menus-localized-again.diff
-fix-legacy-report-opening.diff
-evolution-3.4.diff
-CVE-2012-2334-clip-max-entries.diff
-CVE-2012-2665.diff
CVE-2012-2665-binfilter.diff
ca-XV-update.diff
soffice-bashisms.diff
he-lucida-sans-unicode.diff
ure-no-etc-opt-ure.diff
+poppler_0_20_x.diff
+poppler_0_21_x.diff
+ fix-view-option.diff
diff --combined rules
index 3250def,2c87b12..b9caa33
--- a/rules
+++ b/rules
@@@ -69,9 -69,9 +69,9 @@@ USE_SOURCE_TARBALLS=
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=3.5.4.2
+lo_sources_ver=3.5.7.2
# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.5.4.2 libreoffice-3.5.4.2
+# use ./g checkout -b tag-libreoffice-3.5.7.2 libreoffice-3.5.7.2
GIT_TAG=libreoffice-$(lo_sources_ver)
GIT_BRANCH=tag-libreoffice-$(lo_sources_ver)
endif
@@@ -86,7 -86,7 +86,7 @@@ endi
#########
# Default package configuration
#
-OOO_ARCHS = alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+OOO_ARCHS = amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
PATCHSET=$(DEB_VENDOR)
BUILD_DEPS=
@@@ -359,7 -359,7 +359,7 @@@ ifneq (,$(findstring arm,$(DEB_HOST_ARC
endif
endif
-OOO_64BIT_ARCHS = $(filter alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x, $(OOO_ARCHS))
+OOO_64BIT_ARCHS = $(filter amd64 ia64 kfreebsd-amd64 ppc64 s390x, $(OOO_ARCHS))
# Java...
OOO_JAVA_ARCHS = $(OOO_ARCHS)
@@@ -519,6 -519,10 +519,6 @@@ els
endif
# fails their tests
-ifeq "$(DEB_HOST_ARCH)" "alpha"
-ENABLE_GRAPHITE=n
-SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
-endif
ifeq "$(DEB_HOST_ARCH)" "armel"
ENABLE_GRAPHITE=n
SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
@@@ -530,7 -534,7 +530,7 @@@ endi
ifeq "$(ENABLE_GRAPHITE)" "y"
ifneq (,$(filter graphite, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libgraphite2-dev (>= 0.9.3) [!alpha !armel !sparc]
+ BUILD_DEPS += , libgraphite2-dev (>= 0.9.3) [!armel !sparc]
endif
else
CONFIGURE_FLAGS += --disable-graphite
@@@ -603,7 -607,7 +603,7 @@@ ifeq "$(BUILD_DBG_PACKAGE)" "y
SMALL_SYMBOLS = n
endif
endif
- DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64 !alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg, libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(SYSTEM_GCC_VERSION)-dbg, libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg, libhunspell-$(shell pkg-config --modversion hunspell | cut -d. -f1,2)-0-dbg, libcurl4-dbg
+ DBG_DBG_SUGGESTS+= , libc6.1-dbg [ia64], libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg, libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(SYSTEM_GCC_VERSION)-dbg, libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg, libhunspell-$(shell pkg-config --modversion hunspell | cut -d. -f1,2)-0-dbg, libcurl4-dbg
endif
ifeq "$(ENABLE_SYMBOLS)" "y"
# Small symbols?
@@@ -621,21 -625,22 +621,21 @@@ ifeq (debug,$(findstring debug,$(DEB_BU
endif
-# Build python depends from current python version
-PYMAJOR:=$(shell python -c "import sys; print sys.version_info[0]")
-PYMINOR:=$(shell python -c "import sys; print sys.version_info[1]")
-PYMINORPLUS1:=$(shell python -c "import sys; print sys.version_info[1]+1")
-PYTHON_SITE:=debian/python-uno/$(shell python -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
-PY3MAJOR:=$(shell python3 -c "import sys; print (sys.version_info[0])")
-PY3MINOR:=$(shell python3 -c "import sys; print (sys.version_info[1])")
-PY3MINORPLUS1:=$(shell python3 -c "import sys; print (sys.version_info[1]+1)")
-PYTHON3_SITE:=debian/python3-uno/$(shell python3 -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+PYMAJOR:=$(shell $(PYTHON) -c "import sys; print sys.version_info[0]")
+PYMINOR:=$(shell $(PYTHON) -c "import sys; print sys.version_info[1]")
+PYMINORPLUS1:=$(shell $(PYTHON) -c "import sys; print sys.version_info[1]+1")
+PYTHON_SITE:=debian/python-uno/$(shell $(PYTHON) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+PY3MAJOR:=$(shell $(PYTHON3) -c "import sys; print (sys.version_info[0])")
+PY3MINOR:=$(shell $(PYTHON3) -c "import sys; print (sys.version_info[1])")
+PY3MINORPLUS1:=$(shell $(PYTHON3) -c "import sys; print (sys.version_info[1]+1)")
+PYTHON3_SITE:=debian/python3-uno/$(shell $(PYTHON3) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
ifeq "$(BUILD_PYUNO)" "y"
BUILD_DEPS += , python (>= 2.6.6-3+squeeze4)
DBG_DBG_SUGGESTS+= , python-dbg
BUILD_DEPS += , $(PYTHON)-dev (>= 2.6)
ifeq "$(ENABLE_PYTHON3)" "y"
- BUILD_DEPS += , $(PYTHON3)-dev (>= 3.2)
+ BUILD_DEPS += , $(PYTHON3)-dev
endif
else
BUILD_DEPS += , python
@@@ -754,7 -759,7 +754,7 @@@ ifeq "$(ENABLE_JAVA)" "y
ifeq "$(SQUEEZE_BACKPORT)" "y"
GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`readlink /usr/lib/libgcj_bc.so.1` | cut -d: -f1 | sed -e s/$$/-awt/)
else
- GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/gcj-$(GCJ_JDK_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 | sed -e s/$$/-awt/)
+ GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/gcj-$(GCJ_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 | sed -e s/$$/-awt/)
endif
DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e s/awt/dbg/)
JAVA_RUNTIME_DEPENDS = default-jre | gcj-jre | java-gcj-compat
@@@ -1466,6 -1471,7 +1466,7 @@@ ifeq (pt-BR,$(findstring pt-BR,$(LANGPA
perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control
endif
perl -pi -e 's/Package: libreoffice$(VER)-help-en-us/Package: libreoffice$(VER)-help-en-us\nReplaces: libreoffice$(VER)-common (<< 1:3.0.0~dev300m28)/' debian/control
+ perl -pi -e 's/Package: libreoffice$(VER)-help-en-us/Package: libreoffice$(VER)-help-en-us\nBreaks: $(foreach d,$(shell echo $(filter-out en-US,$(HELPISOS)) | tr A-Z a-z),libreoffice$(VER)-help-$(d),)/' debian/control
ifeq "$(ENABLE_GIO)" "y"
perl -pi -e 's/VFS/GIO/' debian/control
@@@ -1597,19 -1603,11 +1598,19 @@@ ifeq "$(BUILD_PYUNO)" "y
# then...
rm -rf $(SOURCE_TREE)/pyuno-py3
cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/pyuno-py3
+ ifeq "$(PYTHON3_VERSION)" "current"
+ cd $(SOURCE_TREE)/pyuno-py3; \
+ rm -rf $(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT); \
+ . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
+ PATH=$(BUILD_PATH) PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags python$(PY3MAJOR)) PYTHON_LIBS=$(shell pkg-config --libs python$(PY3MAJOR)) \
+ ../solenv/bin/build.pl # NO DELIVER!
+ else
cd $(SOURCE_TREE)/pyuno-py3; \
rm -rf $(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT); \
. $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
- PATH=$(BUILD_PATH) PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR)mu) PYTHON_LIBS=$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR)mu) \
+ PATH=$(BUILD_PATH) PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR)) PYTHON_LIBS=$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR)) \
../solenv/bin/build.pl # NO DELIVER!
+ endif
endif
endif
@@@ -1674,11 -1672,6 +1675,11 @@@ $(STAMP_DIR)/install: $(STAMP_DIR)/buil
export OOINSTBASE=$(OODIR); \
export OOO_LANGS_LIST="$(ISOS)"; \
$(CURDIR)/debian/scripts/gid2pkgdirs.sh
+
+ # FIXME
+ if echo $(DEB_HOST_ARCH) | grep -q kfreebsd; then \
+ cd $(CURDIR)/debian/tmp/pkg && rm -rf \*; \
+ fi
# prepare install/dir files for dh
for i in `cd $(CURDIR)/debian/tmp/pkg; ls -1 | xargs`; do \
@@@ -2098,11 -2091,11 +2099,11 @@@ ifeq "$(ENABLE_EVO2)" "y
endif
ifeq "$(PACKAGE_NSPLUGIN)" "y"
- mkdir -p -m755 debian/mozilla-libreoffice$(VER)/$(OODIR)/program
+ mkdir -p -m755 debian/browser-plugin-libreoffice$(VER)/$(OODIR)/program
for f in libnpsoplugin.so nsplugin; do \
- mv $(PKGDIR)-core/$(OODIR)/program/$$f debian/mozilla-libreoffice$(VER)/$(OODIR)/program; \
+ mv $(PKGDIR)-core/$(OODIR)/program/$$f debian/browser-plugin-libreoffice$(VER)/$(OODIR)/program; \
done
- cd debian/mozilla-libreoffice$(VER) && \
+ cd debian/browser-plugin-libreoffice$(VER) && \
mkdir -p usr/lib/mozilla/plugins && \
ln -sf /$(OODIR)/program/libnpsoplugin.so \
usr/lib/mozilla/plugins/libnpsoplugin.so
@@@ -2278,7 -2271,6 +2279,7 @@@ ifeq "$(PACKAGE_SDK)" "y
# fix permissions
find $(PKGDIR)-dev/usr/share/idl/$(OODIRNAME) -type f -exec chmod 644 {} \;
+ rm -f $(PKGDIR)-dev//usr/share/doc/libreoffice/sdk/readme/LICENSE.gz
endif
ifeq "$(LINK_TO_STLPORT)" "y"
@@@ -2340,10 -2332,6 +2341,10 @@@ ifeq "$(ENABLE_MINIMIZER)" "y
rm -f $(PKGDIR)-presentation-minimizer/$(OODIR)/share/extensions/presentation-minimizer/registration/LICENSE
endif
+ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
+ rm -f usr/lib/libreoffice/share/extensions/presenter-screen/registration/LICENSE
+endif
+
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
rm -f $(PKGDIR)-mysql-connector/$(OODIR)/share/extensions/mysql-connector-ooo/registration/LICENSE
endif
@@@ -2369,7 -2357,6 +2370,7 @@@ endi
if [ -e debian/$$i.bug-script.in ]; then \
cat debian/$$i.bug-script.in \
| sed -e "s/@PLATFORMID@/$(PLATFORMID)/" \
+ | sed -e "s/@OOVER@/$(OOVER)/" \
> debian/$$i.bug-script; \
fi ;\
done
@@@ -2845,7 -2832,7 +2846,7 @@@ endi
ifeq "$(ENABLE_LIBRSVG)" "y"
ifeq "$(SYSTEM_LIBRSVG)" "y"
# dlopen()'ed only for some weird reason (even when --with-librsvg=internal!)
- perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat /var/lib/dpkg/info/librsvg*.shlibs | awk '{ print $$3,$$4,$$5 }')/' $(PKGDIR)-core.substvars
+ perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat /var/lib/dpkg/info/librsvg*.shlibs | awk '{ print $$3 }')/' $(PKGDIR)-core.substvars
endif
endif
# don't make uno-libs3 depend on ure...
@@@ -3102,7 -3089,7 +3103,7 @@@ $(call get_orig_tarball,-%)
$(call pack_gittarball,$*,$@,libreoffice-$(DEB_VERSION_UPSTREAM)/$*)
# Get upstream external sources
-$(call get_orig_tarball,-src): binfilter/no_localization dictionaries/en/README.txt helpcontent2/makefile.pmk translations/makefile.mk .gitignore
+$(call get_orig_tarball,-src): binfilter/no_localization helpcontent2/makefile.pmk translations/makefile.mk .gitignore
dh_testdir
rm -rf $(TARFIILE_LOCATION)
mkdir -p $(TARFILE_LOCATION)
@@@ -3117,6 -3104,9 +3118,6 @@@
binfilter/no_localization: $(call get_orig_tarball,-binfilter)
$(call unpack_gittarball,binfilter,$<,)
-dictionaries/en/README.txt: $(call get_orig_tarball,-dictionaries)
- $(call unpack_gittarball,dictionaries,$<,)
-
translations/makefile.mk: $(call get_orig_tarball,-translations)
$(call unpack_gittarball,translations,$<,)
--
LibreOffice packaging repository
Reply to: