diff options
Diffstat (limited to 'khotkeys')
| -rw-r--r-- | khotkeys/README | 4 | ||||
| -rw-r--r-- | khotkeys/data/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | khotkeys/data/Makefile.am | 4 | ||||
| -rw-r--r-- | khotkeys/data/kde32b1.khotkeys | 2 | ||||
| -rw-r--r-- | khotkeys/data/khotkeys_32b1_update.upd | 4 | ||||
| -rw-r--r-- | khotkeys/data/konqueror_gestures_kde321.khotkeys | 2 | ||||
| -rw-r--r-- | khotkeys/data/konqueror_gestures_kde321_update.upd | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/khotkeys/README b/khotkeys/README index c490cbc5d..fe66c579b 100644 --- a/khotkeys/README +++ b/khotkeys/README @@ -48,8 +48,8 @@ - $KDEDIR/bin/khotkeys - $KDEDIR/lib/libkcm_khotkeys.la - $KDEDIR/lib/libkcm_khotkeys.so - - $KDEDIR/lib/kde3/libkcm_khotkeys.la - - $KDEDIR/lib/kde3/libkcm_khotkeys.so + - $KDEDIR/lib/trinity/libkcm_khotkeys.la + - $KDEDIR/lib/trinity/libkcm_khotkeys.so - $KDEDIR/lib/khotkeys.la - $KDEDIR/lib/khotkeys.so - $KDEDIR/lib/libkhotkeys.la diff --git a/khotkeys/data/CMakeLists.txt b/khotkeys/data/CMakeLists.txt index 06228c804..b9b3cf860 100644 --- a/khotkeys/data/CMakeLists.txt +++ b/khotkeys/data/CMakeLists.txt @@ -10,11 +10,11 @@ ################################################# install( FILES - kde32b1.khotkeys konqueror_gestures_kde321.khotkeys + trinity2b1.khotkeys konqueror_gestures_trinity21.khotkeys printscreen.khotkeys DESTINATION ${DATA_INSTALL_DIR}/khotkeys ) install( FILES khotkeys_32b1_update.upd khotkeys_printscreen.upd - konqueror_gestures_kde321_update.upd + konqueror_gestures_trinity21_update.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) diff --git a/khotkeys/data/Makefile.am b/khotkeys/data/Makefile.am index 543f9309b..44be27263 100644 --- a/khotkeys/data/Makefile.am +++ b/khotkeys/data/Makefile.am @@ -1,7 +1,7 @@ -khotkeys_data_DATA = kde32b1.khotkeys konqueror_gestures_kde321.khotkeys printscreen.khotkeys +khotkeys_data_DATA = trinity2b1.khotkeys konqueror_gestures_trinity21.khotkeys printscreen.khotkeys khotkeys_datadir = $(kde_datadir)/khotkeys -khotkeys_update_DATA = khotkeys_32b1_update.upd konqueror_gestures_kde321_update.upd khotkeys_printscreen.upd +khotkeys_update_DATA = khotkeys_32b1_update.upd konqueror_gestures_trinity21_update.upd khotkeys_printscreen.upd khotkeys_updatedir = $(kde_datadir)/kconf_update EXTRA_DIST = $(khotkeys_data_DATA) $(khotkeys_update_DATA) diff --git a/khotkeys/data/kde32b1.khotkeys b/khotkeys/data/kde32b1.khotkeys index 46db7521d..046a912dc 100644 --- a/khotkeys/data/kde32b1.khotkeys +++ b/khotkeys/data/kde32b1.khotkeys @@ -1743,4 +1743,4 @@ Timeout=1000 Autostart=true Disabled=false Version=2 -ImportId=kde32b1 +ImportId=trinity2b1 diff --git a/khotkeys/data/khotkeys_32b1_update.upd b/khotkeys/data/khotkeys_32b1_update.upd index 0ac7358e5..8f872cee0 100644 --- a/khotkeys/data/khotkeys_32b1_update.upd +++ b/khotkeys/data/khotkeys_32b1_update.upd @@ -1,8 +1,8 @@ -Id=kde32b1 +Id=trinity2b1 # the file is intentionally a dummy, as the binary will update khotkeysrc, # the khotkeys_update will just remember it has been done File=khotkeys_update Group=Dummy Options=overwrite -ScriptArguments=--id kde32b1 +ScriptArguments=--id trinity2b1 Script=khotkeys_update diff --git a/khotkeys/data/konqueror_gestures_kde321.khotkeys b/khotkeys/data/konqueror_gestures_kde321.khotkeys index e7a961315..acd75af17 100644 --- a/khotkeys/data/konqueror_gestures_kde321.khotkeys +++ b/khotkeys/data/konqueror_gestures_kde321.khotkeys @@ -2039,4 +2039,4 @@ Type=GESTURE [Main] Version=2 -ImportId=konqueror_gestures_kde321 +ImportId=konqueror_gestures_trinity21 diff --git a/khotkeys/data/konqueror_gestures_kde321_update.upd b/khotkeys/data/konqueror_gestures_kde321_update.upd index 06e784aef..f7b9a9e43 100644 --- a/khotkeys/data/konqueror_gestures_kde321_update.upd +++ b/khotkeys/data/konqueror_gestures_kde321_update.upd @@ -1,8 +1,8 @@ -Id=kde321 +Id=trinity21 # the file is intentionally a dummy, as the binary will update khotkeysrc, # the khotkeys_update will just remember it has been done File=khotkeys_update Group=Dummy Options=overwrite -ScriptArguments=--id konqueror_gestures_kde321 +ScriptArguments=--id konqueror_gestures_trinity21 Script=khotkeys_update |