From 92d8c82872afdd19056ae495ae4ac9cf7345214c Mon Sep 17 00:00:00 2001 From: Eustace Date: Fri, 10 Jan 2025 15:16:07 +0800 Subject: [PATCH] reorganize some packages related around Desktop SIG --- sig/Desktop/sig-info.yaml | 2 +- sig/Desktop/src-openeuler/m/mozjs78.yaml | 46 +++------------ sig/Desktop/src-openeuler/m/mozjs91.yaml | 59 +++++++++++++++++++ sig/sig-cinnamon/sig-info.yaml | 2 +- .../src-openeuler/c/cinnamon-mozjs78.yaml | 25 -------- .../src-openeuler/s/slick-greeter.yaml} | 8 ++- sig/xfce/sig-info.yaml | 1 + .../src-openeuler/l/lightdm-gtk-greeter.yaml} | 5 +- 8 files changed, 78 insertions(+), 70 deletions(-) create mode 100644 sig/Desktop/src-openeuler/m/mozjs91.yaml delete mode 100644 sig/sig-cinnamon/src-openeuler/c/cinnamon-mozjs78.yaml rename sig/{sig-recycle/src-openeuler/l/lightdm-gtk-greeter.yaml => sig-cinnamon/src-openeuler/s/slick-greeter.yaml} (74%) rename sig/{Desktop/src-openeuler/l/lightdm-gtk.yaml => xfce/src-openeuler/l/lightdm-gtk-greeter.yaml} (94%) diff --git a/sig/Desktop/sig-info.yaml b/sig/Desktop/sig-info.yaml index cb108d5be..5ff5cd54f 100644 --- a/sig/Desktop/sig-info.yaml +++ b/sig/Desktop/sig-info.yaml @@ -225,7 +225,6 @@ repositories: - src-openeuler/xorg-x11-server-xwayland - src-openeuler/yelp-xsl - src-openeuler/yelp - - src-openeuler/lightdm-gtk - src-openeuler/lightdm - src-openeuler/low-memory-monitor - src-openeuler/geany @@ -415,6 +414,7 @@ repositories: - src-openeuler/mkfontscale - src-openeuler/mozilla-filesystem - src-openeuler/mozjs78 + - src-openeuler/mozjs91 - src-openeuler/openjpeg2 - src-openeuler/ORBit2 - src-openeuler/PackageKit diff --git a/sig/Desktop/src-openeuler/m/mozjs78.yaml b/sig/Desktop/src-openeuler/m/mozjs78.yaml index 093e93e71..ab4e620fe 100644 --- a/sig/Desktop/src-openeuler/m/mozjs78.yaml +++ b/sig/Desktop/src-openeuler/m/mozjs78.yaml @@ -1,58 +1,26 @@ name: mozjs78 +rename-from: cinnamon-mozjs78 description: SpiderMonkey JavaScript library upstream: https://hg.mozilla.org/releases/mozilla-esr78 branches: - name: master type: protected -- name: openEuler-20.03-LTS-Next - type: readonly - create_from: master -- name: openEuler-21.03 - type: readonly - create_from: master -- name: openEuler-20.03-LTS - type: readonly - create_from: openEuler-20.03-LTS-Next -- name: openEuler-20.03-LTS-SP1 - type: protected - create_from: openEuler-20.03-LTS-Next -- name: openEuler-20.03-LTS-SP2 - type: readonly - create_from: openEuler-20.03-LTS-Next -- name: openEuler-21.09 - type: readonly - create_from: master -- name: openEuler-20.03-LTS-SP3 - type: protected - create_from: openEuler-20.03-LTS-Next -- name: openEuler-22.03-LTS-Next - type: protected - create_from: openEuler-21.09 -- name: openEuler-22.03-LTS - type: readonly - create_from: openEuler-22.03-LTS-Next - name: openEuler-22.09 type: readonly create_from: master -- name: openEuler-22.03-LTS-SP1 - type: protected - create_from: openEuler-22.03-LTS-Next - name: openEuler-23.03 type: readonly create_from: master -- name: openEuler-22.03-LTS-SP2 - type: protected - create_from: openEuler-22.03-LTS-Next - name: openEuler-23.09 type: protected create_from: master -- name: openEuler-20.03-LTS-SP4 +- name: openEuler-24.03-LTS-Next type: protected - create_from: openEuler-20.03-LTS-SP3 -- name: openEuler-22.03-LTS-SP3 + create_from: master +- name: openEuler-24.03-LTS type: protected - create_from: openEuler-22.03-LTS-Next -- name: openEuler-22.03-LTS-SP4 + create_from: openEuler-24.03-LTS-Next +- name: openEuler-24.09 type: protected - create_from: openEuler-22.03-LTS-Next + create_from: master type: public diff --git a/sig/Desktop/src-openeuler/m/mozjs91.yaml b/sig/Desktop/src-openeuler/m/mozjs91.yaml new file mode 100644 index 000000000..b79dcb88f --- /dev/null +++ b/sig/Desktop/src-openeuler/m/mozjs91.yaml @@ -0,0 +1,59 @@ +name: mozjs91 +rename-from: mozjs78 +description: SpiderMonkey JavaScript library +upstream: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey +branches: +- name: master + type: protected +- name: openEuler-20.03-LTS-Next + type: readonly + create_from: master +- name: openEuler-21.03 + type: readonly + create_from: master +- name: openEuler-20.03-LTS + type: readonly + create_from: openEuler-20.03-LTS-Next +- name: openEuler-20.03-LTS-SP1 + type: protected + create_from: openEuler-20.03-LTS-Next +- name: openEuler-20.03-LTS-SP2 + type: readonly + create_from: openEuler-20.03-LTS-Next +- name: openEuler-21.09 + type: readonly + create_from: master +- name: openEuler-20.03-LTS-SP3 + type: protected + create_from: openEuler-20.03-LTS-Next +- name: openEuler-22.03-LTS-Next + type: protected + create_from: openEuler-21.09 +- name: openEuler-22.03-LTS + type: readonly + create_from: openEuler-22.03-LTS-Next +- name: openEuler-22.09 + type: readonly + create_from: master +- name: openEuler-22.03-LTS-SP1 + type: protected + create_from: openEuler-22.03-LTS-Next +- name: openEuler-23.03 + type: readonly + create_from: master +- name: openEuler-22.03-LTS-SP2 + type: protected + create_from: openEuler-22.03-LTS-Next +- name: openEuler-23.09 + type: protected + create_from: master +- name: openEuler-20.03-LTS-SP4 + type: protected + create_from: openEuler-20.03-LTS-SP3 +- name: openEuler-22.03-LTS-SP3 + type: protected + create_from: openEuler-22.03-LTS-Next +- name: openEuler-22.03-LTS-SP4 + type: protected + create_from: openEuler-22.03-LTS-Next +type: public diff --git a/sig/sig-cinnamon/sig-info.yaml b/sig/sig-cinnamon/sig-info.yaml index f2c093ad6..dc0c7941b 100644 --- a/sig/sig-cinnamon/sig-info.yaml +++ b/sig/sig-cinnamon/sig-info.yaml @@ -50,10 +50,10 @@ repositories: - src-openeuler/mintlocale - src-openeuler/python-plum-py - src-openeuler/caribou - - src-openeuler/cinnamon-mozjs78 - src-openeuler/python-pam - src-openeuler/python-tinycss2 - src-openeuler/python-xapp + - src-openeuler/slick-greeter - src-openeuler/tint2 - src-openeuler/xdotool diff --git a/sig/sig-cinnamon/src-openeuler/c/cinnamon-mozjs78.yaml b/sig/sig-cinnamon/src-openeuler/c/cinnamon-mozjs78.yaml deleted file mode 100644 index 59a8b931b..000000000 --- a/sig/sig-cinnamon/src-openeuler/c/cinnamon-mozjs78.yaml +++ /dev/null @@ -1,25 +0,0 @@ -name: cinnamon-mozjs78 -description: SpiderMonkey JavaScript library -upstream: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey -branches: -- name: master - type: protected -- name: openEuler-22.09 - type: readonly - create_from: master -- name: openEuler-23.03 - type: readonly - create_from: master -- name: openEuler-23.09 - type: protected - create_from: master -- name: openEuler-24.03-LTS-Next - type: protected - create_from: master -- name: openEuler-24.03-LTS - type: protected - create_from: openEuler-24.03-LTS-Next -- name: openEuler-24.09 - type: protected - create_from: master -type: public diff --git a/sig/sig-recycle/src-openeuler/l/lightdm-gtk-greeter.yaml b/sig/sig-cinnamon/src-openeuler/s/slick-greeter.yaml similarity index 74% rename from sig/sig-recycle/src-openeuler/l/lightdm-gtk-greeter.yaml rename to sig/sig-cinnamon/src-openeuler/s/slick-greeter.yaml index 7477e11ec..afc816e80 100644 --- a/sig/sig-recycle/src-openeuler/l/lightdm-gtk-greeter.yaml +++ b/sig/sig-cinnamon/src-openeuler/s/slick-greeter.yaml @@ -1,6 +1,7 @@ -name: lightdm-gtk-greeter +name: slick-greeter +rename_from: lightdm-gtk-greeter description: LightDM GTK+ Greeter -upstream: https://launchpad.net/lightdm-gtk-greeter +upstream: https://github.com/linuxmint/slick-greeter branches: - name: master type: protected @@ -19,4 +20,7 @@ branches: - name: openEuler-20.03-LTS-SP4 type: protected create_from: openEuler-20.03-LTS-SP3 +- name: openEuler-25.03 + type: readonly + create_from: master type: public diff --git a/sig/xfce/sig-info.yaml b/sig/xfce/sig-info.yaml index 51b371166..a983146f1 100644 --- a/sig/xfce/sig-info.yaml +++ b/sig/xfce/sig-info.yaml @@ -40,6 +40,7 @@ repositories: - src-openeuler/xfdesktop - src-openeuler/xfce4-power-manager - src-openeuler/xfce4-panel + - src-openeuler/lightdm-gtk-greeter - src-openeuler/libmpd - src-openeuler/libxfce4ui - src-openeuler/libxfce4util diff --git a/sig/Desktop/src-openeuler/l/lightdm-gtk.yaml b/sig/xfce/src-openeuler/l/lightdm-gtk-greeter.yaml similarity index 94% rename from sig/Desktop/src-openeuler/l/lightdm-gtk.yaml rename to sig/xfce/src-openeuler/l/lightdm-gtk-greeter.yaml index 6514eb0f1..852b19211 100644 --- a/sig/Desktop/src-openeuler/l/lightdm-gtk.yaml +++ b/sig/xfce/src-openeuler/l/lightdm-gtk-greeter.yaml @@ -1,6 +1,7 @@ -name: lightdm-gtk +name: lightdm-gtk-greeter +rename_from: lightdm-gtk description: A LightDM greeter that uses the GTK3 toolkit -upstream: https://launchpad.net/lightdm-gtk-greeter +upstream: https://github.com/Xubuntu/lightdm-gtk-greeter branches: - name: master type: protected -- Gitee