summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2025-07-12 20:46:38 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2025-07-12 20:49:15 +0900
commit8ccf3b480ed92a7efa59df489b3f0e5dfdcc17d0 (patch)
tree80c44c779cd29408e08d93785b896c8c18f44b7d
parent33cacb6e279068d00f951e1726fed140a009f78c (diff)
downloadscripts-8ccf3b480ed92a7efa59df489b3f0e5dfdcc17d0.tar.gz
scripts-8ccf3b480ed92a7efa59df489b3f0e5dfdcc17d0.zip
Add ksimpleconfig --> tdesimpleconfig to conversion scripts and to r14.1.x backporting script
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rwxr-xr-xconversions/kde-tde/convert_existing_kde3_app_to_tde4
-rwxr-xr-xmisc/patch-update-for-r14-1-x8
2 files changed, 11 insertions, 1 deletions
diff --git a/conversions/kde-tde/convert_existing_kde3_app_to_tde b/conversions/kde-tde/convert_existing_kde3_app_to_tde
index 1b6be99..53c84fb 100755
--- a/conversions/kde-tde/convert_existing_kde3_app_to_tde
+++ b/conversions/kde-tde/convert_existing_kde3_app_to_tde
@@ -114,6 +114,8 @@ KInstance|\
KAboutData|\
KCModule|\
KConfig|\
+KSimpleConfig|\
+ksimpleconfig|\
KServer|\
KSocket|\
KIO\.|\
@@ -371,6 +373,8 @@ xargs -r0 sed -ri \
\
-e "s|([^a-zA-Z0-9]\|^)KCModule|\1TDECModule|g" \
-e "s|([^a-zA-Z0-9]\|^)KConfig|\1TDEConfig|g" \
+ -e "s|([^a-zA-Z0-9]\|^)KSimpleConfig|\1TDESimpleConfig|g" \
+ -e "s|([^a-zA-Z0-9]\|^)ksimpleconfig|\1tdesimpleconfig|g" \
-e "s|([^a-zA-Z0-9]\|^)KServer|\1TDEServer|g" \
-e "s|([^a-zA-Z0-9]\|^)KSocket|\1TDESocket|g" \
-e "s|([^a-zA-Z0-9]\|^)KIO\.|\1TDEIO.|g" \
diff --git a/misc/patch-update-for-r14-1-x b/misc/patch-update-for-r14-1-x
index 851efaf..b120a84 100755
--- a/misc/patch-update-for-r14-1-x
+++ b/misc/patch-update-for-r14-1-x
@@ -23,7 +23,7 @@ Usage:
4. edit commit message to add cherry pick note under signed off clause
git commit --amend --no-edit -S
and add:
- (cherry picked from commit hash>)
+ (cherry picked from <commit hash>)
USAGE
exit 1
@@ -72,3 +72,9 @@ sed -i "$@" \
sed -i "$@" \
-e "s|\btdestandarddirs\.h\b|kstandarddirs.h|g" "$1" \
+# tdesimpleconfig --> ksimpleconfig
+# TDESimpleConfig --> KSimpleConfig
+sed -i "$@" \
+ -e "s|tdesimpleconfig|ksimpleconfig|g" "$1" \
+ -e "s|TDESimpleConfig|KSimpleConfig|g" "$1" \
+