From 6e544d2af3d7ca9b4351dedd571b6b486ba23634 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 17 Nov 2018 20:48:33 +0900 Subject: [PATCH] DEB: fix installation conflict between kdf and tdebase-data caused by commit 34ac65a3c2. Signed-off-by: Michele Calgaro (cherry picked from commit 6b584f416962f13b3767e055b1412cc5f898e9d7) --- debian/lenny/tdeutils/debian/kdf-trinity.install | 3 --- debian/lenny/tdeutils/debian/kdf-trinity.menu | 3 --- debian/squeeze/tdeutils/debian/kdf-trinity.install | 3 --- debian/squeeze/tdeutils/debian/kdf-trinity.menu | 3 --- ubuntu/maverick/tdeutils/debian/kdf-trinity.install | 3 --- ubuntu/maverick/tdeutils/debian/kdf-trinity.menu | 3 --- 6 files changed, 18 deletions(-) diff --git a/debian/lenny/tdeutils/debian/kdf-trinity.install b/debian/lenny/tdeutils/debian/kdf-trinity.install index a89e9bf6e..f8e6118ce 100644 --- a/debian/lenny/tdeutils/debian/kdf-trinity.install +++ b/debian/lenny/tdeutils/debian/kdf-trinity.install @@ -16,9 +16,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/kdf_config.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.docbook -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmdf.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmdf.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmdf.png debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kdf.png debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kwikdisk.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kdf.png diff --git a/debian/lenny/tdeutils/debian/kdf-trinity.menu b/debian/lenny/tdeutils/debian/kdf-trinity.menu index 5a7dbdefe..8862f9669 100644 --- a/debian/lenny/tdeutils/debian/kdf-trinity.menu +++ b/debian/lenny/tdeutils/debian/kdf-trinity.menu @@ -21,6 +21,3 @@ # Icon 32x32 kdf/pics/cr32-app-kwikdisk.png kwikdisk.xpm # Icon 16x16 kdf/pics/cr16-app-kwikdisk.png kwikdisk-16.xpm - -# XXX Icon 32x32 kdf/pics/cr32-app-kcmdf.png -# XXX Icon 16x16 kdf/pics/cr16-app-kcmdf.png diff --git a/debian/squeeze/tdeutils/debian/kdf-trinity.install b/debian/squeeze/tdeutils/debian/kdf-trinity.install index a89e9bf6e..f8e6118ce 100644 --- a/debian/squeeze/tdeutils/debian/kdf-trinity.install +++ b/debian/squeeze/tdeutils/debian/kdf-trinity.install @@ -16,9 +16,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/kdf_config.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.docbook -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmdf.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmdf.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmdf.png debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kdf.png debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kwikdisk.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kdf.png diff --git a/debian/squeeze/tdeutils/debian/kdf-trinity.menu b/debian/squeeze/tdeutils/debian/kdf-trinity.menu index 5a7dbdefe..8862f9669 100644 --- a/debian/squeeze/tdeutils/debian/kdf-trinity.menu +++ b/debian/squeeze/tdeutils/debian/kdf-trinity.menu @@ -21,6 +21,3 @@ # Icon 32x32 kdf/pics/cr32-app-kwikdisk.png kwikdisk.xpm # Icon 16x16 kdf/pics/cr16-app-kwikdisk.png kwikdisk-16.xpm - -# XXX Icon 32x32 kdf/pics/cr32-app-kcmdf.png -# XXX Icon 16x16 kdf/pics/cr16-app-kcmdf.png diff --git a/ubuntu/maverick/tdeutils/debian/kdf-trinity.install b/ubuntu/maverick/tdeutils/debian/kdf-trinity.install index a89e9bf6e..f8e6118ce 100644 --- a/ubuntu/maverick/tdeutils/debian/kdf-trinity.install +++ b/ubuntu/maverick/tdeutils/debian/kdf-trinity.install @@ -16,9 +16,6 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/kdf_config.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.docbook -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmdf.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmdf.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmdf.png debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kdf.png debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kwikdisk.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kdf.png diff --git a/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu b/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu index 5a7dbdefe..8862f9669 100644 --- a/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu +++ b/ubuntu/maverick/tdeutils/debian/kdf-trinity.menu @@ -21,6 +21,3 @@ # Icon 32x32 kdf/pics/cr32-app-kwikdisk.png kwikdisk.xpm # Icon 16x16 kdf/pics/cr16-app-kwikdisk.png kwikdisk-16.xpm - -# XXX Icon 32x32 kdf/pics/cr32-app-kcmdf.png -# XXX Icon 16x16 kdf/pics/cr16-app-kcmdf.png