diff options
Diffstat (limited to 'ubuntu')
| -rw-r--r-- | ubuntu/_base/tdelibs/debian/control | 2 | ||||
| -rw-r--r-- | ubuntu/_base/tdewebdev/debian/klinkstatus-trinity.install | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/ubuntu/_base/tdelibs/debian/control b/ubuntu/_base/tdelibs/debian/control index 46ba79e84..8be2490de 100644 --- a/ubuntu/_base/tdelibs/debian/control +++ b/ubuntu/_base/tdelibs/debian/control @@ -45,7 +45,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 |