Use non-master branch in desktop-linux-*

Content of those components depends on dom0 distribution version. Switch to non-master for stable releases to allow upgrading dom0 in next Qubes release. QubesOS/qubes-issues#1807
marmarek · Apr 25, 2016 · 46b9d92 · 46b9d92
1 parent 2aa3882
commit 46b9d92
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/example-configs/qubes-os-r2.conf b/example-configs/qubes-os-r2.conf
@@ -56,8 +56,8 @@ BRANCH_builder = master
 BRANCH_builder_fedora = master
 BRANCH_builder_debian = master
 BRANCH_builder_archlinux = master
-BRANCH_desktop_linux_kde = master
-BRANCH_desktop_linux_xfce4 = master
+BRANCH_desktop_linux_kde = kde-4.11
+BRANCH_desktop_linux_xfce4 = xfce-4.10
 BRANCH_vmm_xen = xen-4.1
 BRANCH_linux_kernel = stable-3.12
 GIT_URL_linux_kernel_3_9 = $(GIT_BASEURL)/$(GIT_PREFIX)linux-kernel.git

diff --git a/example-configs/qubes-os-r3.0.conf b/example-configs/qubes-os-r3.0.conf
@@ -56,8 +56,8 @@ BRANCH_builder = master
 BRANCH_builder_fedora = master
 BRANCH_builder_debian = master
 BRANCH_builder_archlinux = master
-BRANCH_desktop_linux_kde = master
-BRANCH_desktop_linux_xfce4 = master
+BRANCH_desktop_linux_kde = kde-4.11
+BRANCH_desktop_linux_xfce4 = xfce-4.10
 BRANCH_vmm_xen = xen-4.4
 BRANCH_linux_kernel = stable-3.18
 

diff --git a/example-configs/qubes-os-r3.1.conf b/example-configs/qubes-os-r3.1.conf
@@ -79,8 +79,8 @@ BRANCH_builder_fedora = master
 BRANCH_builder_debian = master
 BRANCH_builder_archlinux = master
 BRANCH_builder_github = master
-BRANCH_desktop_linux_kde = master
-BRANCH_desktop_linux_xfce4 = master
+BRANCH_desktop_linux_kde = kde-4.11
+BRANCH_desktop_linux_xfce4 = xfce-4.10
 BRANCH_linux_pvgrub2 = master
 BRANCH_vmm_xen = xen-4.6
 BRANCH_linux_kernel = stable-4.1