summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/applications/office/koffice
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/_base/applications/office/koffice')
-rw-r--r--ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk7
-rw-r--r--ubuntu/_base/applications/office/koffice/debian/compat2
-rw-r--r--ubuntu/_base/applications/office/koffice/debian/control4
-rw-r--r--ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian2
-rw-r--r--ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian2
-rw-r--r--ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian2
-rw-r--r--ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian2
-rwxr-xr-xubuntu/_base/applications/office/koffice/debian/rules2
8 files changed, 10 insertions, 13 deletions
diff --git a/ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
index f36e3527c..aba508624 100644
--- a/ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/office/koffice/debian/cdbs/debian-tde.mk
@@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el
# The default gzip compressor has been changed in dpkg >= 1.17.0.
deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
@@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
install -p -D -m644 debian/$(cdbs_curpkg).presubj \
debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
fi
+ if test -d debian/$(cdbs_curpkg)/opt/trinity/lib && \
+ test $$(find debian/$(cdbs_curpkg)/opt/trinity/lib -name "*.so" | wc -l) -gt 0; then \
+ echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \
+ fi
binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
set -e; \
diff --git a/ubuntu/_base/applications/office/koffice/debian/compat b/ubuntu/_base/applications/office/koffice/debian/compat
index ec635144f..f599e28b8 100644
--- a/ubuntu/_base/applications/office/koffice/debian/compat
+++ b/ubuntu/_base/applications/office/koffice/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/ubuntu/_base/applications/office/koffice/debian/control b/ubuntu/_base/applications/office/koffice/debian/control
index d22475ffb..af290bec8 100644
--- a/ubuntu/_base/applications/office/koffice/debian/control
+++ b/ubuntu/_base/applications/office/koffice/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Ral Snchez Siles <rasasi78@gmail.com>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 9~), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-all-dev, ruby, ruby-dev, libwpd-dev, librevenge-dev | libwpd-dev (<< 0.10~) | libwpd8-dev, libpqxx-dev | libpqxx3-dev, default-libmysqlclient-dev | libmysqlclient-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 10~), quilt, binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python3-all-dev, dh-python, ruby, ruby-dev, libwpd-dev, librevenge-dev | libwpd-dev (<< 0.10~) | libwpd8-dev, libpqxx-dev | libpqxx3-dev, default-libmysqlclient-dev | libmysqlclient-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev, liblcms1-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev
Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
Standards-Version: 3.8.4
Homepage: http://www.koffice.org
@@ -303,7 +303,7 @@ Section: libs
Replaces: koffice-libs-kde3 (<< 4:14.0.0~), koffice-libs-trinity (<< 4:14.0.0~)
Breaks: koffice-libs-kde3 (<< 4:14.0.0~), koffice-libs-trinity (<< 4:14.0.0~)
Depends: ${shlibs:Depends}, koffice-data-trinity (>> ${TDE-Version3}~), koffice-data-trinity (<< ${TDE-Next-Version3}~)
-Recommends: latex-xft-fonts, ruby, python-all
+Recommends: latex-xft-fonts, ruby, python3-all
Suggests: wordnet, texlive-base
Description: common libraries and binaries for the Trinity Office Suite [Trinity]
This package provides the libraries and binaries that are shared amongst
diff --git a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian
index 25a8c006f..806f0020c 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.lintian
@@ -1,4 +1,2 @@
kformula-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kformula.so
-kformula-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
-kformula-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kformula.so
kformula-trinity: package-name-doesnt-match-sonames libtdeinit-kformula
diff --git a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian
index c77411ba2..888cebb0a 100644
--- a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.lintian
@@ -1,4 +1,2 @@
koshell-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_koshell.so
-koshell-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
-koshell-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_koshell.so
koshell-trinity: package-name-doesnt-match-sonames libtdeinit-koshell
diff --git a/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian
index 74f77679d..4e0bf33b8 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kplato-trinity.lintian
@@ -1,4 +1,2 @@
kplato-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kplato.so
-kplato-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
-kplato-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kplato.so
kplato-trinity: package-name-doesnt-match-sonames libtdeinit-kplato
diff --git a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
index 252102b05..5f43c4233 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
+++ b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.lintian
@@ -1,5 +1,3 @@
kthesaurus-trinity: no-shlibs-control-file opt/trinity/lib/libtdeinit_kthesaurus.so
-kthesaurus-trinity: postinst-must-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
-kthesaurus-trinity: postrm-should-call-ldconfig opt/trinity/lib/libtdeinit_kthesaurus.so
kthesaurus-trinity: package-name-doesnt-match-sonames libtdeinit-kthesaurus
diff --git a/ubuntu/_base/applications/office/koffice/debian/rules b/ubuntu/_base/applications/office/koffice/debian/rules
index 397783a27..741529df1 100755
--- a/ubuntu/_base/applications/office/koffice/debian/rules
+++ b/ubuntu/_base/applications/office/koffice/debian/rules
@@ -27,7 +27,7 @@ DEB_INSTALL_CHANGELOGS_kugar-trinity := kugar/CHANGES
DEB_INSTALL_CHANGELOGS_kword-trinity := kword/CHANGES
DEB_INSTALL_CHANGELOGS_koffice-libs-trinity := lib/CHANGES
-DEB_COMPRESS_EXCLUDE := .ksp .kwd .kwt .docbook
+DEB_COMPRESS_EXCLUDE_ALL += .ksp .kwd .kwt .docbook
install/chalk-data-trinity::
install -m 755 -d debian/chalk-data-trinity/opt/trinity/share/apps/chalk/profiles/