[graphics/krita/krita/4.4.3] /: Update all versions to 4.4.3-beta1
Halla Rempt
null at kde.org
Tue Feb 23 09:05:10 GMT 2021
Git commit 1b82b6fb980923096c8f29dc81dab8366e68e5b0 by Halla Rempt.
Committed on 23/02/2021 at 09:04.
Pushed by rempt into branch 'krita/4.4.3'.
Update all versions to 4.4.3-beta1
Don't we have a few too many places where define the version now? Should
we make everything that needs 4.4.3-beta1 into cmake.in files?
CCMAIL:kimageshop at kde.org
M +3 -3 CMakeLists.txt
M +1 -1 krita/krita4.xmlgui
M +1 -1 krita/org.kde.krita.appdata.xml
M +1 -1 packaging/android/apk/AndroidManifest.xml
M +2 -2 packaging/android/apk/build.gradle
M +3 -3 packaging/config.ini
M +1 -1 packaging/download_release_artifacts.sh
M +1 -1 packaging/linux/snap/snapcraft.yaml
https://invent.kde.org/graphics/krita/commit/1b82b6fb980923096c8f29dc81dab8366e68e5b0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2dfb2e70f4..5074e047cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ endif()
# define common versions of Krita applications, used to generate kritaversion.h
# update these version for every release:
-set(KRITA_VERSION_STRING "4.4.3-alpha")
+set(KRITA_VERSION_STRING "4.4.3-beta1")
# Major version: 3 for 3.x, 4 for 4.x, etc.
set(KRITA_STABLE_VERSION_MAJOR 4)
# Minor version: 0 for 4.0, 1 for 4.1, etc.
@@ -87,8 +87,8 @@ set(KRITA_VERSION_RELEASE 3)
# - Beta: Starts from 50, increment 1 per release
# - Stable: Set to 100, bump to 101 if emergency update is needed
set(KRITA_VERSION_REVISION 0)
-set(KRITA_ALPHA 1) # uncomment only for Alpha
-#set(KRITA_BETA 1) # uncomment only for Beta
+#set(KRITA_ALPHA 1) # uncomment only for Alpha
+set(KRITA_BETA 1) # uncomment only for Beta
#set(KRITA_RC 1) # uncomment only for RC
if(NOT ANDROID AND NOT DEFINED KRITA_ALPHA AND NOT DEFINED KRITA_BETA AND NOT DEFINED KRITA_RC)
diff --git a/krita/krita4.xmlgui b/krita/krita4.xmlgui
index 506553833f..a44442454f 100644
--- a/krita/krita4.xmlgui
+++ b/krita/krita4.xmlgui
@@ -2,7 +2,7 @@
<kpartgui xmlns="http://www.kde.org/standards/kxmlgui/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
name="Krita"
-version="452"
+version="453"
xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0 http://www.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd">
<MenuBar>
<Menu name="file">
diff --git a/krita/org.kde.krita.appdata.xml b/krita/org.kde.krita.appdata.xml
index 6ec1425ac3..e909615fc5 100644
--- a/krita/org.kde.krita.appdata.xml
+++ b/krita/org.kde.krita.appdata.xml
@@ -397,7 +397,7 @@
</provides>
<content_rating type="oars-1.1"/>
<releases>
- <release date="2020-09-21" version="4.4.3-alpha"/>
+ <release date="2021-02-23" version="4.4.3-beta1"/>
</releases>
<custom>
<value key="KDE::windows_store">https://www.microsoft.com/store/apps/9n6x57zgrw96</value>
diff --git a/packaging/android/apk/AndroidManifest.xml b/packaging/android/apk/AndroidManifest.xml
index 0522efb5d5..2b971d1ae3 100644
--- a/packaging/android/apk/AndroidManifest.xml
+++ b/packaging/android/apk/AndroidManifest.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<manifest package="org.krita" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.4.3-beta" android:installLocation="auto">
+<manifest package="org.krita" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.4.3-beta1" android:installLocation="auto">
<application android:hardwareAccelerated="true"
android:name="org.qtproject.qt5.android.bindings.QtApplication"
android:label="Krita"
diff --git a/packaging/android/apk/build.gradle b/packaging/android/apk/build.gradle
index 5bb9cd8b4f..8639180ba4 100644
--- a/packaging/android/apk/build.gradle
+++ b/packaging/android/apk/build.gradle
@@ -47,7 +47,7 @@ task configure() {
def libs = new File(installPrefix, 'lib')
if (!libs.exists()) {
- throw new GradleException('Krita libraires not found, please check if -p=krita-bin finished without errors')
+ throw new GradleException('Krita libraries not found, please check if -p=krita-bin finished without errors')
}
}
}
@@ -131,7 +131,7 @@ android {
* (including alpha and beta) release of versionMajor.versionMinor
* branch
*/
- def versionRelease = 0
+ def versionRelease = 5
defaultConfig {
targetSdkVersion 29
diff --git a/packaging/config.ini b/packaging/config.ini
index 7b3b11d251..e282ae337e 100644
--- a/packaging/config.ini
+++ b/packaging/config.ini
@@ -1,10 +1,10 @@
[krita]
gitModule = yes
-gitTag = v4.4.1-alpha
+gitTag = v4.4.3-beta1
category = graphics
-mainmodule = branches/stable
+mainmodule = branches/unstable
l10nmodule = krita
-version = 4.4.1-alpha
+version = 4.4.3-beta1
translations= yes
docs = no
kde_release = no
diff --git a/packaging/download_release_artifacts.sh b/packaging/download_release_artifacts.sh
index 2b32bbd29c..33a436f8db 100755
--- a/packaging/download_release_artifacts.sh
+++ b/packaging/download_release_artifacts.sh
@@ -3,7 +3,7 @@
# exit when any command fails
set -e
-KRITA_VERSION=4.4.1-alpha
+KRITA_VERSION=4.4.3-beta1
WIN64_ARTIFACTS_URL=https://binary-factory.kde.org/job/Krita_Release_Windows64_Build/lastSuccessfulBuild/artifact
WIN32_ARTIFACTS_URL=https://binary-factory.kde.org/job/Krita_Release_Windows32_Build/lastSuccessfulBuild/artifact
diff --git a/packaging/linux/snap/snapcraft.yaml b/packaging/linux/snap/snapcraft.yaml
index e6d2a46d45..c83870d93f 100644
--- a/packaging/linux/snap/snapcraft.yaml
+++ b/packaging/linux/snap/snapcraft.yaml
@@ -45,7 +45,7 @@ parts:
krita:
after:
- libheif
- source: https://download.kde.org/stable/krita/4.3.0/krita-4.3.0.tar.xz
+ source: https://download.kde.org/unstable/krita/4.4.3-beta1/krita-4.4.3-beta1.tar.xz
# # Use these instead to build from the git source
# source: https://anongit.kde.org/krita.git
# source-type: git
More information about the kimageshop
mailing list