summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/core
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/_base/core')
-rw-r--r--ubuntu/_base/core/tdebase/debian/kate-trinity.install2
-rw-r--r--ubuntu/_base/core/tdebase/debian/konsole-trinity.install2
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install1
-rw-r--r--ubuntu/_base/core/tdelibs/debian/control2
-rwxr-xr-xubuntu/_base/core/tdelibs/debian/rules1
-rw-r--r--ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install1
-rw-r--r--ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install2
7 files changed, 7 insertions, 4 deletions
diff --git a/ubuntu/_base/core/tdebase/debian/kate-trinity.install b/ubuntu/_base/core/tdebase/debian/kate-trinity.install
index 4ab5fb474..9e8dc8111 100644
--- a/ubuntu/_base/core/tdebase/debian/kate-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/kate-trinity.install
@@ -19,14 +19,12 @@ debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/16x16/actions/highlighti
debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/16x16/actions/modified.png
debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/16x16/actions/modmod.png
debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/16x16/actions/modonhd.png
-debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/16x16/actions/null.png
debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/32x32/actions/highlighting.png
debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/curfiledir.png
debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/indent.png
debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/modified.png
debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/modmod.png
debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/modonhd.png
-debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/null.png
debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/unindent.png
debian/tmp/opt/trinity/share/apps/kate/icons/locolor/22x22/actions/indent.png
debian/tmp/opt/trinity/share/apps/kate/icons/locolor/22x22/actions/unindent.png
diff --git a/ubuntu/_base/core/tdebase/debian/konsole-trinity.install b/ubuntu/_base/core/tdebase/debian/konsole-trinity.install
index b7fd05d0c..c02af16b0 100644
--- a/ubuntu/_base/core/tdebase/debian/konsole-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/konsole-trinity.install
@@ -58,6 +58,8 @@ debian/tmp/opt/trinity/share/apps/konsole/su.desktop
debian/tmp/opt/trinity/share/apps/konsole/sumc.desktop
debian/tmp/opt/trinity/share/apps/konsole/syscolor.schema
debian/tmp/opt/trinity/share/apps/konsole/tips
+debian/tmp/opt/trinity/share/apps/konsole/Solarized.schema
+debian/tmp/opt/trinity/share/apps/konsole/SolarizedLight.schema
debian/tmp/opt/trinity/share/apps/konsole/Transparent_darkbg.schema
debian/tmp/opt/trinity/share/apps/konsole/Transparent_lightbg.schema
debian/tmp/opt/trinity/share/apps/konsole/Transparent_MC.schema
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install
index 9ddb66bc2..132395ebd 100644
--- a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install
+++ b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install
@@ -119,5 +119,4 @@ debian/tmp/opt/trinity/share/man/man1/ksystraycmd.1
debian/tmp/opt/trinity/share/man/man1/kwriteconfig.1
debian/tmp/opt/trinity/share/man/man1/kxkb.1
debian/tmp/opt/trinity/share/man/man1/tdedebugdialog.1
-debian/tmp/opt/trinity/share/man/man1/tdeio_system_documenthelper.1
debian/tmp/opt/trinity/share/man/man1/tdesu.1
diff --git a/ubuntu/_base/core/tdelibs/debian/control b/ubuntu/_base/core/tdelibs/debian/control
index 2af3ea23e..c2e08704b 100644
--- a/ubuntu/_base/core/tdelibs/debian/control
+++ b/ubuntu/_base/core/tdelibs/debian/control
@@ -13,7 +13,7 @@ Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, sharutil
liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev,
libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
libsasl2-dev, libxcomposite-dev, libdbus-1-tqt-dev,
- libtiff-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils,
+ libtiff-dev, libwebp-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils,
libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev,
texinfo, libogg-dev, libtqtinterface-dev,
lsb-release, base-files, sudo, libr-dev,
diff --git a/ubuntu/_base/core/tdelibs/debian/rules b/ubuntu/_base/core/tdelibs/debian/rules
index 533c0ed51..bcbeda4fc 100755
--- a/ubuntu/_base/core/tdelibs/debian/rules
+++ b/ubuntu/_base/core/tdelibs/debian/rules
@@ -40,6 +40,7 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_LIBART="ON" \
-DWITH_LIBIDN="ON" \
-DWITH_TIFF="ON" \
+ -DWITH_WEBP="ON" \
-DWITH_JASPER="ON" \
-DWITH_OPENEXR="ON" \
-DWITH_AVAHI="ON" \
diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install
index 615399188..965adf1ea 100644
--- a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install
@@ -1944,6 +1944,7 @@ debian/tmp/opt/trinity/share/services/tga.kimgio
debian/tmp/opt/trinity/share/services/tiff.kimgio
debian/tmp/opt/trinity/share/services/webdav.protocol
debian/tmp/opt/trinity/share/services/webdavs.protocol
+debian/tmp/opt/trinity/share/services/webp.kimgio
debian/tmp/opt/trinity/share/services/xbm.kimgio
debian/tmp/opt/trinity/share/services/xcf.kimgio
debian/tmp/opt/trinity/share/services/xpm.kimgio
diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install
index 245802daa..f71e37af6 100644
--- a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install
+++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install
@@ -139,6 +139,8 @@ debian/tmp/opt/trinity/lib/trinity/kimg_tga.la
debian/tmp/opt/trinity/lib/trinity/kimg_tga.so
debian/tmp/opt/trinity/lib/trinity/kimg_tiff.la
debian/tmp/opt/trinity/lib/trinity/kimg_tiff.so
+debian/tmp/opt/trinity/lib/trinity/kimg_webp.la
+debian/tmp/opt/trinity/lib/trinity/kimg_webp.so
debian/tmp/opt/trinity/lib/trinity/kimg_xcf.la
debian/tmp/opt/trinity/lib/trinity/kimg_xcf.so
debian/tmp/opt/trinity/lib/trinity/kimg_xview.la