From eea74fd56e25aa195a0f365a5cc9771885cb992b Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Wed, 22 Nov 2023 15:08:28 +0300 Subject: [PATCH] Fix mismerge for garden (from report) --- 800.renames-and-merges/g.yaml | 1 - 850.split-ambiguities/g.yaml | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/800.renames-and-merges/g.yaml b/800.renames-and-merges/g.yaml index c5fadc7d5..544e8dddc 100644 --- a/800.renames-and-merges/g.yaml +++ b/800.renames-and-merges/g.yaml @@ -19,7 +19,6 @@ - { setname: gap, namepat: "gap[0-9.-]+(data|doc|packages)?", addflavor: $1 } - { setname: gap-$1, namepat: "gap-pkg-(.*)" } # may belong to 500.wildcard ruleset if fact - { setname: garcon, name: [garcon-gtk3,libgarcon,xfce4-garcon], addflavor: true } -- { setname: garden-of-coloured-lights, name: garden } - { setname: gargoyle, name: gargoyle-free } - { setname: garlic, name: garlic-doc } - { setname: garmindev, name: qlandkartegt-garmindev } diff --git a/850.split-ambiguities/g.yaml b/850.split-ambiguities/g.yaml index 716efaf22..e677714c2 100644 --- a/850.split-ambiguities/g.yaml +++ b/850.split-ambiguities/g.yaml @@ -17,6 +17,9 @@ - { name: gappa, wwwpart: lczech, setname: gappa-phylogenetic-analysis } - { name: gappa, addflag: unclassified } +- { name: garden, sourceforge: garden, setname: garden-of-coloured-lights } +- { name: garden, addflag: unclassified } + - { name: gatling, wwwpart: gatling.io, setname: gatling-stress-tool } - { name: gcap, wwwpart: code.google.com/p/gcap, setname: gcap-youtube }