From 323a59cb73f1b8aa539a5ad60126e9d1452a3f70 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Fri, 20 Dec 2024 20:12:26 +0300 Subject: [PATCH] Extend merge for cataclysm-dda --- 800.renames-and-merges/c.yaml | 6 +++--- 900.version-fixes/c.yaml | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/800.renames-and-merges/c.yaml b/800.renames-and-merges/c.yaml index e0a995475..35e7c96c2 100644 --- a/800.renames-and-merges/c.yaml +++ b/800.renames-and-merges/c.yaml @@ -67,9 +67,9 @@ - { setname: cassandra, name: [apache-cassandra,cassandra2] } - { setname: cassandra, name: cassandra-bin, addflavor: true } - { setname: cassandra, namepat: "cassandra[0-9.-]+" } -- { setname: cataclysm-dda, name: cataclysm } # homebrew -- { setname: cataclysm-dda, name: cataclysm-dark-days-ahead } -- { setname: cataclysm-dda, name: [cataclysm-dda-ncurses, cataclysm-dda-tiles], addflavor: true } +- { setname: cataclysm-dda, name: [cataclysm, cataclysm-dark-days-ahead, cataclysmdda] } +- { setname: cataclysm-dda, name: [cataclysm-dda-ncurses, cataclysm-dda-tiles, cataclysm-dda-sdl, cataclysm-dda-tiles-experimental], addflavor: true } +- { setname: cataclysm-dda, name: cataclysm-dda-git, weak_devel: true, nolegacy: true } - { setname: catch, name: libcatch-cpp-headers } - { setname: catch, name: [catch1, catch2, catch2-2, catch2-3, catch2v3, catch-classic] } # Note: don't include catch22, a different (python) library - { setname: catdoc, name: catdoc-tk, addflavor: true } diff --git a/900.version-fixes/c.yaml b/900.version-fixes/c.yaml index 8dc926efd..779fa308d 100644 --- a/900.version-fixes/c.yaml +++ b/900.version-fixes/c.yaml @@ -64,7 +64,9 @@ - { name: cassandra, verpat: ".*[ab].*", devel: true } # XXX: FreeBSD DISTVERSION - { name: castget, verpat: ".+20[0-9]{6}", snapshot: true } - { name: castnow, verpat: "20[0-9]{6}", incorrect: true } -- { name: cataclysm-dda, verpat: ".*[0-9]{4}.*", snapshot: true } +- { name: cataclysm-dda, verpat: ".+[0-9]{4}.*", snapshot: true } +- { name: cataclysm-dda, verpat: "20[0-9]{2}.*", incorrect: true } +- { name: cataclysm-dda, verpat: "20[0-9]{2}-[0-9]{2}-[0-9]{2}-[0-9]{4}", incorrect: false, devel: true } # experimental releases; should these be ignored instead? - { name: catch, verpat: ".*preview.*", devel: true } - { name: catclock, noscheme: true } - { name: catppuccin-kvantum, noscheme: true }