summaryrefslogtreecommitdiffstats
path: root/debian/squeeze/tdelibs/debian/not-installed.list
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-05-27 13:20:16 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-05-27 13:20:16 +0900
commit229e7f5038cbc5f930ab50abfad3099919a4e8bb (patch)
tree569abf2cbc4bd05a0b90ed759ccd941eaa676c01 /debian/squeeze/tdelibs/debian/not-installed.list
parent59f50d7552dacb6d27d0768a9a5320e5ba2fc23d (diff)
parent50c481625fcb2361e0aaae71df24a40cbad056d7 (diff)
downloadtde-packaging-229e7f5038cbc5f930ab50abfad3099919a4e8bb.tar.gz
tde-packaging-229e7f5038cbc5f930ab50abfad3099919a4e8bb.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'debian/squeeze/tdelibs/debian/not-installed.list')
-rw-r--r--debian/squeeze/tdelibs/debian/not-installed.list4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/squeeze/tdelibs/debian/not-installed.list b/debian/squeeze/tdelibs/debian/not-installed.list
index ad8dd66b4..4355d4fbd 100644
--- a/debian/squeeze/tdelibs/debian/not-installed.list
+++ b/debian/squeeze/tdelibs/debian/not-installed.list
@@ -2,10 +2,10 @@ The following files are not installed in any binary package.
This is deliberate.
/etc/xdg/menus/applications.menu
- - we install a renamed copy of this file (kde-applications.menu)
+ - we install a renamed copy of this file (tde-applications.menu)
to avoid conflicts with GNOME. See debian/rules.
/usr/share/icons/hicolor/index.theme
- This is shipped as part of the hicolor-icon-theme package,
- which GNOME and KDE depend on. Shipping this ourselves would
+ which GNOME and TDE depend on. Shipping this ourselves would
result in file conflicts.