From 8ecedba15d62b5ad52c84bcb837dd58f91ff2f04 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
Date: Tue, 5 Nov 2024 17:26:50 +0300
Subject: [PATCH] Merge grantlee/ktexttemplate (from report)

---
 800.renames-and-merges/g.yaml | 1 -
 800.renames-and-merges/k.yaml | 3 +++
 950.split-branches.yaml       | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/800.renames-and-merges/g.yaml b/800.renames-and-merges/g.yaml
index 8fa9ca504..ee9b48caa 100644
--- a/800.renames-and-merges/g.yaml
+++ b/800.renames-and-merges/g.yaml
@@ -427,7 +427,6 @@
 - { setname: grafana,                  namepat: "grafana[0-9]+" }
 - { setname: grafana-loki,             name: [logcli,promtail], addflavor: true } # parts of
 - { setname: granite,                  namepat: "(?:lib)?granite[0-9.-]*" }
-- { setname: grantlee,                 name: [grantlee-qt4,grantlee-qt5,grantlee5], addflavor: true }
 - { setname: grantlee-editor,          name: grantleeeditor }
 - { setname: graphicsmagick,           name: [graphicsmagick-q8,graphicsmagick-q16,graphicsmagickq16], addflavor: true }
 - { setname: graphviz,                 name: [graphviz-frozen,graphviz-gvedit,graphviz-plugins,graphviz-smyrna,graphviz-gui], addflavor: true }
diff --git a/800.renames-and-merges/k.yaml b/800.renames-and-merges/k.yaml
index a3e15c57d..1c577bd25 100644
--- a/800.renames-and-merges/k.yaml
+++ b/800.renames-and-merges/k.yaml
@@ -121,6 +121,9 @@
 - { setname: ksh,                      name: ast-ksh }
 - { setname: ksh,                      name: static-ast-ksh, addflavor: static }
 - { setname: ktechlab,                 name: ktechlab-qt5 }
+- { setname: ktexttemplate,            name: grantlee } # converted into kde project
+- { setname: ktexttemplate,            name: [grantlee-qt4,grantlee-qt5,grantlee5,libgrantlee], addflavor: true }
+- { setname: ktexttemplate,            name: libgrantlee, addflavor: lib }
 - { setname: ktoblzcheck,              name: libktoblzcheck }
 - { setname: kubernetes,               name: [kube-apiserver,kube-controller-manager,kube-proxy,kube-scheduler], addflavor: true }
 - { setname: kubernetes,               name: [kubeadm,kubeadm-beta], addflavor: kubeadm }
diff --git a/950.split-branches.yaml b/950.split-branches.yaml
index 1dd8275ac..512bfa361 100644
--- a/950.split-branches.yaml
+++ b/950.split-branches.yaml
@@ -116,8 +116,6 @@
 
 - { name: granite,                                        setbranchcomps: 1 }
 
-- { name: grantlee,          verlt: "5",                  setbranch: qt4 }
-
 - { name: graylog,                                        setbranchcomps: 1 }
 
 - { name: grub,              verlt: "2",                  setbranch: legacy }