Skip to content

Commit

Permalink
Merge grantlee/ktexttemplate (from report)
Browse files Browse the repository at this point in the history
  • Loading branch information
AMDmi3 committed Nov 5, 2024
1 parent 5551c9c commit 8ecedba
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
1 change: 0 additions & 1 deletion 800.renames-and-merges/g.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
3 changes: 3 additions & 0 deletions 800.renames-and-merges/k.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 0 additions & 2 deletions 950.split-branches.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,6 @@

- { name: granite, setbranchcomps: 1 }

- { name: grantlee, verlt: "5", setbranch: qt4 }

- { name: graylog, setbranchcomps: 1 }

- { name: grub, verlt: "2", setbranch: legacy }
Expand Down

0 comments on commit 8ecedba

Please sign in to comment.