From 9f682f9e1fecc516f8d846477ef1d8c0b6c06130 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 7 Aug 2020 23:17:21 +0900 Subject: [PATCH] DEB klinkstatus: removed bug.png icon which is now installed in tdelibs. Signed-off-by: Michele Calgaro (cherry picked from commit 46afc510e176f408377a5f60105b5b5630027cad) --- debian/_base/tdelibs/debian/control | 2 +- debian/_base/tdewebdev/debian/klinkstatus-trinity.install | 1 - dilos/tdelibs/debian/control | 2 +- ubuntu/_base/tdelibs/debian/control | 2 +- ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.install | 1 - 5 files changed, 3 insertions(+), 5 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 diff --git a/dilos/tdelibs/debian/control b/dilos/tdelibs/debian/control index 34936fa0a..791a66c8b 100644 --- a/dilos/tdelibs/debian/control +++ b/dilos/tdelibs/debian/control @@ -45,7 +45,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/ubuntu/_base/tdelibs/debian/control b/ubuntu/_base/tdelibs/debian/control index e06d650fb..d24a92991 100644 --- a/ubuntu/_base/tdelibs/debian/control +++ b/ubuntu/_base/tdelibs/debian/control @@ -44,7 +44,7 @@ Section: libs Architecture: all Replaces: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~) Breaks: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~) -Conflicts: tdelibs-data, kdebase-kio-plugins-kde3 (<= 4:14.0.0~), kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~) +Conflicts: tdelibs-data, kdebase-kio-plugins-kde3 (<= 4:14.0.0~), 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/ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.install b/ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.install index 9c6c7048d..78d214bfb 100644 --- a/ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.install +++ b/ubuntu/_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