From 85410c0b652709238693e555be2dfdcb17deb018 Mon Sep 17 00:00:00 2001
From: Hofer-Julian <julian.public@protonmail.com>
Date: Sat, 15 Jun 2019 21:51:51 +0200
Subject: [PATCH] Update metadata and rename to com.borgbase.Vorta

- Update appdata
- Add appdata bumpversion.cfg
- Rename flatpak-name to com.borgbase.Vorta (#292)
---
 .bumpversion.cfg                              |   2 +
 CONTRIBUTING.md                               |   8 ++--
 ...ase.vorta.yaml => com.borgbase.Vorta.yaml} |  20 ++++-----
 ...gbase.vorta.png => com.borgbase.Vorta.png} | Bin
 ...gbase.vorta.png => com.borgbase.Vorta.png} | Bin
 ...gbase.vorta.png => com.borgbase.Vorta.png} | Bin
 ...gbase.vorta.png => com.borgbase.Vorta.png} | Bin
 ...gbase.vorta.png => com.borgbase.Vorta.png} | Bin
 ...gbase.vorta.png => com.borgbase.Vorta.png} | Bin
 ...gbase.vorta.png => com.borgbase.Vorta.png} | Bin
 ...ata.xml => com.borgbase.Vorta.appdata.xml} |  41 +++++-------------
 ...rta.desktop => com.borgbase.Vorta.desktop} |   2 +-
 12 files changed, 27 insertions(+), 46 deletions(-)
 rename flatpak/{com.borgbase.vorta.yaml => com.borgbase.Vorta.yaml} (81%)
 rename src/vorta/assets/icons/128x128/{com.borgbase.vorta.png => com.borgbase.Vorta.png} (100%)
 rename src/vorta/assets/icons/24x24/{com.borgbase.vorta.png => com.borgbase.Vorta.png} (100%)
 rename src/vorta/assets/icons/256x256/{com.borgbase.vorta.png => com.borgbase.Vorta.png} (100%)
 rename src/vorta/assets/icons/32x32/{com.borgbase.vorta.png => com.borgbase.Vorta.png} (100%)
 rename src/vorta/assets/icons/48x48/{com.borgbase.vorta.png => com.borgbase.Vorta.png} (100%)
 rename src/vorta/assets/icons/512x512/{com.borgbase.vorta.png => com.borgbase.Vorta.png} (100%)
 rename src/vorta/assets/icons/64x64/{com.borgbase.vorta.png => com.borgbase.Vorta.png} (100%)
 rename src/vorta/assets/metadata/{com.borgbase.vorta.appdata.xml => com.borgbase.Vorta.appdata.xml} (50%)
 rename src/vorta/assets/metadata/{com.borgbase.vorta.desktop => com.borgbase.Vorta.desktop} (80%)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 194d4582..eb3cc143 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -11,3 +11,5 @@ tag = True
 
 [bumpversion:file:src/vorta/_version.py]
 
+[bumpversion:file:src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml]
+
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 37897137..1f3178f4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -50,15 +50,15 @@ Next, in Vorta’s source directory, use ``flatpak-builder`` to build a Vorta fl
 ```
 $ cd vorta/flatpak/
 $ mkdir app
-$ flatpak-builder --repo=$HOME/my-flatpak-builds app com.borgbase.vorta.yaml
-$ flatpak install --user my-flatpak-builds com.borgbase.vorta//devel -y
+$ flatpak-builder --repo=$HOME/my-flatpak-builds app com.borgbase.Vorta.yaml
+$ flatpak install --user my-flatpak-builds com.borgbase.Vorta//devel -y
 ```
 
 Now you can work on the codebase.
 When you want to test your changes you can execute inside of ``vorta/flatpak/``
 ```
-$ flatpak-builder --repo=$HOME/my-flatpak-builds app com.borgbase.vorta.yaml --force-clean && flatpak update com.borgbase.vorta//devel -y
-$ flatpak run com.borgbase.vorta//devel 
+$ flatpak-builder --repo=$HOME/my-flatpak-builds app com.borgbase.Vorta.yaml --force-clean && flatpak update com.borgbase.Vorta//devel -y
+$ flatpak run com.borgbase.Vorta//devel 
 ```
 
 To set which branch of Vorta (master from flathub or devel from local development setup) will be used in your OS you can use
diff --git a/flatpak/com.borgbase.vorta.yaml b/flatpak/com.borgbase.Vorta.yaml
similarity index 81%
rename from flatpak/com.borgbase.vorta.yaml
rename to flatpak/com.borgbase.Vorta.yaml
index c8138fcb..ad3362a0 100644
--- a/flatpak/com.borgbase.vorta.yaml
+++ b/flatpak/com.borgbase.Vorta.yaml
@@ -1,4 +1,4 @@
-app-id: com.borgbase.vorta
+app-id: com.borgbase.Vorta
 
 runtime: org.kde.Platform
 runtime-version: '5.12'
@@ -71,23 +71,23 @@ modules:
     build-commands:
       - pip3 install --prefix=/app --no-deps .
       - mkdir -p /app/share/metainfo/
-      - cp src/vorta/assets/metadata/com.borgbase.vorta.appdata.xml /app/share/metainfo/
+      - cp src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml /app/share/metainfo/
       - mkdir -p /app/share/icons/hicolor/512x512/apps/
-      - cp src/vorta/assets/icons/512x512/com.borgbase.vorta.png /app/share/icons/hicolor/512x512/apps/
+      - cp src/vorta/assets/icons/512x512/com.borgbase.Vorta.png /app/share/icons/hicolor/512x512/apps/
       - mkdir -p /app/share/icons/hicolor/256x256/apps/
-      - cp src/vorta/assets/icons/256x256/com.borgbase.vorta.png /app/share/icons/hicolor/256x256/apps/
+      - cp src/vorta/assets/icons/256x256/com.borgbase.Vorta.png /app/share/icons/hicolor/256x256/apps/
       - mkdir -p /app/share/icons/hicolor/128x128/apps/
-      - cp src/vorta/assets/icons/128x128/com.borgbase.vorta.png /app/share/icons/hicolor/128x128/apps/
+      - cp src/vorta/assets/icons/128x128/com.borgbase.Vorta.png /app/share/icons/hicolor/128x128/apps/
       - mkdir -p /app/share/icons/hicolor/64x64/apps/
-      - cp src/vorta/assets/icons/64x64/com.borgbase.vorta.png /app/share/icons/hicolor/64x64/apps/
+      - cp src/vorta/assets/icons/64x64/com.borgbase.Vorta.png /app/share/icons/hicolor/64x64/apps/
       - mkdir -p /app/share/icons/hicolor/48x48/apps/
-      - cp src/vorta/assets/icons/48x48/com.borgbase.vorta.png /app/share/icons/hicolor/48x48/apps/
+      - cp src/vorta/assets/icons/48x48/com.borgbase.Vorta.png /app/share/icons/hicolor/48x48/apps/
       - mkdir -p /app/share/icons/hicolor/32x32/apps/
-      - cp src/vorta/assets/icons/32x32/com.borgbase.vorta.png /app/share/icons/hicolor/32x32/apps/
+      - cp src/vorta/assets/icons/32x32/com.borgbase.Vorta.png /app/share/icons/hicolor/32x32/apps/
       - mkdir -p /app/share/icons/hicolor/24x24/apps/
-      - cp src/vorta/assets/icons/24x24/com.borgbase.vorta.png /app/share/icons/hicolor/24x24/apps/
+      - cp src/vorta/assets/icons/24x24/com.borgbase.Vorta.png /app/share/icons/hicolor/24x24/apps/
       - mkdir -p /app/share/applications/
-      - cp src/vorta/assets/metadata/com.borgbase.vorta.desktop /app/share/applications/
+      - cp src/vorta/assets/metadata/com.borgbase.Vorta.desktop /app/share/applications/
 
     sources:
       - type: dir
diff --git a/src/vorta/assets/icons/128x128/com.borgbase.vorta.png b/src/vorta/assets/icons/128x128/com.borgbase.Vorta.png
similarity index 100%
rename from src/vorta/assets/icons/128x128/com.borgbase.vorta.png
rename to src/vorta/assets/icons/128x128/com.borgbase.Vorta.png
diff --git a/src/vorta/assets/icons/24x24/com.borgbase.vorta.png b/src/vorta/assets/icons/24x24/com.borgbase.Vorta.png
similarity index 100%
rename from src/vorta/assets/icons/24x24/com.borgbase.vorta.png
rename to src/vorta/assets/icons/24x24/com.borgbase.Vorta.png
diff --git a/src/vorta/assets/icons/256x256/com.borgbase.vorta.png b/src/vorta/assets/icons/256x256/com.borgbase.Vorta.png
similarity index 100%
rename from src/vorta/assets/icons/256x256/com.borgbase.vorta.png
rename to src/vorta/assets/icons/256x256/com.borgbase.Vorta.png
diff --git a/src/vorta/assets/icons/32x32/com.borgbase.vorta.png b/src/vorta/assets/icons/32x32/com.borgbase.Vorta.png
similarity index 100%
rename from src/vorta/assets/icons/32x32/com.borgbase.vorta.png
rename to src/vorta/assets/icons/32x32/com.borgbase.Vorta.png
diff --git a/src/vorta/assets/icons/48x48/com.borgbase.vorta.png b/src/vorta/assets/icons/48x48/com.borgbase.Vorta.png
similarity index 100%
rename from src/vorta/assets/icons/48x48/com.borgbase.vorta.png
rename to src/vorta/assets/icons/48x48/com.borgbase.Vorta.png
diff --git a/src/vorta/assets/icons/512x512/com.borgbase.vorta.png b/src/vorta/assets/icons/512x512/com.borgbase.Vorta.png
similarity index 100%
rename from src/vorta/assets/icons/512x512/com.borgbase.vorta.png
rename to src/vorta/assets/icons/512x512/com.borgbase.Vorta.png
diff --git a/src/vorta/assets/icons/64x64/com.borgbase.vorta.png b/src/vorta/assets/icons/64x64/com.borgbase.Vorta.png
similarity index 100%
rename from src/vorta/assets/icons/64x64/com.borgbase.vorta.png
rename to src/vorta/assets/icons/64x64/com.borgbase.Vorta.png
diff --git a/src/vorta/assets/metadata/com.borgbase.vorta.appdata.xml b/src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml
similarity index 50%
rename from src/vorta/assets/metadata/com.borgbase.vorta.appdata.xml
rename to src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml
index 1a4122f7..b344bae2 100644
--- a/src/vorta/assets/metadata/com.borgbase.vorta.appdata.xml
+++ b/src/vorta/assets/metadata/com.borgbase.Vorta.appdata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-  <id>com.borgbase.vorta</id>
-  <launchable type="desktop-id">com.borgbase.vorta.desktop</launchable>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-3.0-or-later</project_license>
+  <id>com.borgbase.Vorta</id>
   <name>Vorta</name>
-  <developer_name>Borgbase</developer_name>
+  <project_license>GPL-3.0</project_license>
+  <metadata_license>CC0-1.0</metadata_license>
+  <content_rating type="oars-1.1" />
+  <summary>Backup client</summary>
   <description>
     <p>
       Vorta is a backup client for macOS and Linux desktops.
@@ -23,10 +23,6 @@
       </ul>
     </p>
   </description>
-  <provides>
-    <binary>com.borgbase.vorta</binary>
-  </provides>
-  <url type="source">https://github.com/borgbase/vorta</url>
   <screenshots>
     <screenshot type="default">
       <image  height="637" width="800">https://raw.githubusercontent.com/borgbase/vorta/master/src/vorta/assets/metadata/Screenshot-1-Repository.png</image>
@@ -41,26 +37,9 @@
       <image  height="637" width="800">https://raw.githubusercontent.com/borgbase/vorta/master/src/vorta/assets/metadata/Screenshot-4-Archives.png</image>
     </screenshot>
   </screenshots>
-  <content_rating type="oars-1.0">
-    <content_attribute id="violence-cartoon">none</content_attribute>
-    <content_attribute id="violence-fantasy">none</content_attribute>
-    <content_attribute id="violence-realistic">none</content_attribute>
-    <content_attribute id="violence-bloodshed">none</content_attribute>
-    <content_attribute id="violence-sexual">none</content_attribute>
-    <content_attribute id="drugs-alcohol">none</content_attribute>
-    <content_attribute id="drugs-narcotics">none</content_attribute>
-    <content_attribute id="drugs-tobacco">none</content_attribute>
-    <content_attribute id="sex-nudity">none</content_attribute>
-    <content_attribute id="sex-themes">none</content_attribute>
-    <content_attribute id="language-profanity">none</content_attribute>
-    <content_attribute id="language-humor">none</content_attribute>
-    <content_attribute id="language-discrimination">none</content_attribute>
-    <content_attribute id="social-chat">none</content_attribute>
-    <content_attribute id="social-info">none</content_attribute>
-    <content_attribute id="social-audio">none</content_attribute>
-    <content_attribute id="social-location">none</content_attribute>
-    <content_attribute id="social-contacts">none</content_attribute>
-    <content_attribute id="money-purchasing">none</content_attribute>
-    <content_attribute id="money-gambling">none</content_attribute>
-  </content_rating>
+  <releases>
+    <release version="v0.6.20" date="2019-05-16">
+    </release>
+  </releases>
+  <url type="homepage">https://github.com/borgbase/vorta</url>
 </component>
diff --git a/src/vorta/assets/metadata/com.borgbase.vorta.desktop b/src/vorta/assets/metadata/com.borgbase.Vorta.desktop
similarity index 80%
rename from src/vorta/assets/metadata/com.borgbase.vorta.desktop
rename to src/vorta/assets/metadata/com.borgbase.Vorta.desktop
index ecee9c30..74378345 100644
--- a/src/vorta/assets/metadata/com.borgbase.vorta.desktop
+++ b/src/vorta/assets/metadata/com.borgbase.Vorta.desktop
@@ -3,5 +3,5 @@ Name=Vorta
 GenericName=Backup Software
 Exec=vorta
 Type=Application
-Icon=com.borgbase.vorta
+Icon=com.borgbase.Vorta
 Categories=Utility