From ea97f98355c28c2b83d5ed1d525020c4bb5bba6b Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Fri, 19 Jun 2009 19:26:51 +0000 Subject: [PATCH] install air as default, oxygen as oxygen svn path=/trunk/KDE/kdebase/runtime/; revision=984024 --- CMakeLists.txt | 2 +- air/CMakeLists.txt | 10 +++++----- air/metadata.desktop | 2 +- oxygen/CMakeLists.txt | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c171062a8..db3c38730 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,3 @@ add_subdirectory( oxygen ) - +add_subdirectory( air ) diff --git a/air/CMakeLists.txt b/air/CMakeLists.txt index 0c56428f9..3235aea9d 100644 --- a/air/CMakeLists.txt +++ b/air/CMakeLists.txt @@ -1,14 +1,14 @@ -install(FILES colors metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/air/) +install(FILES colors metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/) FILE(GLOB widgets widgets/*.svgz) -install( FILES ${widgets} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/air/widgets/ ) +install( FILES ${widgets} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/ ) FILE(GLOB dialogs dialogs/*.svgz) -install( FILES ${dialogs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/air/dialogs/ ) +install( FILES ${dialogs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/dialogs/ ) FILE(GLOB opaque_dialogs opaque/dialogs/*.svgz) -install( FILES ${opaque_dialogs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/air/opaque/dialogs/ ) +install( FILES ${opaque_dialogs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/opaque/dialogs/ ) FILE(GLOB opaque_widgets opaque/widgets/*.svgz) -install( FILES ${opaque_widgets} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/air/opaque/widgets/ ) +install( FILES ${opaque_widgets} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/opaque/widgets/ ) diff --git a/air/metadata.desktop b/air/metadata.desktop index 99d55429f..a84a54523 100644 --- a/air/metadata.desktop +++ b/air/metadata.desktop @@ -30,7 +30,7 @@ Comment[x-test]=xxA breath of fresh airxx X-KDE-PluginInfo-Author=The Oxygen Project X-KDE-PluginInfo-Email=kde-artists@kde.org X-KDE-PluginInfo-Name=air -X-KDE-PluginInfo-Version=pre0.1 +X-KDE-PluginInfo-Version=0.9 X-KDE-PluginInfo-Website=http://plasma.kde.org X-KDE-PluginInfo-Category= X-KDE-PluginInfo-Depends= diff --git a/oxygen/CMakeLists.txt b/oxygen/CMakeLists.txt index 00b7bbc2f..ee38e58ef 100644 --- a/oxygen/CMakeLists.txt +++ b/oxygen/CMakeLists.txt @@ -1,15 +1,15 @@ -install(FILES colors metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/) +install(FILES colors metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/oxygen/) FILE(GLOB widgets widgets/*.svgz) -install( FILES ${widgets} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/ ) +install( FILES ${widgets} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/oxygen/widgets/ ) FILE(GLOB dialogs dialogs/*.svgz) -install( FILES ${dialogs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/dialogs/ ) +install( FILES ${dialogs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/oxygen/dialogs/ ) FILE(GLOB opaque opaque/widgets/*.svgz) -install( FILES ${opaque} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/opaque/widgets/ ) +install( FILES ${opaque} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/oxygen/opaque/widgets/ ) FILE(GLOB opaque opaque/dialogs/*.svgz) -install( FILES ${opaque} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/opaque/dialogs/ ) +install( FILES ${opaque} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/oxygen/opaque/dialogs/ )