summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Kozadaev <denis@dilos.org>2020-02-27 10:41:34 +0300
committerSlávek Banko <slavek.banko@axis.cz>2020-02-27 18:40:40 +0100
commit8d45c19460a1bc170192db9621745c40d2611324 (patch)
tree97b1ede51e51fba481c46fbb3e69b2a9b0868ef3
parente3313eddd208f9101fdec1edc1b6506786ca9755 (diff)
downloadtde-packaging-8d45c19460a1bc170192db9621745c40d2611324.tar.gz
tde-packaging-8d45c19460a1bc170192db9621745c40d2611324.zip
DilOS: remove replacement netpbm for usr/bin/imagetops
Signed-off-by: Denis Kozadaev <denis@dilos.org> (cherry picked from commit 623d073b81c4fcb936cda8ae3075c97f658c8289)
-rw-r--r--dilos/tdelibs/debian/changelog6
-rw-r--r--dilos/tdelibs/debian/control2
-rw-r--r--dilos/tdelibs/debian/tdelibs14-trinity.install2
3 files changed, 2 insertions, 8 deletions
diff --git a/dilos/tdelibs/debian/changelog b/dilos/tdelibs/debian/changelog
index aa3e67080..10543db0e 100644
--- a/dilos/tdelibs/debian/changelog
+++ b/dilos/tdelibs/debian/changelog
@@ -1,9 +1,3 @@
-tdelibs-trinity (4:14.0.7+dilos1) unstable; urgency=low
-
- * Build for DilOS.
-
- -- DilOS Team <dilos@dilos.org> Tue, 07 Jan 2020 15:54:41 +0300
-
tdelibs-trinity (4:3.5.12-0ubuntu6+r1116280) lucid; urgency=low
* Automated svn build
diff --git a/dilos/tdelibs/debian/control b/dilos/tdelibs/debian/control
index 878ad7396..5ee3fc737 100644
--- a/dilos/tdelibs/debian/control
+++ b/dilos/tdelibs/debian/control
@@ -59,7 +59,7 @@ Description: core shared data for all TDE applications
Package: tdelibs14-trinity
Section: libs
Architecture: any
-Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity, netpbm [solaris-any]
+Replaces: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity
Breaks: kdelibs4c2a-kde3 (<< 4:14.0.0~), kdelibs4c2a-trinity (<< 4:14.0.0~), tdelibs4c2a-trinity
Depends: ${shlibs:Depends}, tdelibs-data-trinity,
tdelibs-data-trinity, libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients
diff --git a/dilos/tdelibs/debian/tdelibs14-trinity.install b/dilos/tdelibs/debian/tdelibs14-trinity.install
index 84e53b539..f9b8fcb67 100644
--- a/dilos/tdelibs/debian/tdelibs14-trinity.install
+++ b/dilos/tdelibs/debian/tdelibs14-trinity.install
@@ -12,7 +12,7 @@ debian/tmp/usr/bin/dcopserver_shutdown
debian/tmp/usr/bin/dcopstart
debian/tmp/usr/bin/filesharelist
debian/tmp/usr/bin/fileshareset
-debian/tmp/usr/bin/imagetops
+#[!solaris-any] debian/tmp/usr/bin/imagetops
debian/tmp/usr/bin/tdeab2tdeabc
debian/tmp/usr/bin/kaddprinterwizard
debian/tmp/usr/bin/tdebuildsycoca