diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-11-17 20:48:33 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-11-17 20:50:51 +0900 |
| commit | 6e544d2af3d7ca9b4351dedd571b6b486ba23634 (patch) | |
| tree | 7c1ba4790b321ef6b577f50d45529583f24d128e /debian | |
| parent | 0849696afaf75d5ad0b6b3390c4abc8fea4c6974 (diff) | |
| download | tde-packaging-6e544d2af3d7ca9b4351dedd571b6b486ba23634.tar.gz tde-packaging-6e544d2af3d7ca9b4351dedd571b6b486ba23634.zip | |
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 6b584f416962f13b3767e055b1412cc5f898e9d7)
Diffstat (limited to 'debian')
4 files changed, 0 insertions, 12 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 |