diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-24 22:41:49 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-24 22:41:49 -0500 |
| commit | bcf824f9d02a94d16b32144199ab06d888789999 (patch) | |
| tree | 003b5a5dca45fc598457e413138ed0fca11b2206 /ubuntu | |
| parent | ecc1dd2d851df7094e68fad10db2f6a3b47c1c7f (diff) | |
| download | tde-packaging-bcf824f9d02a94d16b32144199ab06d888789999.tar.gz tde-packaging-bcf824f9d02a94d16b32144199ab06d888789999.zip | |
Fix tde-systemsettings FTBFS on Debian and Ubuntu
Diffstat (limited to 'ubuntu')
| -rwxr-xr-x | ubuntu/maverick/applications/tde-systemsettings/debian/rules | 6 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/tde-systemsettings/debian/tde-settings-laptops.directory (renamed from ubuntu/maverick/applications/tde-systemsettings/debian/kde-settings-laptops.directory) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/rules b/ubuntu/maverick/applications/tde-systemsettings/debian/rules index f4204f328..59e6800f6 100755 --- a/ubuntu/maverick/applications/tde-systemsettings/debian/rules +++ b/ubuntu/maverick/applications/tde-systemsettings/debian/rules @@ -35,10 +35,10 @@ build/tde-systemsettings-trinity:: install/tde-systemsettings-trinity:: # Don't clash files, just Use the ones from kcontrol - rm debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/kde-settings-power.directory - rm debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/kde-settings-system.directory + rm debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/tde-settings-power.directory + rm debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/tde-settings-system.directory rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/tde/kcmfontinst.desktop rm debian/tde-systemsettings-trinity/opt/trinity/share/applications/tde/laptoppowermanagement.desktop - cp debian/kde-settings-laptops.directory debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/ + cp debian/tde-settings-laptops.directory debian/tde-systemsettings-trinity/opt/trinity/share/desktop-directories/ DEB_INSTALL_MANPAGES_tde-systemsettings-trinity = systemsettings.1 diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/kde-settings-laptops.directory b/ubuntu/maverick/applications/tde-systemsettings/debian/tde-settings-laptops.directory index 687a493c4..687a493c4 100644 --- a/ubuntu/maverick/applications/tde-systemsettings/debian/kde-settings-laptops.directory +++ b/ubuntu/maverick/applications/tde-systemsettings/debian/tde-settings-laptops.directory |