summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-02-13 01:49:54 +0100
committerSlávek Banko <slavek.banko@axis.cz>2021-02-14 17:32:40 +0100
commit4b0fa49bf0d359a02a22adf8cc110dc3af50b8b0 (patch)
tree3c89811d5ef707e876a7203e112d105d3ee2fe2d
parent3100426bc217993b834036fab43111899583314d (diff)
downloadtde-packaging-4b0fa49bf0d359a02a22adf8cc110dc3af50b8b0.tar.gz
tde-packaging-4b0fa49bf0d359a02a22adf8cc110dc3af50b8b0.zip
DEB tdeartwork: Install desktop files of xscreensavers with merged translations.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 18b25ce7594f3e631ec461f49aef3f91be48896b)
-rwxr-xr-xdebian/_base/core/tdeartwork/debian/rules2
-rw-r--r--debian/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install2
-rwxr-xr-xdilos/core/tdeartwork/debian/rules2
-rw-r--r--dilos/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install2
-rwxr-xr-xubuntu/_base/core/tdeartwork/debian/rules2
-rw-r--r--ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install2
6 files changed, 9 insertions, 3 deletions
diff --git a/debian/_base/core/tdeartwork/debian/rules b/debian/_base/core/tdeartwork/debian/rules
index 5d38f08b6..753e97397 100755
--- a/debian/_base/core/tdeartwork/debian/rules
+++ b/debian/_base/core/tdeartwork/debian/rules
@@ -23,6 +23,8 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_VERBOSE_MAKEFILE="ON" \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+ -DWITH_ALL_INCLUDED_XSCREENSAVERS="ON" \
-DWITH_ARTS="ON"
DEB_DH_STRIP_ARGS := --dbg-package=tdeartwork-trinity-dbg
diff --git a/debian/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install b/debian/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
index 3f7f191ef..dd2868cf0 100644
--- a/debian/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
+++ b/debian/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
@@ -1 +1 @@
-tdescreensaver/kxsconfig/ScreenSavers/* opt/trinity/share/applnk/System/ScreenSavers/
+obj-*/tdescreensaver/kxsconfig/ScreenSavers/*.desktop opt/trinity/share/applnk/System/ScreenSavers/
diff --git a/dilos/core/tdeartwork/debian/rules b/dilos/core/tdeartwork/debian/rules
index 5d2605563..9ab3bb10e 100755
--- a/dilos/core/tdeartwork/debian/rules
+++ b/dilos/core/tdeartwork/debian/rules
@@ -22,6 +22,8 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_VERBOSE_MAKEFILE="ON" \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+ -DWITH_ALL_INCLUDED_XSCREENSAVERS="ON" \
-DWITH_ARTS="ON" \
-DCMAKE_C_COMPILER=gcc \
-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
diff --git a/dilos/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install b/dilos/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
index 65da0bfe4..e1848f246 100644
--- a/dilos/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
+++ b/dilos/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
@@ -1 +1 @@
-tdescreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/
+obj-*/tdescreensaver/kxsconfig/ScreenSavers/*.desktop usr/share/applnk/System/ScreenSavers/
diff --git a/ubuntu/_base/core/tdeartwork/debian/rules b/ubuntu/_base/core/tdeartwork/debian/rules
index 5d38f08b6..753e97397 100755
--- a/ubuntu/_base/core/tdeartwork/debian/rules
+++ b/ubuntu/_base/core/tdeartwork/debian/rules
@@ -23,6 +23,8 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_VERBOSE_MAKEFILE="ON" \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+ -DWITH_ALL_INCLUDED_XSCREENSAVERS="ON" \
-DWITH_ARTS="ON"
DEB_DH_STRIP_ARGS := --dbg-package=tdeartwork-trinity-dbg
diff --git a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install b/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
index 3f7f191ef..dd2868cf0 100644
--- a/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
+++ b/ubuntu/_base/core/tdeartwork/debian/tdescreensaver-xsavers-extra-trinity.install
@@ -1 +1 @@
-tdescreensaver/kxsconfig/ScreenSavers/* opt/trinity/share/applnk/System/ScreenSavers/
+obj-*/tdescreensaver/kxsconfig/ScreenSavers/*.desktop opt/trinity/share/applnk/System/ScreenSavers/