summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2016-04-08 09:09:24 +0200
committerAlexander Larsson <alexl@redhat.com>2016-04-08 09:09:24 +0200
commit991d567ef4f0f539c7ef6641dc582a546a7c44c7 (patch)
treeefe8d7230ddcba87cbfd128330e5416df4250a13
parentabb8bfe4e33990fd3537fee56db0ac4c25995e4d (diff)
Bump version to 1.5 (unstable) on master branch
1.4 continues on 1.4 branch
-rw-r--r--Makefile2
-rw-r--r--meta-freedesktop/conf/distro/freedesktop.conf4
-rw-r--r--metadata.platform4
-rw-r--r--metadata.sdk4
4 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index f05c1d2..37a76f7 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ builddir = $(CURDIR)
NULL=
ARCH=x86_64
-VERSION=1.4
+VERSION=1.5
HASH:=$(shell git rev-parse HEAD)
IMAGEDIR=images/${ARCH}
SDK_IMAGE=${IMAGEDIR}/freedesktop-contents-sdk-${ARCH}-${HASH}.tar.gz
diff --git a/meta-freedesktop/conf/distro/freedesktop.conf b/meta-freedesktop/conf/distro/freedesktop.conf
index fc790b8..2757458 100644
--- a/meta-freedesktop/conf/distro/freedesktop.conf
+++ b/meta-freedesktop/conf/distro/freedesktop.conf
@@ -1,8 +1,8 @@
DISTRO = "freedesktop"
DISTRO_NAME = "Freedesktop base image"
-DISTRO_VERSION = "1.4"
+DISTRO_VERSION = "1.5"
SDK_VENDOR = "-freedesktop"
-SDK_VERSION := "1.4"
+SDK_VERSION := "1.5"
MAINTAINER = "Alexander Larsson <alexl@redhat.com>"
diff --git a/metadata.platform b/metadata.platform
index f0eb00e..c2ca72e 100644
--- a/metadata.platform
+++ b/metadata.platform
@@ -1,4 +1,4 @@
[Runtime]
name=org.freedesktop.BasePlatform
-runtime=org.freedesktop.BasePlatform/x86_64/1.4
-sdk=org.freedesktop.BaseSdk/x86_64/1.4
+runtime=org.freedesktop.BasePlatform/x86_64/1.5
+sdk=org.freedesktop.BaseSdk/x86_64/1.5
diff --git a/metadata.sdk b/metadata.sdk
index 1e7b930..a0b520e 100644
--- a/metadata.sdk
+++ b/metadata.sdk
@@ -1,4 +1,4 @@
[Runtime]
name=org.freedesktop.BaseSdk
-runtime=org.freedesktop.BasePlatform/x86_64/1.4
-sdk=org.freedesktop.BaseSdk/x86_64/1.4
+runtime=org.freedesktop.BasePlatform/x86_64/1.5
+sdk=org.freedesktop.BaseSdk/x86_64/1.5