Daniel Brötzmann pushed to branch master at gajim / gajim


Commits:
f120733d by André Apitzsch at 2024-02-02T08:54:38+00:00
other: Rename metadata file to follow spec

See 
https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location

- - - - -
458b48a8 by André Apitzsch at 2024-02-02T08:54:38+00:00
other: Update metainfo

Update copyright year and replace deprecated developer_name [1].

[1] 
https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-developer_name

- - - - -


8 changed files:

- .gitlab-ci.yml
- data/org.gajim.Gajim.appdata.xml.in → data/org.gajim.Gajim.metainfo.xml.in
- debian/install
- flatpak/org.gajim.Gajim.Devel.yaml
- pep517build/build_metadata.py
- pep517build/install_metadata.py
- scripts/bump_version.py
- scripts/update_translations.py


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -17,7 +17,7 @@ test-other:
   script:
     - pyproject-build
     - python ./pep517build/build_metadata.py
-    - appstream-util validate dist/metadata/org.gajim.Gajim.appdata.xml
+    - appstream-util validate dist/metadata/org.gajim.Gajim.metainfo.xml
   interruptible: true
 
 test-codespell:


=====================================
data/org.gajim.Gajim.appdata.xml.in → data/org.gajim.Gajim.metainfo.xml.in
=====================================
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2017-2023 Gajim Team -->
+<!-- Copyright 2017-2024 Gajim Team -->
 <component type="desktop-application">
   <id>org.gajim.Gajim</id>
   <metadata_license>CC-BY-SA-3.0</metadata_license>
@@ -56,7 +56,9 @@
     </screenshot>
   </screenshots>
   <launchable type="desktop-id">org.gajim.Gajim.desktop</launchable>
-  <developer_name>Gajim Team</developer_name>
+  <developer id="gajim.org">
+    <name>Gajim Team</name>
+  </developer>
   <update_contact>gajim-devel_AT_gajim.org</update_contact>
   <url type="homepage">https://gajim.org/</url>
   <url type="bugtracker">https://dev.gajim.org/gajim/gajim</url>


=====================================
debian/install
=====================================
@@ -1,4 +1,4 @@
 dist/metadata/org.gajim.Gajim.svg usr/share/icons/hicolor/scalable/apps
 dist/metadata/org.gajim.Gajim-symbolic.svg 
usr/share/icons/hicolor/scalable/apps
-dist/metadata/org.gajim.Gajim.appdata.xml usr/share/metainfo
-dist/metadata/org.gajim.Gajim.desktop usr/share/applications
\ No newline at end of file
+dist/metadata/org.gajim.Gajim.metainfo.xml usr/share/metainfo
+dist/metadata/org.gajim.Gajim.desktop usr/share/applications


=====================================
flatpak/org.gajim.Gajim.Devel.yaml
=====================================
@@ -9,7 +9,7 @@ tags:
   - nightly
 rename-icon: org.gajim.Gajim
 rename-desktop-file: org.gajim.Gajim.desktop
-rename-appdata-file: org.gajim.Gajim.appdata.xml
+rename-appdata-file: org.gajim.Gajim.metainfo.xml
 finish-args:
   - --share=ipc
   - --share=network
@@ -372,8 +372,8 @@ modules:
         path: app-overrides.json
       - type: shell
         commands:
-          - sed -i 
"s+<id>org.gajim.Gajim</id>+<id>org.gajim.Gajim.Devel</id>+" 
data/org.gajim.Gajim.appdata.xml.in
-          - sed -i "s+<name>Gajim</name>+<name>Gajim (Nightly)</name>+" 
data/org.gajim.Gajim.appdata.xml.in
+          - sed -i 
"s+<id>org.gajim.Gajim</id>+<id>org.gajim.Gajim.Devel</id>+" 
data/org.gajim.Gajim.metainfo.xml.in
+          - sed -i "s+<name>Gajim</name>+<name>Gajim (Nightly)</name>+" 
data/org.gajim.Gajim.metainfo.xml.in
           - sed -i "s+Exec=gajim+Exec=gajim-devel+" 
data/org.gajim.Gajim.desktop.in
           - mv 
gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim{.Devel,}.svg
     post-install:


=====================================
pep517build/build_metadata.py
=====================================
@@ -19,7 +19,7 @@
 ]
 META_FILES = [
     (Path('data/org.gajim.Gajim.desktop.in'), '--desktop'),
-    (Path('data/org.gajim.Gajim.appdata.xml.in'), '--xml')
+    (Path('data/org.gajim.Gajim.metainfo.xml.in'), '--xml')
 ]
 ICONS = [
     Path('gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.svg'),


=====================================
pep517build/install_metadata.py
=====================================
@@ -17,7 +17,7 @@
     'org.gajim.Gajim.desktop': 'share/applications',
     'org.gajim.Gajim-symbolic.svg': 'share/icons/hicolor/scalable/apps',
     'org.gajim.Gajim.svg': 'share/icons/hicolor/scalable/apps',
-    'org.gajim.Gajim.appdata.xml': 'share/metainfo',
+    'org.gajim.Gajim.metainfo.xml': 'share/metainfo',
 }
 
 if __name__ == '__main__':


=====================================
scripts/bump_version.py
=====================================
@@ -12,7 +12,7 @@
 
 INIT = REPO_DIR / 'gajim' / '__init__.py'
 FLATPAK = REPO_DIR / 'flatpak' / 'org.gajim.Gajim.yaml'
-APPDATA = REPO_DIR / 'data' / 'org.gajim.Gajim.appdata.xml.in'
+APPDATA = REPO_DIR / 'data' / 'org.gajim.Gajim.metainfo.xml.in'
 CHANGELOG = REPO_DIR / 'ChangeLog'
 
 VERSION_RX = r'\d+\.\d+\.\d+'


=====================================
scripts/update_translations.py
=====================================
@@ -17,7 +17,7 @@
     'gajim/**/*.py',
     'gajim/**/*.ui',
     'data/org.gajim.Gajim.desktop.in',
-    'data/org.gajim.Gajim.appdata.xml.in',
+    'data/org.gajim.Gajim.metainfo.xml.in',
 ]
 
 



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/compare/d64f5a91d3dadfb2a15fa07ecf853157121ee5bf...458b48a88911ffb527a864ddfede10f326dc5950

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/compare/d64f5a91d3dadfb2a15fa07ecf853157121ee5bf...458b48a88911ffb527a864ddfede10f326dc5950
You're receiving this email because of your account on dev.gajim.org.


_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to