From f5cf141760e8c4f4e2da9832077157a4242f4010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 1 Mar 2012 12:00:36 +0100 Subject: [PATCH] Drop kwin config update script from 4.0 to 4.1 REVIEW: 104130 --- data/CMakeLists.txt | 4 ++-- data/kwin_window_shortcuts.sh | 10 ---------- data/kwin_window_shortcuts.upd | 5 ----- 3 files changed, 2 insertions(+), 17 deletions(-) delete mode 100755 data/kwin_window_shortcuts.sh delete mode 100644 data/kwin_window_shortcuts.upd diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 6033e87c66..33e4790cf9 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -32,6 +32,6 @@ install( TARGETS kwin_update_tabbox_qml_settings DESTINATION ${LIB_INSTALL_DIR}/ install( FILES fsp_workarounds_1.kwinrules DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules ) install( FILES pop.wav DESTINATION ${SOUND_INSTALL_DIR} ) -install( FILES kwin_fsp_workarounds_1.upd kwin_window_shortcuts.upd kwin_update_tabbox_settings.upd kwin_remove_effects.upd kwin_update_tabbox_qml_settings.upd kwin_remove_delay_focus.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) -install( PROGRAMS kwin_window_shortcuts.sh kwin_remove_delay_focus.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) +install( FILES kwin_fsp_workarounds_1.upd kwin_update_tabbox_settings.upd kwin_remove_effects.upd kwin_update_tabbox_qml_settings.upd kwin_remove_delay_focus.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) +install( PROGRAMS kwin_remove_delay_focus.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) diff --git a/data/kwin_window_shortcuts.sh b/data/kwin_window_shortcuts.sh deleted file mode 100755 index 11b7c8e7b3..0000000000 --- a/data/kwin_window_shortcuts.sh +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/sh -# remove = lines for per-window shortcuts that are not supposed to be saved -while read line; do - if echo "$line" | grep '^[0-9]\+=' >/dev/null 2>/dev/null; then - key=`echo "$line" | sed 's/^\([0-9]\+\)=.*$/\1/'` - echo '# DELETE [kwin]'$key - else - echo "$line" - fi -done diff --git a/data/kwin_window_shortcuts.upd b/data/kwin_window_shortcuts.upd deleted file mode 100644 index 0554cdbb18..0000000000 --- a/data/kwin_window_shortcuts.upd +++ /dev/null @@ -1,5 +0,0 @@ -Id=kde414 -File=kglobalshortcutsrc -Group=kwin -Options=overwrite -Script=kwin_window_shortcuts.sh,sh