DEB: fix installation conflict between kdf and tdebase-data caused by commit 34ac65a3c2.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 6b584f4169)
6 years ago · 6e544d2af3
parent 0849696afa
commit 6e544d2af3
6 changed files with 0 additions and 18 deletions
--- 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
--- 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 
--- 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
--- 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 
--- 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
--- 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