summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/APT_snapshots.d/debian/serial2
-rw-r--r--config/APT_snapshots.d/torproject/serial2
-rw-r--r--config/base_branch2
-rw-r--r--config/chroot_local-includes/usr/share/live/config/xserver-xorg/qxl.conf6
-rw-r--r--config/chroot_local-includes/usr/share/live/config/xserver-xorg/qxl.ids1
5 files changed, 10 insertions, 3 deletions
diff --git a/config/APT_snapshots.d/debian/serial b/config/APT_snapshots.d/debian/serial
index ca028d3..a0f9a4b 100644
--- a/config/APT_snapshots.d/debian/serial
+++ b/config/APT_snapshots.d/debian/serial
@@ -1 +1 @@
-2016052503
+latest
diff --git a/config/APT_snapshots.d/torproject/serial b/config/APT_snapshots.d/torproject/serial
index ca028d3..a0f9a4b 100644
--- a/config/APT_snapshots.d/torproject/serial
+++ b/config/APT_snapshots.d/torproject/serial
@@ -1 +1 @@
-2016052503
+latest
diff --git a/config/base_branch b/config/base_branch
index 038d718..d64531f 100644
--- a/config/base_branch
+++ b/config/base_branch
@@ -1 +1 @@
-testing
+devel
diff --git a/config/chroot_local-includes/usr/share/live/config/xserver-xorg/qxl.conf b/config/chroot_local-includes/usr/share/live/config/xserver-xorg/qxl.conf
new file mode 100644
index 0000000..d5faece
--- /dev/null
+++ b/config/chroot_local-includes/usr/share/live/config/xserver-xorg/qxl.conf
@@ -0,0 +1,6 @@
+# Workaround for #11500
+Section "Device"
+ Identifier "qxl"
+ Driver "qxl"
+ Option "ENABLE_SURFACES" "False"
+EndSection
diff --git a/config/chroot_local-includes/usr/share/live/config/xserver-xorg/qxl.ids b/config/chroot_local-includes/usr/share/live/config/xserver-xorg/qxl.ids
new file mode 100644
index 0000000..3f0c38e
--- /dev/null
+++ b/config/chroot_local-includes/usr/share/live/config/xserver-xorg/qxl.ids
@@ -0,0 +1 @@
+1B360100