Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add merge rules for Chimera Linux #847

Merged
merged 1 commit into from
Sep 12, 2024
Merged

Add merge rules for Chimera Linux #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions 800.renames-and-merges/c.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
- { setname: cargo, name: cargo-nightly, weak_devel: true, nolegacy: true }
- { setname: cargo-audit, name: ["rust:cargo-audit",rust-cargo-audit] }
- { setname: cargo-auditable, name: rust:$0 }
- { setname: cargo-auditable, name: cargo-auditable-bootstrap, addflavor: true }
- { setname: cargo-bloat, name: ["rust:cargo-bloat",rust-cargo-bloat] }
- { setname: cargo-c, name: "rust:cargo-c" }
- { setname: cargo-deb, name: "rust:cargo-deb" }
Expand Down
1 change: 1 addition & 0 deletions 800.renames-and-merges/e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
- { setname: emacs, name: [emacs-devel-nox], addflavor: nox11, weak_devel: true, nolegacy: true }
- { setname: emacs, name: emacs-git-gtk2, addflavor: gtk2, ignore: true }
- { setname: emacs, namepat: "emacs[0-9.-]+(-non-dfsg)?" }
- { setname: emacs, name: emacs-console, addflavor: true }
- { setname: emacs-lua-mode, name: emacs-lua }
- { setname: emacs-mediawiki, name: mediawiki, category: app-emacs }
- { setname: emacs-mmm-mode, name: emacs-mmm }
Expand Down
3 changes: 2 additions & 1 deletion 800.renames-and-merges/f.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
- { setname: font-v, name: python:$0 }
- { setname: fontbakery, name: "python:$0" }
- { setname: fontconfig, name: fontconfig-reference, addflavor: true }
- { setname: fontforge, name: fontforge-cli, addflavor: true }
- { setname: fontmake, name: "python:fontmake" }
- { setname: fonttools, name: "python:fonttools" }
- { setname: foo2js, name: foo2zjs-nightly, weak_devel: true, nolegacy: true }
Expand Down Expand Up @@ -189,7 +190,7 @@
- { setname: freetds, name: freetds-devel, weak_devel: true, nolegacy: true }
- { setname: freetds, name: [freetds-krb5,freetds-patched-enum], addflavor: true }
- { setname: freetype, name: [libfreetype,freetype1,freetype2] }
- { setname: freetype, name: [freetype2-bootstrap,freetype2-minimal,freetype2-old-hinting,freetype2-ttmetrics,freetype2-ultimate5,freetype2-v35,freetype2-static,freetype2-static-bootstrap], addflavor: true }
- { setname: freetype, name: [freetype2-bootstrap,freetype2-minimal,freetype2-old-hinting,freetype2-ttmetrics,freetype2-ultimate5,freetype2-v35,freetype2-static,freetype2-static-bootstrap,freetype-bootstrap], addflavor: true }
- { setname: freetype-infinality, name: [freetype2-infinality,libfreetype-infinality] }
- { setname: freexl, name: libfreexl, addflavor: true }
- { setname: frei0r, name: frei0r-plugins }
Expand Down
1 change: 1 addition & 0 deletions 800.renames-and-merges/fonts/c.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- cantarell-fonts-0.100
- font-abattis-cantarell
- fonts-cantarell
- fonts-cantarell-otf
- fonts-otf-abattis-cantarell
- fonts-otf-cantarell
- ttf-cantarell
Expand Down
3 changes: 3 additions & 0 deletions 800.renames-and-merges/fonts/f.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
- font-fira-code
- font-firacode
- fonts-firacode
- fonts-firacode-ttf
- fonts-ttf-fira-code
- otf-fira-code
- ttf-fira-code
Expand All @@ -86,6 +87,7 @@
- fontawesome
- fontawesome-fonts
- fonts-font-awesome
- fonts-font-awesome-otf
- fonts-ttf-fontawesome
- otf-font-awesome
- otf-font-awesome-5-free
Expand All @@ -105,6 +107,7 @@
- font-gnu-freefont
- font-gnu-freefont-ttf
- fonts-freefont
- fonts-freefont-otf
- fonts-freefont-ttf
- fonts-otf-freefont
- fonts-ttf-freefont
Expand Down
1 change: 1 addition & 0 deletions 800.renames-and-merges/fonts/h.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- font-hack
- font-hack-ttf
- fonts-hack
- fonts-hack-ttf
- fonts-otf-hack
- fonts-ttf-hack
- hack-font
Expand Down
1 change: 1 addition & 0 deletions 800.renames-and-merges/fonts/l.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
- setname: "fonts:libertinus"
name:
- font-libertinus
- fonts-libertinus-otf
- libertinus
- libertinus-font
- libertinus-fonts
Expand Down
3 changes: 3 additions & 0 deletions 800.renames-and-merges/fonts/n.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@

- setname: "fonts:nerd-fonts"
name:
- fonts-nerd-fonts
- nerd-fonts
- nerd-fonts-bitstream-vera-mono
- nerd-fonts-complete
Expand Down Expand Up @@ -178,6 +179,7 @@
name:
- font-google-noto-sans-cjk
- font-notosanscjktc
- fonts-noto-sans-cjk
- google-noto-sans-cjk-fonts
- google-noto-sans-cjk-subset-fonts
- google-noto-sans-cjk-vf-fonts
Expand All @@ -193,6 +195,7 @@
- setname: "fonts:noto-cjk-serif"
name:
- font-google-noto-serif-cjk
- fonts-noto-serif-cjk
- google-noto-serif-cjk-fonts
- google-noto-serif-cjk-vf-fonts
- noto-fonts-cjk-serif
Expand Down
1 change: 1 addition & 0 deletions 800.renames-and-merges/fonts/o.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
name:
- font-opensans
- fonts-open-sans
- fonts-opensans-ttf
- fonts-ttf-open-sans
- fonts-ttf-opensans
- google-opensans-fonts
Expand Down
2 changes: 2 additions & 0 deletions 800.renames-and-merges/fonts/s.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
- font-adobe-source-code-pro-fonts
- fonts-otf-adobe-source-code-pro
- fonts-otf-adobe-sourcecodepro
- fonts-source-code-pro-otf
- otf-source-code-pro
- source-code-pro
- sourcecodepro
Expand Down Expand Up @@ -192,6 +193,7 @@
- font-adobe-source-sans-pro-v2
- fonts-otf-adobe-source-sans-pro
- fonts-otf-adobe-sourcesanspro
- fonts-source-sans-otf
- otf-source-sans-pro
- source-sans
- source-sans-fonts
Expand Down
1 change: 1 addition & 0 deletions 800.renames-and-merges/fonts/t.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@

- setname: "fonts:twitter-twemoji"
name:
- fonts-twemoji-ttf
- ttf-twemoji
- twitter-color-emoji
- twitter-twemoji-fonts
Expand Down
4 changes: 2 additions & 2 deletions 800.renames-and-merges/g.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
- { setname: glew, name: glew-wayland, addflavor: true }
- { setname: glfw, name: [glfw-doc,glfw-wayland,glfw-x11] }
- { setname: glfw, namepat: "(?:lib)?glfw[0-9.-]*" }
- { setname: glib, name: [glib-reference,glib-static,glib2-docs,glib2-patched-thumbnailer,glib2-quiet,glib2-static,glib-utils,glib2-clear,glib2-sched-policy,glib2-tools], addflavor: true }
- { setname: glib, name: [glib-reference,glib-static,glib2-docs,glib2-patched-thumbnailer,glib2-quiet,glib2-static,glib-utils,glib2-clear,glib2-sched-policy,glib2-tools,glib-bootstrap], addflavor: true }
- { setname: glib, namepat: "(?:lib)?glib[0-9.-]*" }
- { setname: glib-networking, namepat: "glib[0-9.-]+networking" }
- { setname: glib-openssl, namepat: "glib[0-9.-]+openssl" }
Expand Down Expand Up @@ -484,7 +484,7 @@
- { setname: gtimelog, name: python:$0 }
- { setname: gtk, namepat: "(?:lib)?gtk[0-9.+-]*(-reference)?", addflavor: $1 }
- { setname: gtk, name: gtk-update-icon-cache, addflavor: true }
- { setname: gtk-doc, name: gtk-doc-am, addflavor: am }
- { setname: gtk-doc, name: [gtk-doc-am,gtk-doc-tools], addflavor: true }
- { setname: gtk-engines, namepat: "gtk[0-9.-]*engines[0-9.-]*" }
- { setname: gtk-engines-$1, namepat: "gtk[0-9.-]*engines-(.*)" } # XXX: convert to wildcard rule?
- { setname: gtk-recordmydesktop, name: recordmydesktop-gtk }
Expand Down
1 change: 1 addition & 0 deletions 800.renames-and-merges/linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
name:
- kernel-latest
- kernel-lt
- linux-stable

- setname: linux
name:
Expand Down
2 changes: 1 addition & 1 deletion 800.renames-and-merges/xorg-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

- { setname: xorg-server$1, namepat: "xorg-server[0-9.-]+(-.+)?" } # XXX: should be before large xorg-server rule at the end
- { setname: xorg-server$1, namepat: "xorg-server(-.+)?-dev", ignore: true } # XXX: should be before large xorg-server rule at the end
- { setname: xorg-server, name: [xorg-x11-server,xorg-xserver-server,xserver-xorg-server,modular-xorg-server] }
- { setname: xorg-server, name: [xorg-x11-server,xorg-xserver-server,xserver-xorg-server,modular-xorg-server,xserver-xorg-core] }
- { setname: xorg-server, name: xorg-server-legacy }
- { setname: xorg-server, namepat: "xorg-server-lts-[a-z]+" }

Expand Down
Loading