From 4405f1756cdfadef22cb9adfe7ad809216217789 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Mon, 11 Sep 2023 15:35:14 +0300 Subject: [PATCH] Split palemoon merge rules to separate file, extend (from report) --- 800.renames-and-merges/p.yaml | 3 --- 800.renames-and-merges/palemoon.yaml | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 800.renames-and-merges/palemoon.yaml diff --git a/800.renames-and-merges/p.yaml b/800.renames-and-merges/p.yaml index 73c41406c..35e6ee68a 100644 --- a/800.renames-and-merges/p.yaml +++ b/800.renames-and-merges/p.yaml @@ -19,9 +19,6 @@ - { setname: paho.mqtt.cpp, name: [paho-mqtt-cpp,paho-mqttpp3] } - { setname: paint.net, name: paintdotnet } - { setname: paintown, name: paintown-data, addflavor: true } -- { setname: palemoon, name: [palemoon-26, pale-moon, palemoon-browser] } -- { setname: palemoon, name: [palemoon-bin, palemoon-browser-gtk3], addflavor: true } -- { setname: palemoon, name: palemoon-unstable, weak_devel: true, nolegacy: true } - { setname: pam, name: [libpam,linux-pam] } - { setname: pam, name: pam-selinux, addflavor: true } - { setname: pam-ccreds, name: libpam-ccreds } diff --git a/800.renames-and-merges/palemoon.yaml b/800.renames-and-merges/palemoon.yaml new file mode 100644 index 000000000..701d58269 --- /dev/null +++ b/800.renames-and-merges/palemoon.yaml @@ -0,0 +1,28 @@ +# vim: tabstop=39 expandtab softtabstop=39 nomodeline + +- setname: palemoon + name: + - pale-moon + - palemoon-26 + - palemoon-browser + +- { setname: palemoon, namepat: "palemoon-i18n-.*", addflavor: true } + +- setname: palemoon + name: + - palemoon-bin + - palemoon-browser-gtk3 + - palemoon-el + - palemoon-gtk3 + - palemoon-i18n + - palemoon-pt + - palemoon-pt-br + - palemoon-ru + - palemoon-uk + addflavor: true + +- setname: palemoon + name: + - palemoon-unstable + weak_devel: true + nolegacy: true