[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.0-2-57-gd596b0c
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit c483f683994e416be218fee7f496d876f5282852
Merge: 2d594a966f4c94eb96f7eef1241593a39d38573a a9613a0cfaf22d4fa91652cbd135787cbf61e790
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Mar 1 12:44:08 2012 +0100
Merge commit 'a9613a0cfaf22d4fa91652cbd135787cbf61e790' into ubuntu-precise-3.5
Conflicts:
changelog
patches/series
rules
source/include-binaries
diff --combined changelog
index f6a9962,f962ce8..fa4bb74
--- a/changelog
+++ b/changelog
@@@ -1,75 -1,46 +1,107 @@@
-libreoffice (1:3.5.0-3) UNRELEASED; urgency=low
++libreoffice (1:3.5.0-2ubuntu1) oneiric; urgency=low
+
- * debian/patches/armhf-bridges-doubles.diff: some more armhf fixes
- (+ testcase) from master
-
- * debian/control.fonts.in: make ttf-opensymbol Priority: extra, thanks
- lintian
++ * merge from debian-experimental-3.5 at
++ a9613a0cfaf22d4fa91652cbd135787cbf61e790
+
- -- Rene Engelhard <rene@debian.org> Thu, 23 Feb 2012 17:37:45 +0100
++ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 01 Mar 2012 12:40:18 +0100
+
+ libreoffice (1:3.5.0-2) experimental; urgency=low
+
+ [ Rene Engelhard ]
+ * debian/patches/armhf-bridges*.diff: add armhf bridges fixes from
+ Jani Monoses (LP: #900636)
+ * debian/patches/revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff:
+ remove, obsolete
+ * debian/patches/icu-arm.diff: fix internal icu build on arm.
+ * debian/patches/move-binfilter-mimetypes-in-extra-desktop-file.diff:
+ as name says; imported from Fedora
+ * debian/patches/passwordTest-test-old-password-algorith-too.diff: as name
+ says (see fdo#45171 and #659733/#659720)
+ * debian/patches/getMIMEDescription-mismatch.diff: update with proper
+ ./configure check, thanks Lubok Lunak...; also update internal header
+
+ * debian/rules:
+ - remove obsolete (and buggy) conditional icu-on-arm-fails breaking
+ the build
+ - apply patch from Rico Tzschichholz to update some configure flags
+ to new names in 3.5.x; remove some obsolete ones
+ - don't try to mv libvclplug_gtk3.so if not built, thanks Rico
+ Tzschichholz again
+ - disable base (libebook1.2-dev missing and nsplugin (xulrunner-dev
+ missing) on s390x
+ - disable *all* extensions on s390*, extension mechanism broken
+ * debian/source/components: remove, unused and causes lintian error
+
+ [ Bjoern Michaelsen ]
+ * debian/libreoffice-common.postrm.in: remove mismerged superfluous fi
+ (closes: #660580)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 22 Feb 2012 08:34:06 +0100
+
+libreoffice (1:3.5.0-1ubuntu4) precise; urgency=low
+
+ * disable reportbuilder again, java deps are just too heavy
+ * drop reportbuilder deps
+ * using partial internal lucene copy (again because deps)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 24 Feb 2012 13:25:34 +0100
+
+libreoffice (1:3.5.0-1ubuntu3) precise; urgency=low
+
+ * MIR lucene2 (LP related: #938708)
+ * MIR libcmis (LP related: #938709)
+ * MIR libexttextcat (LP related: #938582)
+ * MIR sampleicc (LP related: #938712)
+ * reenable reportdesigner
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 23 Feb 2012 14:33:42 +0100
+
+libreoffice (1:3.5.0-1ubuntu2) precise; urgency=low
+
+ * replaces/breaks for the unopkg move
+ * make gbuild use hardlinks and use linkoo in smoketest to save some
+ space
+ * do not run checks on powerpc armel armhf for now as they fail with
+ debug output level 11 is too high rules
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 22 Feb 2012 10:54:18 +0100
+
+libreoffice (1:3.5.0-1ubuntu1) precise; urgency=low
+
+ * Ubuntufy splash progress
+ * merge from debian-experimental-3.5
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 20 Feb 2012 03:26:05 +0100
+
- libreoffice (1:3.5.0-2) UNRELEASED; urgency=low
++libreoffice (1:3.5.0-3) UNRELEASED; urgency=low
+
- [ Rene Engelhard ]
- * debian/patches/armhf-bridges*.diff: add armhf bridges fixes from
- Jani Monoses (LP: #900636)
- * debian/patches/revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff:
- remove, obsolete
- * debian/patches/icu-arm.diff: fix internal icu build on arm.
++ * debian/patches/armhf-bridges-doubles.diff: some more armhf fixes
++ (+ testcase) from master
+
- * debian/rules:
- - remove obsolete (and buggy) conditional icu-on-arm-fails breaking
- the build
-
- [ Bjoern Michaelsen ]
- * debian/libreoffice-common.postrm.in: remove mismerged superfluous fi
++ * debian/control.fonts.in: make ttf-opensymbol Priority: extra, thanks
++ lintian
+
- -- Rene Engelhard <rene@debian.org> Thu, 16 Feb 2012 22:46:30 +0000
++ -- Rene Engelhard <rene@debian.org> Thu, 23 Feb 2012 17:37:45 +0100
+
+libreoffice (1:3.5.0-1ubuntu1~ppa2) precise; urgency=low
+
+ * remove failing smoketest cleanup code for now
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Sat, 18 Feb 2012 18:53:38 +0100
+
+libreoffice (1:3.5.0-1ubuntu1~ppa1) precise; urgency=low
+
+ * reenable EVO2 and MEDIAWIKI extensions (reduces delta to debian)
+ * move unopkg wrapper from -common to -core to allow extension
+ registration
+ * do extension registration from -common to -core because we actually
+ have the binaries (unopkg.bin etc.) to do it there (LP: #917153)
+ * cherry-picked from debian-experimental-3.5:
+ debian/libreoffice-common.postrm.in: remove mismerged superfluous fi
+ * use source tarballs from debian
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 17 Feb 2012 14:01:47 +0100
+
libreoffice (1:3.5.0-1) experimental; urgency=low
* LibreOffice 3.5.0 final release (identical to rc3)
@@@ -153,13 -124,6 +185,13 @@@ libreoffice (1:3.5.0~rc1-1) experimenta
-- Rene Engelhard <rene@debian.org> Fri, 20 Jan 2012 10:19:36 +0000
+libreoffice (1:3.5.0~beta2-2ubuntu4) precise; urgency=low
+
+ * demote lucene and java-common recommends to suggests for help
+ packages again (LP: #916726)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 19 Jan 2012 19:14:09 +0100
+
libreoffice (1:3.5.0~beta3-1) experimental; urgency=low
* new upstream beta release
@@@ -199,50 -163,6 +231,50 @@@
-- Rene Engelhard <rene@debian.org> Tue, 17 Jan 2012 10:03:24 +0000
+libreoffice (1:3.5.0~beta2-2ubuntu3) precise; urgency=low
+
+ * enable l10n
+ * get rid of obsolete BrOffice specialcasing (LP: #884786)
+ * add control tags as per 'firefox distro add-on support'-spec (picked
+ from oneiric-3.4)
+ * enable human theme and make it the default for gtk desktops
+ * cherry-pick Replaces commit from 3.4 (LP: #705343)
+ * cherry-pick demotion of java-Recommends for -writer to Suggests
+ * make preinst cleanup a bit more robust (LP: #915271)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 13 Jan 2012 11:09:32 +0100
+
+libreoffice (1:3.5.0~beta2-2ubuntu2) precise; urgency=low
+
+ * enable gio, disable gvfs
+ * backport fpicker kde4 workaround by Lubos Lunak
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 11 Jan 2012 11:43:19 +0100
+
+libreoffice (1:3.5.0~beta2-2ubuntu1) precise; urgency=low
+
+ * reenable junit tests
+ - however, disable sc unoapi tests for now
+ - unset DISPLAY for subsequenttests
+ * no dependencies needed for full builds
+ - propagate gb_FULLDEPS
+ * SOURCE_TREE still needed as root path
+ * also look for mozilla-plugin with pkg-config
+ * allow firefox-dev as alternative to xulrunner-dev
+ * for now, use internal:
+ - libcmis
+ - lpsolve
+ - libvisio
+ - lucene
+ - libexttextcat
+ - graphite
+ - sampleicc
+ * for now, disable:
+ - reportdesign
+ - smoketest on powerpc and armel
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 09 Jan 2012 16:21:55 +0100
+
libreoffice (1:3.5.0~beta2-2) experimental; urgency=low
* debian/patches/fix-ARM-detetcion-in-set-soenv.diff: as name says
diff --combined control
index 94e24f3,e18b63e..e487724
--- a/control
+++ b/control
@@@ -1,10 -1,9 +1,10 @@@
Source: libreoffice
Section: editors
Priority: optional
-Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-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, 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-dev (>= 1.12)
, 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), mingw-w64 (>= 1.0), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java (>= 1.1.1-9), 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 (>= 1.1.1-9), 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-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.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook
1.2-dev [!armel !powerpc !powerpcspe !ppc64], 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, libldap2-dev
+ 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-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-dev (>= 1.12)
, 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), mingw-w64 (>= 1.0), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java (>= 1.1.1-9), 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 (>= 1.1.1-9), 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-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.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook
1.2-dev [!armel !armhf !powerpc !powerpcspe !ppc64 !s390x], 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, 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
@@@ -17,7 -16,7 +17,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 !powerpc !powerpcspe !ppc64], 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}
+ Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer, libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math, libreoffice-base [!armel !armhf !powerpc !powerpcspe !ppc64 !s390x], 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}
Description: office productivity suite
@@@ -144,7 -143,7 +144,7 @@@ Description: office productivity suite
Package: libreoffice-writer
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}), libreoffice-base-core (= ${binary:Version}) [!armel !powerpc !powerpcspe !ppc64], ${shlibs:Depends}, ${misc:Depends}
+ Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (= ${binary:Version}) [!armel !armhf !powerpc !powerpcspe !ppc64 !s390x], ${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)
Suggests: libreoffice-gcj, libreoffice-base
@@@ -156,7 -155,7 +156,7 @@@ Description: office productivity suite
Package: libreoffice-calc
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}), libreoffice-base-core (= ${binary:Version}) [!armel !powerpc !powerpcspe !ppc64], ${shlibs:Depends}, ${lpsolve-dep}, ${misc:Depends}
+ Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (= ${binary:Version}) [!armel !armhf !powerpc !powerpcspe !ppc64 !s390x], ${shlibs:Depends}, ${lpsolve-dep}, ${misc:Depends}
Description: office productivity suite -- spreadsheet
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -191,7 -190,7 +191,7 @@@ Description: office productivity suite
This package contains the equation editor component for LibreOffice.
Package: libreoffice-base-core
- Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+ Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: libreoffice-base
Description: office productivity suite -- shared library
@@@ -205,7 -204,7 +205,7 @@@
install libreoffice-base.
Package: libreoffice-base
- Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+ Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 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
@@@ -3112,7 -3111,7 +3112,7 @@@ Description: office productivity suite
Package: mozilla-libreoffice
Section: net
- Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+ Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 sparc kfreebsd-amd64 kfreebsd-i386
Enhances: iceape-browser,
iceweasel,
mozilla-browser,
@@@ -3193,7 -3192,7 +3193,7 @@@ Description: LibreOffice extension for
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: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 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)
@@@ -3212,7 -3211,7 +3212,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: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 sparc kfreebsd-amd64 kfreebsd-i386
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress, ${misc:Depends}
Enhances: libreoffice-impress
@@@ -3237,7 -3236,7 +3237,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: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Description: LibreOffice extension for importing PDF documents
@@@ -3262,6 -3261,7 +3262,7 @@@ Description: OpenSymbol TrueType fon
Package: ttf-opensymbol
Section: oldlibs
+ Priority: extra
Architecture: all
Depends: fonts-opensymbol
Description: transitional package for fonts-opensymbol
@@@ -3337,7 -3337,7 +3338,7 @@@ Description: office productivity suite
Package: libreoffice-sdbc-postgresql
Section: misc
- Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+ Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 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)
@@@ -3351,7 -3351,7 +3352,7 @@@ Homepage: http://wiki.documentfoundatio
Package: libreoffice-mysql-connector
Section: misc
- Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+ Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 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)
@@@ -3364,7 -3364,7 +3365,7 @@@ Description: MySQL Connector extension
LibreOffice without any wrapper layer such as ODBC or JDBC.
Package: libreoffice-evolution
- Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+ Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 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
diff --combined patches/series
index 65ef7c6,94b7b60..69e5e70
--- a/patches/series
+++ b/patches/series
@@@ -33,7 -33,7 +33,11 @@@ odk-fix-rdb-paths.dif
armhf-bridges.diff
armhf-bridges-fix-armv4t-armel.diff
icu-arm.diff
+ move-binfilter-mimetypes-in-extra-desktop-file.diff
+ passwordTest-test-old-password-algorith-too.diff
+ pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
+ armhf-bridges-doubles.diff
+pkgconfig-mozilla-plugin.diff
+pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
+ubuntu-quicklists.diff
+fix-quickstart-shutdown.diff
diff --combined rules
index 07f646b,c4d796f..4864d5a
--- a/rules
+++ b/rules
@@@ -62,8 -62,10 +62,8 @@@ export QUILT_PATCHES=debian/patche
export QUILT_OPTIONS="-p1 -F0"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.5.0.3 libreoffice-3.5.0.3
GIT_TAG=libreoffice-3.5.0.3
-GIT_BRANCH=tag-libreoffice-3.5.0.3
+GIT_BRANCH=libreoffice-3-5.0.3
SOURCE_TREE=.
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/ext-sources
@@@ -246,7 -248,6 +246,6 @@@ ENABLE_GVFS=
ENABLE_GCONF=y
ENABLE_GIO=y
ENABLE_RANDR=y
- ENABLE_LAYOUT=n
ifeq "$(BUILD_GTK)" "y"
PACKAGE_NPSOPLUGIN=y
endif
@@@ -279,7 -280,7 +278,7 @@@ SYSTEM_STUFF += expa
SYSTEM_STUFF += odbc
SYSTEM_STUFF += curl
SYSTEM_STUFF += sane
- SYSTEM_STUFF += xrender-headers
+ SYSTEM_STUFF += xextensions-headers
SYSTEM_STUFF += mesa-headers
SYSTEM_STUFF += db
SYSTEM_STUFF += poppler
@@@ -293,12 -294,11 +292,11 @@@ CONFIGURE_FLAGS=
--with-vendor='$(OOO_VENDOR)' \
--with-install-dirname=$(OODIRNAME) \
--prefix=/usr --mandir=/usr/share/man \
- --with-docdir=/usr/share/doc/libreoffice \
- --disable-strip \
+ --docdir=/usr/share/doc/libreoffice \
+ --disable-strip-solver \
--enable-lockdown \
--libdir=/usr/lib \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --enable-broffice \
--enable-extension-integration \
--disable-online-update \
--disable-fetch-external \
@@@ -310,10 -310,6 +308,6 @@@ ifneq ($(ON_BUILDD),y
CONFIGURE_FLAGS += --enable-verbose
endif
- # distro-configs is too late; it already gets searched in unpack
- # when we don't do that here, too.
- CONFIGURE_FLAGS += --disable-access
-
CONFIGURE_FLAGS += --with-alloc=$(ALLOC)
#############
@@@ -363,14 -359,16 +357,16 @@@ OOO_GCJ_JDK_ARCHS := hppa kfreebsd-i38
OOO_OPENJDK_ARCHS := $(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_OPENJDK_ARCHS))
- OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(OOO_ARCHS)
+ OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(filter-out s390 s390x,$(OOO_ARCHS))
+ OOO_EXTENSIONS_ARCHS := $(OOO_ARCH_DEP_EXTENSIONS_ARCHS)
- OOO_BASE_ARCHS := $(filter-out armel powerpc powerpcspe ppc64,$(OOO_JAVA_ARCHS))
+ OOO_BASE_ARCHS := $(filter-out armel armhf powerpc powerpcspe ppc64 s390x,$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_BASE_ARCHS))
OOO_REPORTDESIGN_ARCHS := $(filter-out armel $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_REPORTDESIGN_ARCHS))
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
+ ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_BASE_ARCHS)))
PACKAGE_BASE=n
ENABLE_SDBC_POSTGRESQL=n
ENABLE_MYSQLNATIVE=n
@@@ -381,6 -379,7 +377,7 @@@
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-evolution -Nlibreoffice$(VER)-kab
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-sdbc-postgresql -Nlibreoffice$(VER)-mysql-connector
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
+ endif
endif
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
@@@ -389,6 -388,16 +386,16 @@@
ENABLE_PRESENTER_CONSOLE=n
ENABLE_SDBC_POSTGRESQL=n
ENABLE_MYSQLNATIVE=n
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-mysql-connector
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-pdfimport -Nlibreoffice$(VER)-presentation-minimizer
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-presenter-console
+ endif
+ ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
+ ENABLE_MEDIAWIKI=n
+ ENABLE_REPORTDESIGN=n
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-wiki-publisher
endif
ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS)))
@@@ -422,7 -431,7 +429,7 @@@ ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO
endif
ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
- OOO_NPSOPLUGIN_ARCHS = $(OOO_ARCHS)
+ OOO_NPSOPLUGIN_ARCHS = $(filter-out s390x,$(OOO_ARCHS))
else
OOO_NPSOPLUGIN_ARCHS=
endif
@@@ -433,6 -442,11 +440,11 @@@ ifneq (,$(filter arm% mips% m68k, $(DEB
endif
OOO_BINFILTER_ARCHS:=$(filter-out arm% mips% m68k, $(OOO_ARCHS))
+ ifeq (s390x,$(findstring s390x,$(DEB_HOST_ARCH)))
+ ENABLE_EVO2=n
+ SYSTEM_STUFF := $(filter-out mozilla-headers, $(SYSTEM_STUFF))
+ endif
+
#############
# Distro-specific overrides
@@@ -444,7 -458,6 +456,7 @@@ ifeq "$(DEB_VENDOR)" "Debian
BUILD_ONLY_EN_US=y
endif
CONFIGURE_FLAGS += --with-intro-progressbar-color=215,7,81
+ VENDOR_PRESENTATION_TEMPLATES=templates
endif
# Debian Squeeze
@@@ -456,24 -469,6 +468,24 @@@ ifeq "$(SQUEEZE_BACKPORT)" "y
ENABLE_PDFIMPORT=n
endif
+ifeq "$(DEB_VENDOR)" "Ubuntu"
+ IMAGES+=human
+ CONFIGURE_FLAGS+= --with-theme="$(patsubst galaxy,default,$(IMAGES))"
+ SYSTEM_STUFF := $(filter-out graphite libvisio lpsolve, $(SYSTEM_STUFF))
+ CONFIGURE_FLAGS += --with-intro-progressbar-color=221,72,20
+ # unfortunately way to heavy dependency-wise for main (via libloader)
+ ENABLE_REPORTDESIGN=n
+ # too heavy deps for main, internal copy does only build parts
+ SYSTEM_STUFF:=$(filter-out lucene,$(SYSTEM_STUFF))
+ # do not run checks on armel armhf powerpc for now as they fail with "debug output level 11 is too high"
+ ifneq (,$(filter armhf armel powerpc,$(DEB_HOST_ARCH)))
+ RUN_MAKE_CHECK:=n
+ endif
+ VENDOR_PRESENTATION_TEMPLATES=ubuntu-templates
+ SYSTEM_STUFF := $(filter-out libexttextcat,$(SYSTEM_STUFF))
+ $(info foo $(SYSTEM_STUFF))
+endif
+
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
CC_PREFIX:=$(shell gcc -dumpmachine)-
@@@ -522,7 -517,7 +534,7 @@@ ifneq "$(ENABLE_PRESENTER_CONSOLE)" "y
CONFIGURE_FLAGS += --disable-ext-presenter-console
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
- BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev
+ BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev
else
CONFIGURE_FLAGS += --disable-ext-pdfimport
endif
@@@ -568,7 -563,7 +580,7 @@@ endi
ifneq (,$(filter sane, $(SYSTEM_STUFF)))
BUILD_DEPS += , libsane-dev
endif
- ifneq (,$(filter xrender-headers, $(SYSTEM_STUFF)))
+ ifneq (,$(filter xextensions-headers, $(SYSTEM_STUFF)))
BUILD_DEPS += , libxrender-dev
endif
ifneq (,$(filter libpng, $(SYSTEM_STUFF)))
@@@ -585,7 -580,7 +597,7 @@@ ifneq (,$(filter openssl, $(SYSTEM_STUF
DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/libssl.so | cut -d"." -f3,4,5)-dbg
else
DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libssl.so | cut -d"." -f3,4,5)-dbg
- endif
+ endif
endif
ifneq "$(ENABLE_RSVG)" "y"
@@@ -723,12 -718,6 +735,6 @@@ ifneq "$(BUILD_ONLY_EN_US)" "y
endif
endif
- ifeq "$(VER)" ""
- CONFIGURE_FLAGS += --with-binsuffix=no
- else
- CONFIGURE_FLAGS += --with-binsuffix=$(VER)
- endif
-
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "default"
JAVA_HOME=/usr/lib/jvm/default-java
@@@ -875,7 -864,7 +881,7 @@@ ifneq (,$(filter nss, $(SYSTEM_STUFF))
DBG_DBG_SUGGESTS+= , libnss3-1d-dbg
endif
ifneq (,$(filter mozilla-headers, $(SYSTEM_STUFF)))
- BUILD_DEPS+= , xulrunner-dev
+ BUILD_DEPS+= , xulrunner-dev | firefox-dev
endif
CONFIGURE_FLAGS += --disable-build-mozilla --disable-mozilla
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NPSOPLUGIN_ARCHS)))
@@@ -1043,7 -1032,7 +1049,7 @@@ endi
ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
BUILD_DEPS += , libpq-dev (>= 9.0~)
else
- CONFIGURE_FLAGS += --disable-sdbc-postgresql
+ CONFIGURE_FLAGS += --disable-postgresql-sdbc
endif
ifeq "$(ENABLE_RANDR)" "y"
@@@ -1052,10 -1041,6 +1058,6 @@@ els
CONFIGURE_FLAGS += --disable-randr
endif
- ifneq "$(ENABLE_LAYOUT)" "y"
- CONFIGURE_FLAGS += --disable-layout
- endif
-
ifeq "$(BUILD_BINFILTERS)" "y"
CONFIGURE_FLAGS+= --enable-binfilter
OOO_BINFILTER_DEP = libreoffice$(VER)-filter-binfilter
@@@ -1064,10 -1049,6 +1066,6 @@@ endi
ifneq "$(BUILD_PYUNO)" "y"
DEBHELPER_OPTIONS+= -Npython-uno
CONFIGURE_FLAGS += --disable-python
- else
- ifeq "$(ENABLE_SCRIPT_PROVIDER_PYTHON)" "y"
- CONFIGURE_FLAGS += --enable-ext-scripting-python
- endif
endif
ifeq "$(ENABLE_JAVA)" "y"
@@@ -1627,7 -1608,7 +1625,7 @@@ ifeq "$(BUILD_PYUNO)" "y
endif
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- $(CURDIR)/debian/rules check
+ unset DISPLAY && $(CURDIR)/debian/rules check gb_FULLDEPS= gb_Deliver_HARDLINK=T
endif
touch $@
@@@ -1638,24 -1619,28 +1636,28 @@@ ifneq (,$(findstring $(DEB_HOST_ARCH),$
cd $(SOURCE_TREE)/smoketest && \
patch -p1 < $(CURDIR)/debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
+ ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
+ cd $(SOURCE_TREE)/smoketest && \
+ patch -p1 < $(CURDIR)/debian/patches/smoketest-disable-extension-tests.diff
+ endif
+ t=`mktemp -q -d`; \
cd $(SOURCE_TREE) && \
export PATH=$(BUILD_PATH); \
- export TMPDIR=$(CURDIR)/debian/smoketest; \
- export HOME=$(CURDIR)/debian/smoketest; \
+ export TMPDIR=$$t; \
+ export HOME=$$t; \
export SAL_USE_VCLPLUGIN="svp"; \
- $(MAKE) check gb_FULLDEPS= gb_Deliver_HARDLINK=T
- # doesn't get cleaned up.. (at least the dirs, the contents are gone)
- if test -d $(CURDIR)/debian/smoketest; then \
- cd $(CURDIR)/debian/smoketest && \
- find . -noleaf -maxdepth 1 ! -name "." -exec rm -rf {} \; ; \
- fi
-
+ $(MAKE) check gb_FULLDEPS= gb_Deliver_HARDLINK=T; \
+ rm -rf $$t
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
cd $(SOURCE_TREE)/smoketest && \
patch -p1 -R < $(CURDIR)/debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
+ ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
+ cd $(SOURCE_TREE)/smoketest && \
+ patch -p1 -R < $(CURDIR)/debian/patches/smoketest-disable-extension-tests.diff
+ endif
endif
install: $(STAMP_DIR)/install
@@@ -1760,10 -1745,11 +1762,11 @@@ endi
rm -rf debian/tmp/pkg
# move desktop files to their correct packages
- for i in base calc draw impress math writer; do \
- mkdir -p $(PKGDIR)-$$i/$(OODIR)/share/xdg; \
+ for i in base calc draw impress math writer binfilter; do \
+ if [ "$$i" = "binfilter" ]; then j=filter-binfilter; else j=$$i; fi; \
+ mkdir -p $(PKGDIR)-$$j/$(OODIR)/share/xdg; \
mv $(PKGDIR)-common/$(OODIR)/share/xdg/$$i.desktop \
- $(PKGDIR)-$$i/$(OODIR)/share/xdg; \
+ $(PKGDIR)-$$j/$(OODIR)/share/xdg; \
done
# move help to /usr/share
@@@ -1934,9 -1920,9 +1937,9 @@@ $(STAMP_DIR)/langpacks: $(STAMP_DIR)/in
> $$TMP && \
debian/scripts/cleandupes --base=libreoffice$(VER) --prefix=debian < $$TMP && rm -f $$TMP
-ifeq "$(DEB_VENDOR)" "Debian"
- # install Debian presentation template
- otps=`cd debian/templates; echo *.otp`; \
+ifneq "$(VENDOR_PRESENTATION_TEMPLATES)" ""
+ # install vendor presentation template
+ otps=`cd debian/$(VENDOR_PRESENTATION_TEMPLATES); echo *.otp`; \
for iso in $(LANGPACKISOS); do \
[ "$$iso" = "en-US" ] && continue; \
pkgiso=`echo $$iso | tr \[:upper:\] \[:lower:\]`; \
@@@ -2062,10 -2048,12 +2065,12 @@@ endi
# split out gtk stuff
rm -rf $(PKGDIR)-gtk
- rm -rf $(PKGDIR)-gtk3
mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/program
+ ifeq "$(BUILD_GTK3)" "y"
+ rm -rf $(PKGDIR)-gtk3
mkdir -p -m755 $(PKGDIR)-gtk3/$(OODIR)/program
mv $(PKGDIR)-gnome/$(OODIR)/program/libvclplug_gtk3lo.so $(PKGDIR)-gtk3/$(OODIR)/program/
+ endif
mv $(PKGDIR)-gnome/$(OODIR)/program/* $(PKGDIR)-gtk/$(OODIR)/program/
ifeq "$(BUILD_GTK)" "y"
mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/share
diff --combined scripts/gid2pkgdirs.sh
index 11e4169,9e809ee..1a0c17c
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@@ -65,7 -65,8 +65,8 @@@ mv ./usr/share/mimelnk/application/*
# pkg/libreoffice-$p/usr/share/man/man1
#done
for i in ./usr/share/applications/*.desktop; do \
- if [ "`basename $i`" = "libreoffice-startcenter.desktop" ]; then p=libreoffice-common; else \
+ if [ "`basename $i`" = "libreoffice-startcenter.desktop" ]; then p=libreoffice-common; \
+ elif [ "`basename $i`" = "libreoffice-binfilter.desktop" ]; then p=libreoffice-filter-binfilter; else \
p=`basename $i .desktop`; fi
mkdir -p pkg/$p/usr/share/applications
mv $i \
@@@ -118,7 -119,7 +119,7 @@@ create_package_directory gid_Module_Opt
create_package_directory gid_Module_Optional_Extensions_PRESENTER_SCREEN pkg/libreoffice-presenter-console
create_package_directory gid_Module_Optional_Extensions_REPORTDESIGN pkg/libreoffice-report-builder
create_package_directory gid_Module_Optional_PostgresqlSdbc pkg/libreoffice-sdbc-postgresql
-move_wrappers pkg/libreoffice-common soffice unopkg
+move_wrappers pkg/libreoffice-common soffice
move_wrappers pkg/libreoffice-common libreoffice loffice lofromtemplate
move_wrappers pkg/libreoffice-base lobase
move_wrappers pkg/libreoffice-writer lowriter loweb
diff --combined source/include-binaries
index 21c1c94,e49da42..24414d4
--- a/source/include-binaries
+++ b/source/include-binaries
@@@ -1,9 -1,3 +1,10 @@@
debian/templates/debian-presentation.otp
debian/templates/debian-presentation-background.xcf
+debian/ubuntu-templates/Human.otp
+debian/ubuntu-templates/Glossy.otp
+debian/ubuntu-templates/Ubuntu.otp
+debian/ubuntu-templates/Grey.otp
+debian/ubuntu-templates/Orange.otp
+debian/ubuntu-templates/Blue.otp
+debian/ubuntu-templates/Green.otp
+ sc/qa/unit/data/ods/passwordOld.ods
--
LibreOffice packaging repository
Reply to: