|
|
|
|
@ -1,6 +1,103 @@
|
|
|
|
|
diff -urN debian/changelog debian/changelog
|
|
|
|
|
--- debian/changelog 2011-04-19 17:25:22.000000000 -0500
|
|
|
|
|
+++ debian/changelog 2011-08-20 21:10:45.000000000 -0500
|
|
|
|
|
@@ -1,3 +1,9 @@
|
|
|
|
|
+libreoffice (1:3.3.2-1ubuntu5~build1~natty) natty; urgency=low
|
|
|
|
|
+
|
|
|
|
|
+ * Enable TDE module
|
|
|
|
|
+
|
|
|
|
|
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 20 Aug 2011 15:14:00 -0600
|
|
|
|
|
+
|
|
|
|
|
libreoffice (1:3.3.2-1ubuntu4) natty; urgency=low
|
|
|
|
|
|
|
|
|
|
* fix corrupted startcenter desktop file (LP: #765010)
|
|
|
|
|
diff -urN debian/control debian/control
|
|
|
|
|
--- debian/control 2011-04-19 17:25:51.000000000 -0500
|
|
|
|
|
+++ debian/control 2011-08-20 21:14:56.000000000 -0500
|
|
|
|
|
@@ -4,7 +4,7 @@
|
|
|
|
|
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: 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, libpq-dev, po-debconf, bc, wget | curl, g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390], dpkg-dev (>= 1.15.1), libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libgraphite-dev, libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk [alpha amd64 armel armhf i386 powerpc powerpcspe ppc64 s390 s390x sparc], gcj-native-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel], libpentaho-reporting-flow-engine-java-openoffice.org [!armel], liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel], libformula-java-openoffice.org [!armel], librepository-java-openoffice.org [!armel], libfonts-java-openoffice.org [!armel], libserializer-java-openoffice.org [!armel], libcommons-logging-java, libservlet2.5-java, xulrunner-dev | firefox-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev, 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), libxrandr-dev, 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.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, libldap2-dev
|
|
|
|
|
+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, libpq-dev, po-debconf, bc, wget | curl, g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390], dpkg-dev (>= 1.15.1), libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libgraphite-dev, libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk [alpha amd64 armel armhf i386 powerpc powerpcspe ppc64 s390 s390x sparc], gcj-native-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel], libpentaho-reporting-flow-engine-java-openoffice.org [!armel], liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel], libformula-java-openoffice.org [!armel], librepository-java-openoffice.org [!armel], libfonts-java-openoffice.org [!armel], libserializer-java-openoffice.org [!armel], libcommons-logging-java, libservlet2.5-java, xulrunner-dev | firefox-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev, 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, kdelibs4-trinity-dev, libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libxrandr-dev, 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.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, 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~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
|
|
|
|
|
Standards-Version: 3.9.1
|
|
|
|
|
@@ -18,7 +18,7 @@
|
|
|
|
|
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-writer, libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math, libreoffice-base [!armel], libreoffice-report-builder-bin [!armel], ttf-dejavu, ttf-sil-gentium-basic, libreoffice-filter-mobiledev, ${lucene-depends}, ${java-common-depends}, ${misc:Depends}
|
|
|
|
|
Recommends: ttf-liberation | ttf-mscorefonts-installer
|
|
|
|
|
-Suggests: hunspell-dictionary, myspell-dictionary, libreoffice-help-${help-l10n-virtual-version}, menu, 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, libpaper-utils, ${gstreamer-plugins-suggests}, ${libldap-suggests}, ${ooo-binfilter-dep}, ${ooo-officebean-dep}
|
|
|
|
|
+Suggests: hunspell-dictionary, myspell-dictionary, libreoffice-help-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd, libsane, hyphen-hyphenation-patterns, mythes-thesaurus, libxrender1, libgl1, libreoffice-gnome | libreoffice-kde | libreoffice-trinity, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-libreoffice, pstoedit, imagemagick | graphicsmagick-imagemagick-compat, libpaper-utils, ${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
|
|
|
|
|
a near drop-in replacement for Microsoft(R) Office.
|
|
|
|
|
@@ -45,6 +45,7 @@
|
|
|
|
|
QuickStarter for GNOMEs notification are
|
|
|
|
|
* libreoffice-gnome: GNOME VFS, GConf backend
|
|
|
|
|
* libreoffice-kde: KDE UI Plugin and KDE File Picker support
|
|
|
|
|
+ * libreoffice-trinity: TDE UI Plugin and TDE File Picker support
|
|
|
|
|
* menu: Will add libreoffice menu entries for every Debian window manager.
|
|
|
|
|
* unixodbc: ODBC database support
|
|
|
|
|
* cups-bsd: Allows LibreOffice to detect your CUPS printer queues
|
|
|
|
|
@@ -91,7 +92,7 @@
|
|
|
|
|
Package: libreoffice-core
|
|
|
|
|
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}), 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}), 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)
|
|
|
|
|
+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-trinity (<< ${binary:Version}), libreoffice-evolution (<< ${binary:Version}), libreoffice-filter-so52 (<< ${binary:Version}), libreoffice-officebean (<< ${binary:Version}), libreoffice-dev (<< ${binary:Version}), 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), myspell-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)
|
|
|
|
|
Provides: libreoffice-bundled
|
|
|
|
|
Description: office productivity suite -- arch-dependent files
|
|
|
|
|
@@ -772,7 +773,7 @@
|
|
|
|
|
Section: debug
|
|
|
|
|
Architecture: alpha 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}
|
|
|
|
|
+Depends: libreoffice-core (= ${binary:Version}) | libreoffice-gcj (= ${binary:Version}) | libreoffice-dev (= ${binary:Version}) | libreoffice-gnome (= ${binary:Version}) | libreoffice-kde (= ${binary:Version}) | libreoffice-trinity (= ${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
|
|
|
|
|
Suggests: ${dbg-dbg-suggests}
|
|
|
|
|
Description: office productivity suite -- debug symbols
|
|
|
|
|
@@ -834,6 +835,25 @@
|
|
|
|
|
* konqueror / kmail
|
|
|
|
|
* libreoffice-kab: KDE Addressbook support
|
|
|
|
|
|
|
|
|
|
+Package: libreoffice-trinity
|
|
|
|
|
+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: ${tde-iconset-dep}
|
|
|
|
|
+Suggests: konqueror-trinity, kmail-trinity, libreoffice-kab-trinity
|
|
|
|
|
+Section: kde
|
|
|
|
|
+Enhances: libreoffice
|
|
|
|
|
+Replaces: openoffice.org-trinity (<< 1:3.3.0~)
|
|
|
|
|
+Description: office productivity suite -- TDE integration
|
|
|
|
|
+ LibreOffice is a full-featured office productivity suite that provides
|
|
|
|
|
+ a near drop-in replacement for Microsoft(R) Office.
|
|
|
|
|
+ .
|
|
|
|
|
+ This package contains the TDE plugin for drawing OOo's widgets with
|
|
|
|
|
+ TDE/Qt and a TDEish File Picker when running under TDE.
|
|
|
|
|
+ You can extend the functionality of this by installing these packages:
|
|
|
|
|
+ .
|
|
|
|
|
+ * konqueror-trinity / kmail-trinity
|
|
|
|
|
+ * libreoffice-kab-trinity: TDE Addressbook support
|
|
|
|
|
+
|
|
|
|
|
Package: libreoffice-sdbc-postgresql
|
|
|
|
|
Section: misc
|
|
|
|
|
Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
|
|
|
|
|
diff -urN debian/control.in debian/control.in
|
|
|
|
|
--- debian/control.in 2011-04-19 17:25:22.000000000 -0500
|
|
|
|
|
+++ debian/control.in 2011-08-20 21:12:34.000000000 -0500
|
|
|
|
|
@@ -180,6 +180,7 @@
|
|
|
|
|
libreofficeVER-gtk (<< ${binary:Version}),
|
|
|
|
|
libreofficeVER-gnome (<< ${binary:Version}),
|
|
|
|
|
libreofficeVER-kde (<< ${binary:Version}),
|
|
|
|
|
+ libreofficeVER-trinity (<< ${binary:Version}),
|
|
|
|
|
libreofficeVER-evolution (<< ${binary:Version}),
|
|
|
|
|
libreofficeVER-filter-so52 (<< ${binary:Version}),
|
|
|
|
|
libreofficeVER-officebean (<< ${binary:Version}),
|
|
|
|
|
diff -urN debian/control.tdeab.in debian/control.tdeab.in
|
|
|
|
|
--- debian/control.tdeab.in 1969-12-31 18:00:00.000000000 -0600
|
|
|
|
|
+++ debian/control.tdeab.in 2011-08-17 15:06:12.644738668 -0500
|
|
|
|
|
+++ debian/control.tdeab.in 2011-08-20 14:31:00.000000000 -0500
|
|
|
|
|
@@ -0,0 +1,14 @@
|
|
|
|
|
+Package: libreofficeVER-kab-trinity
|
|
|
|
|
+Architecture: %OOO_BASE_ARCHS%
|
|
|
|
|
@ -18,7 +115,7 @@ diff -urN debian/control.tdeab.in debian/control.tdeab.in
|
|
|
|
|
+
|
|
|
|
|
diff -urN debian/control.tde.in debian/control.tde.in
|
|
|
|
|
--- debian/control.tde.in 1969-12-31 18:00:00.000000000 -0600
|
|
|
|
|
+++ debian/control.tde.in 2011-08-19 16:39:45.660276026 -0500
|
|
|
|
|
+++ debian/control.tde.in 2011-08-20 14:31:00.000000000 -0500
|
|
|
|
|
@@ -0,0 +1,23 @@
|
|
|
|
|
+Package: libreofficeVER-trinity
|
|
|
|
|
+Architecture: %OOO_ARCHS%
|
|
|
|
|
@ -45,7 +142,7 @@ diff -urN debian/control.tde.in debian/control.tde.in
|
|
|
|
|
+
|
|
|
|
|
diff -urN debian/rules debian/rules
|
|
|
|
|
--- debian/rules 2011-04-19 17:25:22.000000000 -0500
|
|
|
|
|
+++ debian/rules 2011-08-19 12:24:54.642994139 -0500
|
|
|
|
|
+++ debian/rules 2011-08-20 14:31:00.000000000 -0500
|
|
|
|
|
@@ -175,7 +175,8 @@
|
|
|
|
|
BUILD_CAIROCANVAS=y
|
|
|
|
|
SYSTEM_STUFF += cairo
|
|
|
|
|
@ -236,4 +333,36 @@ diff -urN debian/rules debian/rules
|
|
|
|
|
+ -V'tde-iconset-dep=$(TDE_ICONSET_DEP)' \
|
|
|
|
|
-V'lpsolve-dep=$(LPSOLVE_DEP)' \
|
|
|
|
|
-V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \
|
|
|
|
|
-V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \
|
|
|
|
|
-V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \
|
|
|
|
|
diff -urN libreoffice-build/configure.in libreoffice-build/configure.in
|
|
|
|
|
--- libreoffice-build/configure.in 2011-03-15 11:51:33.000000000 -0500
|
|
|
|
|
+++ libreoffice-build/configure.in 2011-08-21 16:24:42.000000000 -0500
|
|
|
|
|
@@ -81,6 +81,11 @@
|
|
|
|
|
--disable-kde4 Disables KDE4 native widgets.],
|
|
|
|
|
,)
|
|
|
|
|
|
|
|
|
|
+AC_ARG_ENABLE(tde,
|
|
|
|
|
+[
|
|
|
|
|
+ --disable-tde Disables TDE native widgets.],
|
|
|
|
|
+,)
|
|
|
|
|
+
|
|
|
|
|
AC_ARG_ENABLE(mono,
|
|
|
|
|
[
|
|
|
|
|
--enable-mono Enables the compilation of the Mono bindings.],
|
|
|
|
|
@@ -928,6 +933,16 @@
|
|
|
|
|
OOO_WIDGET_FLAGS="$OOO_WIDGET_FLAGS --disable-kde4"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
+OOO_WIDGET_FLAGS=
|
|
|
|
|
+if test "$enable_tde" != "no"; then
|
|
|
|
|
+ if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" != "zCrossWin32"; then
|
|
|
|
|
+ OOO_WIDGET_FLAGS="--enable-tde"
|
|
|
|
|
+ widget_sets="tde"
|
|
|
|
|
+ fi
|
|
|
|
|
+else
|
|
|
|
|
+ OOO_WIDGET_FLAGS="--disable-tde"
|
|
|
|
|
+fi
|
|
|
|
|
+
|
|
|
|
|
if test "$enable_gtk" != "no"; then
|
|
|
|
|
if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin" -a "z$with_distro" != "zCrossWin32"; then
|
|
|
|
|
OOO_WIDGET_FLAGS="--enable-gtk $OOO_WIDGET_FLAGS"
|
|
|
|
|
|
Timothy Pearson
13 years ago