root
12 years ago
parent
07f58a70dd
commit
5e9e6972ab
@ -0,0 +1,6 @@
|
||||
General patches needed:
|
||||
libreoffice-trinity.diff
|
||||
|
||||
Ubuntu/Debian specific patches:
|
||||
libreoffice-debian.diff
|
||||
libreoffice_ubuntu-tde-make-package-modules-not-stink.diff
|
||||
@ -0,0 +1,327 @@
|
||||
diff -urN a/debian/changelog b/debian/changelog
|
||||
--- a/debian/changelog
|
||||
+++ b/debian/changelog
|
||||
@@ -1,3 +1,9 @@
|
||||
+libreoffice (1:3.6.0~rc4-0ubuntu3) precise; urgency=low
|
||||
+
|
||||
+ * Enable TDE module
|
||||
+
|
||||
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Thu, 02 Aug 2012 10:40:24 -0600
|
||||
+
|
||||
libreoffice (1:3.6.0~rc4-0ubuntu2) quantal; urgency=low
|
||||
|
||||
* Re-upload directly to quantal for the libexttextcat transition.
|
||||
diff -urN a/debian/control b/debian/control
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -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: 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], doxygen, libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng-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), gdb, junit4 (>= 4.8.2-2), default-jdk, default-jdk (>= 1:1.7-48) [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), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet3.0-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), libboost-date-time-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libcmis-dev (>= 0.2.1), liblcms2-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~), libpq-dev (>= 9.0~), libxrandr-dev, libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), 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.1ubuntu1), 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, gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], doxygen, libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng-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), gdb, junit4 (>= 4.8.2-2), default-jdk, default-jdk (>= 1:1.7-48) [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), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet3.0-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), libboost-date-time-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libcmis-dev (>= 0.2.1), liblcms2-dev, libicu-dev (>= 4.0), libcairo2-dev, tdelibs4-trinity-dev, libqt4-dev (>= 4:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libpq-dev (>= 9.0~), libxrandr-dev, libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), 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.1ubuntu1), 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), base-files (= 7.0), libhsqldb-java (>= 1.8.1~)
|
||||
Standards-Version: 3.9.1
|
||||
@@ -19,7 +19,7 @@
|
||||
Section: metapackages
|
||||
Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer, libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math, libreoffice-base, ttf-dejavu, ttf-sil-gentium-basic, libreoffice-filter-mobiledev, ${lucene-depends}, ${java-common-depends}, ${misc:Depends}
|
||||
Recommends: ttf-liberation | ttf-mscorefonts-installer, libpaper-utils, libreoffice-gnome | libreoffice-kde
|
||||
-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}
|
||||
+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 | libreoffice-tde, 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
|
||||
a near drop-in replacement for Microsoft(R) Office.
|
||||
@@ -45,6 +45,7 @@
|
||||
QuickStarter for GNOMEs notification are
|
||||
* libreoffice-gnome: GIO, GConf backend
|
||||
* libreoffice-kde: KDE UI Plugin and KDE File Picker support
|
||||
+ * libreoffice-trinity: TDE UI Plugin and TDE File Picker support
|
||||
* unixodbc: ODBC database support
|
||||
* cups-bsd: Allows LibreOffice to detect your CUPS printer queues
|
||||
automatically
|
||||
@@ -92,7 +93,7 @@
|
||||
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
|
||||
Depends: libreoffice-common (>> ${base-version}), fonts-opensymbol | ttf-opensymbol (>= 1:3.0), ${shlibs:Depends}, fontconfig, ${misc:Depends}
|
||||
Pre-Depends: ure (>= 1.5.1+OOo3.1.1-15)
|
||||
-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)
|
||||
+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}), 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), 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), libreoffice-filter-binfilter (<< 1:3.4.1~), libreoffice-evolution (<< 1:3.4.1~), libreoffice-kab (<< 1:3.4.1~), libreoffice-sdbc-postgresql (<< 0.8.1~), mozilla-libreoffice (<< 1:3.5.0~beta~), libreoffice-common (<< 1:3.5.0-1ubuntu1~)
|
||||
Provides: libreoffice-bundled
|
||||
Replaces: libreoffice-calc (<< 1:3.3.2-5), libreoffice-common (<< 1:3.5.0-1ubuntu1~)
|
||||
@@ -3277,7 +3278,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}
|
||||
Pre-Depends: dpkg (>= 1.15.6)
|
||||
@@ -3340,6 +3341,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: tde
|
||||
+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 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
|
||||
diff -urN a/debian/control.in b/debian/control.in
|
||||
--- a/debian/control.in
|
||||
+++ b/debian/control.in
|
||||
@@ -64,7 +64,7 @@
|
||||
${lucene-depends},
|
||||
${java-common-depends},
|
||||
${misc:Depends}
|
||||
-Recommends: ttf-liberation | ttf-mscorefonts-installer, libpaper-utils, libreoffice-gnome | libreoffice-kde
|
||||
+Recommends: ttf-liberation | ttf-mscorefonts-installer, libpaper-utils, libreoffice-gnome | libreoffice-kde | libreoffice-trinity
|
||||
Suggests: hunspell-dictionary,
|
||||
myspell-dictionary,
|
||||
libreofficeVER-help-${help-l10n-virtual-version},
|
||||
@@ -171,6 +171,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 a/debian/control.tdeab.in b/debian/control.tdeab.in
|
||||
--- a/debian/control.tdeab.in
|
||||
+++ b/debian/control.tdeab.in
|
||||
@@ -0,0 +1,14 @@
|
||||
+Package: libreofficeVER-tdeab
|
||||
+Architecture: %OOO_BASE_ARCHS%
|
||||
+Depends: libreofficeVER-core (= ${binary:Version}),
|
||||
+ libreofficeVER-common (>= 1:3.4.0~),
|
||||
+ ${shlibs:Depends},
|
||||
+ ${misc:Depends}
|
||||
+Recommends: kaddressbook-trinity
|
||||
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
|
||||
+Description: office productivity suite -- TDE adressbook support
|
||||
+ LibreOffice is a full-featured office productivity suite that provides
|
||||
+ a near drop-in replacement for Microsoft(R) Office.
|
||||
+ .
|
||||
+ This package allows LibreOffice to access the TDE Addressbook.
|
||||
+ You need to install kaddressbook-trinity separately.
|
||||
\ No newline at end of file
|
||||
diff -urN a/debian/control.trinity.in b/debian/control.trinity.in
|
||||
--- a/debian/control.trinity.in
|
||||
+++ b/debian/control.trinity.in
|
||||
@@ -0,0 +1,23 @@
|
||||
+Package: libreofficeVER-trinity
|
||||
+Architecture: %OOO_ARCHS%
|
||||
+Depends: libreofficeVER-core (= ${binary:Version}),
|
||||
+ ${shlibs:Depends},
|
||||
+ ${misc:Depends}
|
||||
+Recommends: ${trinity-iconset-dep}
|
||||
+Suggests: konqueror-trinity,
|
||||
+ kmail-trinity,
|
||||
+ libreofficeVER-tdeab
|
||||
+Section: trinity
|
||||
+Enhances: libreofficeVER
|
||||
+Replaces: openoffice.org-trinity (<< 1:3.3.0~), libreoffice-core (= 1:3.5.0~beta2-1)
|
||||
+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 / kmail
|
||||
+ * libreoffice-tdeab: TDE Addressbook support
|
||||
+
|
||||
diff -urN a/debian/rules b/debian/rules
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -162,7 +162,8 @@
|
||||
BUILD_CAIROCANVAS=y
|
||||
SYSTEM_STUFF += cairo
|
||||
CAIRO_FONTS_PATCH=y
|
||||
-BUILD_KDE=y
|
||||
+BUILD_KDE=n
|
||||
+BUILD_TDE=y
|
||||
# not ported to KDE 4
|
||||
ENABLE_KDEAB=n
|
||||
ifeq "$(SYSTEM_GCC_VERSION)" "4.7"
|
||||
@@ -172,6 +173,12 @@
|
||||
QT_MINVER= (>= 4:4.5)
|
||||
endif
|
||||
KDELIBS_MINVER= (>= 4:4.3.4)
|
||||
+ifeq "$(BUILD_TDE)" "y"
|
||||
+ ENABLE_TDEAB=y
|
||||
+endif
|
||||
+ifeq "$(BUILD_TDE)" "y"
|
||||
+ TDELIBS_MINVER= (>= 4:3.5.13)
|
||||
+endif
|
||||
BUILD_DBG_PACKAGE=y
|
||||
ifeq "$(BUILD_DBG_PACKAGE)" "y"
|
||||
ENABLE_SYMBOLS=y
|
||||
@@ -407,6 +414,7 @@
|
||||
ENABLE_MYSQLNATIVE=n
|
||||
ENABLE_EVO2=n
|
||||
ENABLE_KDEAB=n
|
||||
+ ENABLE_TDEAB=n
|
||||
ENABLE_REPORTDESIGN=n
|
||||
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-base libreoffice$(VER)-base-core
|
||||
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-evolution -Nlibreoffice$(VER)-kab
|
||||
@@ -1034,6 +1042,25 @@
|
||||
endif
|
||||
endif
|
||||
|
||||
+ifeq "$(BUILD_TDE)" "n"
|
||||
+ CONFIGURE_FLAGS+= --disable-tde
|
||||
+ CONFIGURE_FLAGS+= --with-images="$(IMAGES)"
|
||||
+else
|
||||
+ CONFIGURE_FLAGS+= --disable-kde
|
||||
+ CONFIGURE_FLAGS+= --disable-kde4
|
||||
+ CONFIGURE_FLAGS+= --enable-tde
|
||||
+ TDE_ICONSET_DEP=libreoffice$(VER)-style-crystal
|
||||
+ BUILD_DEPS += , tdelibs4-trinity-dev
|
||||
+
|
||||
+ DBG_DBG_SUGGESTS+= , tdelibs-trinity-dbg, libtqtinterface-dbg
|
||||
+
|
||||
+ ifeq "$(ENABLE_TDEAB)" "y"
|
||||
+ BUILD_DEPS += , tdepim-trinity-dev
|
||||
+ else
|
||||
+ CONFIGURE_FLAGS+= --disable-tdeab
|
||||
+ endif
|
||||
+endif
|
||||
+
|
||||
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
|
||||
CONFIGURE_FLAGS += --enable-ext-mysql-connector
|
||||
ifneq (,$(filter mysql, $(SYSTEM_STUFF)))
|
||||
@@ -1473,6 +1500,11 @@
|
||||
>> debian/control < debian/control.kde.in
|
||||
perl -pi -e 's/ libreoffice$(VER)-gnome,/ libreoffice-gnome | libreoffice$(VER)-kde,/' debian/control
|
||||
endif
|
||||
+ifeq "$(BUILD_TDE)" "y"
|
||||
+ sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
|
||||
+ >> debian/control < debian/control.trinity.in
|
||||
+ perl -pi -e 's/ libreoffice$(VER)-gnome,/ libreoffice-gnome | libreoffice$(VER)-trinity,/' debian/control
|
||||
+endif
|
||||
ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
|
||||
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
|
||||
>> debian/control < debian/control.postgresql.in
|
||||
@@ -1493,6 +1525,10 @@
|
||||
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
|
||||
>> debian/control < debian/control.kab.in
|
||||
endif
|
||||
+ifeq "$(ENABLE_TDEAB)" "y"
|
||||
+ sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
|
||||
+ >> debian/control < debian/control.tdeab.in
|
||||
+endif
|
||||
|
||||
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
|
||||
perl -pi -e "s,%OOO_BASE_ARCHS%,$(OOO_BASE_ARCHS),g" debian/control
|
||||
@@ -1554,6 +1590,9 @@
|
||||
ifeq "$(BUILD_KDE)" "y"
|
||||
perl -pi -e 's/GConf backend$$/GConf backend\n * libreoffice$(VER)-kde: KDE UI Plugin and KDE File Picker support/' debian/control
|
||||
endif
|
||||
+ifeq "$(BUILD_TDE)" "y"
|
||||
+ perl -pi -e 's/GConf backend$$/GConf backend\n * libreoffice$(VER)-trinity: TDE UI Plugin and TDE File Picker support/' debian/control
|
||||
+endif
|
||||
|
||||
ifeq "$(ENABLE_LDAP)" "y"
|
||||
perl -pi -e 's/paperconf$$/paperconf\n * $(LDAP_LIB): LDAP client library; needed for LibreOffice getting its\n profiles from LDAP/' debian/control
|
||||
@@ -2075,6 +2114,41 @@
|
||||
> $(PKGDIR)-kde/usr/share/templates/soffice.odg.desktop
|
||||
endif
|
||||
|
||||
+ifeq "$(BUILD_TDE)" "y"
|
||||
+ # install files for TDEs "create new" ...
|
||||
+ mkdir -p $(PKGDIR)-trinity/usr/share/templates/.source
|
||||
+ for i in $(SOURCE_TREE)/extras/source/shellnew/*; do \
|
||||
+ cp $$i $(PKGDIR)-trinity/usr/share/templates/.source/`basename $$i`; \
|
||||
+ done
|
||||
+ cat debian/templates/soffice-template.desktop.in \
|
||||
+ | sed -e "s/@APP@/Writer/" \
|
||||
+ | sed -e "s/@EXT@/odt/" \
|
||||
+ | sed -e "s/@TYPE@/text/" \
|
||||
+ > $(PKGDIR)-trinity/usr/share/templates/soffice.odt.desktop
|
||||
+ cat debian/templates/soffice-template.desktop.in \
|
||||
+ | sed -e "s/@APP@/Calc/" \
|
||||
+ | sed -e "s/@EXT@/ods/" \
|
||||
+ | sed -e "s/@TYPE@/spreadsheet/" \
|
||||
+ > $(PKGDIR)-trinity/usr/share/templates/soffice.ods.desktop
|
||||
+ cat debian/templates/soffice-template.desktop.in \
|
||||
+ | sed -e "s/@APP@/Impress/" \
|
||||
+ | sed -e "s/@EXT@/odp/" \
|
||||
+ | sed -e "s/@TYPE@/presentation/" \
|
||||
+ > $(PKGDIR)-trinity/usr/share/templates/soffice.odp.desktop
|
||||
+ cat debian/templates/soffice-template.desktop.in \
|
||||
+ | sed -e "s/@APP@/Draw/" \
|
||||
+ | sed -e "s/@EXT@/odg/" \
|
||||
+ | sed -e "s/@TYPE@/drawing/" \
|
||||
+ > $(PKGDIR)-trinity/usr/share/templates/soffice.odg.desktop
|
||||
+endif
|
||||
+#ifeq "$(ENABLE_TDEAB)" "y"
|
||||
+# rm -rf $(PKGDIR)-tdeab-trinity
|
||||
+# mkdir -p -m755 $(PKGDIR)-tdeab-trinity/$(OODIR)/program
|
||||
+# for f in libtdeab*so; do \
|
||||
+# mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-tdeab-trinity/$(OODIR)/program || exit 1 ;\
|
||||
+# done
|
||||
+#endif
|
||||
+
|
||||
# split out gtk stuff
|
||||
rm -rf $(PKGDIR)-gtk
|
||||
mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/program
|
||||
@@ -2292,6 +2366,12 @@
|
||||
|
||||
endif
|
||||
|
||||
+ifeq "$(BUILD_TDE)" "y"
|
||||
+ # be sure we use the right moc, FIXME: Trinity uses its own moc
|
||||
+ mkdir -p $(CURDIR)/debian/usr/bin
|
||||
+ ln -sf /usr/bin/moc-qt$(KDE_VER) $(CURDIR)/debian/usr/bin/moc
|
||||
+endif
|
||||
+
|
||||
ifeq "$(LINK_TO_STLPORT)" "y"
|
||||
rm -f debian/ure/$(OOUREDIR)/lib/libstlport*
|
||||
ln -s `readlink -f /usr/lib/libstlport_gcc.so` \
|
||||
@@ -2917,6 +2997,7 @@
|
||||
-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
|
||||
-V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \
|
||||
-V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \
|
||||
+ -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)' \
|
||||
--- a/debian/scripts/gid2pkgdirs.sh
|
||||
+++ b/debian/scripts/gid2pkgdirs.sh
|
||||
@@ -103,6 +103,7 @@
|
||||
create_package_directory gid_Module_Optional_Extensions_Script_Provider_For_Python pkg/libreoffice-script-provider-python
|
||||
create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome
|
||||
create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde
|
||||
+create_package_directory gid_Module_Optional_Tde pkg/libreoffice-trinity
|
||||
create_package_directory gid_Module_Root_Files_2 pkg/libreoffice-common
|
||||
create_package_directory gid_Module_Root_Files_3 pkg/libreoffice-common
|
||||
create_package_directory gid_Module_Root_Files_4 pkg/libreoffice-common
|
||||
@@ -160,7 +161,7 @@
|
||||
fi &&
|
||||
( cd pkg/libreoffice-common/$OOINSTBASE/program
|
||||
find -maxdepth 1 \
|
||||
- -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\)' \
|
||||
+ -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|tdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|oosplash\|uri-encode\)' \
|
||||
-exec mv {} $OODESTDIR/pkg/libreoffice-core/$OOINSTBASE/program \;
|
||||
);
|
||||
|
||||
@ -0,0 +1,48 @@
|
||||
--- a/scp2/source/tde/module_tde.scp
|
||||
+++ a/scp2/source/tde/module_tde.scp
|
||||
@@ -32,9 +32,17 @@
|
||||
MOD_NAME_DESC(MODULE_OPTIONAL_TDE);
|
||||
Styles = (DONTSHOWINUSERINSTALL);
|
||||
Files = (
|
||||
+ gid_File_Bin_Tde_Open_Url,
|
||||
#ifdef ENABLE_TDE
|
||||
- gid_File_Lib_Tdebe
|
||||
+ gid_File_Lib_Tdebe,
|
||||
+ gid_File_Lib_Vclplug_Tde,
|
||||
+ gid_File_Lib_Fps_Tde
|
||||
#endif // ENABLE_TDE
|
||||
+#ifdef ENABLE_TDEAB
|
||||
+ ,
|
||||
+ gid_File_Lib_Tdeab_1,
|
||||
+ gid_File_Lib_Tdeab_Drv_1
|
||||
+#endif
|
||||
);
|
||||
End
|
||||
#endif
|
||||
--- a/scp2/source/ooo/module_hidden_ooo.scp
|
||||
+++ a/scp2/source/ooo/module_hidden_ooo.scp
|
||||
@@ -83,7 +83,6 @@
|
||||
Default = YES;
|
||||
Styles = (HIDDEN_ROOT);
|
||||
Files = (gid_File_Bin_Cde_Open_Url,
|
||||
- gid_File_Bin_Tde_Open_Url,
|
||||
gid_File_Bin_Open_Url,
|
||||
gid_File_Bin_Pagein,
|
||||
gid_File_Bin_Pluginapp,
|
||||
@@ -266,7 +265,6 @@
|
||||
gid_File_Lib_Odfflatxml,
|
||||
gid_File_Lib_Zip,
|
||||
gid_File_Lib_Vclplug_Gen,
|
||||
- gid_File_Lib_Vclplug_Tde,
|
||||
gid_File_Lib_Vclplug_Svp,
|
||||
gid_File_Lib_Basctl,
|
||||
gid_File_Lib_CanvasTools,
|
||||
@@ -339,8 +337,6 @@
|
||||
gid_File_Lib_Dbpool,
|
||||
gid_File_Lib_Embobj,
|
||||
gid_File_Lib_Emboleobj,
|
||||
- gid_File_Lib_Tdeab_1,
|
||||
- gid_File_Lib_Tdeab_Drv_1,
|
||||
gid_File_Lib_Kab_1,
|
||||
gid_File_Lib_Kab_Drv_1,
|
||||
gid_File_Lib_Macab_1,
|
||||
Loading…
Reference in new issue