summaryrefslogtreecommitdiffstats
path: root/debian/_base
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-08-07 23:17:21 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-08-08 00:19:22 +0900
commit9f682f9e1fecc516f8d846477ef1d8c0b6c06130 (patch)
tree1e30ff16998b0d4067c0f883969e40f527d8f14b /debian/_base
parent388735126b318ec97ae762187946c6655452f130 (diff)
downloadtde-packaging-9f682f9e1fecc516f8d846477ef1d8c0b6c06130.tar.gz
tde-packaging-9f682f9e1fecc516f8d846477ef1d8c0b6c06130.zip
DEB klinkstatus: removed bug.png icon which is now installed in tdelibs.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 46afc510e176f408377a5f60105b5b5630027cad)
Diffstat (limited to 'debian/_base')
-rw-r--r--debian/_base/tdelibs/debian/control2
-rw-r--r--debian/_base/tdewebdev/debian/klinkstatus-trinity.install1
2 files changed, 1 insertions, 2 deletions
diff --git a/debian/_base/tdelibs/debian/control b/debian/_base/tdelibs/debian/control
index dc341e799..e83bba239 100644
--- a/debian/_base/tdelibs/debian/control
+++ b/debian/_base/tdelibs/debian/control
@@ -43,7 +43,7 @@ Section: libs
Architecture: all
Replaces: kdelibs-data-trinity (<< 4:14.0.0~)
Breaks: kdelibs-data-trinity (<< 4:14.0.0~)
-Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~)
+Conflicts: kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~), klinkstatus-trinity (<< 4:14.0.9~)
Depends: hicolor-icon-theme
Provides: tdelibs-data
Description: core shared data for all TDE applications
diff --git a/debian/_base/tdewebdev/debian/klinkstatus-trinity.install b/debian/_base/tdewebdev/debian/klinkstatus-trinity.install
index 9c6c7048d..78d214bfb 100644
--- a/debian/_base/tdewebdev/debian/klinkstatus-trinity.install
+++ b/debian/_base/tdewebdev/debian/klinkstatus-trinity.install
@@ -11,7 +11,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/klinkstatus/*.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/klinkstatus/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/klinkstatus/*.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/klinkstatus/*.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/bug.png
debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/klinkstatus.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/klinkstatus.png
debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/klinkstatus.png