From abf9a5aa43a9fbbaa05a03c77e27b85a6104ae59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sat, 20 May 2017 13:38:58 +0200
Subject: [PATCH] Apply gschema overrides also to debian, rename according to
 guidelines

glib-compile-schemas recommend naming override files with nn_ prefix,
where nn is a number. Lets use 20, to allow both higher and lower
priority files.

QubesOS/qubes-issues#1108
---
 Makefile                                               | 10 ++++++----
 ...de => 20_org.gnome.nautilus.qubes.gschema.override} |  0
 ...ings-daemon.plugins.updates.qubes.gschema.override} |  0
 ...org.mate.NotificationDaemon.qubes.gschema.override} |  0
 rpm_spec/core-vm.spec                                  |  6 +++---
 5 files changed, 9 insertions(+), 7 deletions(-)
 rename misc/{org.gnome.nautilus.gschema.override => 20_org.gnome.nautilus.qubes.gschema.override} (100%)
 rename misc/{org.gnome.settings-daemon.plugins.updates.gschema.override => 20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override} (100%)
 rename misc/{org.mate.NotificationDaemon.gschema.override => 20_org.mate.NotificationDaemon.qubes.gschema.override} (100%)

diff --git a/Makefile b/Makefile
index a82b74a..ed21ae4 100644
--- a/Makefile
+++ b/Makefile
@@ -113,10 +113,6 @@ install-sysvinit:
 
 install-rh: install-systemd install-systemd-dropins install-sysvinit
 	install -D -m 0644 misc/qubes-r3.repo $(DESTDIR)/etc/yum.repos.d/qubes-r3.repo
-	install -d $(DESTDIR)/usr/share/glib-2.0/schemas/
-	install -m 0644 misc/org.gnome.settings-daemon.plugins.updates.gschema.override $(DESTDIR)/usr/share/glib-2.0/schemas/
-	install -m 0644 misc/org.gnome.nautilus.gschema.override $(DESTDIR)/usr/share/glib-2.0/schemas/
-	install -m 0644 misc/org.mate.NotificationDaemon.gschema.override $(DESTDIR)/usr/share/glib-2.0/schemas/
 	install -d $(DESTDIR)$(LIBDIR)/yum-plugins/
 	install -m 0644 misc/yum-qubes-hooks.py* $(DESTDIR)$(LIBDIR)/yum-plugins/
 	install -D -m 0644 misc/yum-qubes-hooks.conf $(DESTDIR)/etc/yum/pluginconf.d/yum-qubes-hooks.conf
@@ -166,6 +162,12 @@ install-common:
 	install -D -m 0644 misc/polkit-1-qubes-allow-all.rules $(DESTDIR)/etc/polkit-1/rules.d/00-qubes-allow-all.rules
 	install -D -m 0644 misc/mime-globs $(DESTDIR)/usr/share/qubes/mime-override/globs
 	install misc/qubes-download-dom0-updates.sh $(DESTDIR)$(LIBDIR)/qubes/
+	install -d $(DESTDIR)/usr/share/glib-2.0/schemas/
+	install -m 0644 \
+		misc/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override \
+		misc/20_org.gnome.nautilus.qubes.gschema.override \
+		misc/20_org.mate.NotificationDaemon.qubes.gschema.override \
+		$(DESTDIR)/usr/share/glib-2.0/schemas/
 	install -g user -m 2775 -d $(DESTDIR)/var/lib/qubes/dom0-updates
 	install -D -m 0644 misc/qubes-master-key.asc $(DESTDIR)/usr/share/qubes/qubes-master-key.asc
 
diff --git a/misc/org.gnome.nautilus.gschema.override b/misc/20_org.gnome.nautilus.qubes.gschema.override
similarity index 100%
rename from misc/org.gnome.nautilus.gschema.override
rename to misc/20_org.gnome.nautilus.qubes.gschema.override
diff --git a/misc/org.gnome.settings-daemon.plugins.updates.gschema.override b/misc/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override
similarity index 100%
rename from misc/org.gnome.settings-daemon.plugins.updates.gschema.override
rename to misc/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override
diff --git a/misc/org.mate.NotificationDaemon.gschema.override b/misc/20_org.mate.NotificationDaemon.qubes.gschema.override
similarity index 100%
rename from misc/org.mate.NotificationDaemon.gschema.override
rename to misc/20_org.mate.NotificationDaemon.qubes.gschema.override
diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index f0af167..45aff06 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -434,9 +434,9 @@ rm -f %{name}-%{version}
 /usr/lib/python2.7/site-packages/qubesxdg.py*
 /usr/sbin/qubes-firewall
 /usr/share/qubes/serial.conf
-/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override
-/usr/share/glib-2.0/schemas/org.gnome.nautilus.gschema.override
-/usr/share/glib-2.0/schemas/org.mate.NotificationDaemon.gschema.override
+/usr/share/glib-2.0/schemas/20_org.gnome.settings-daemon.plugins.updates.qubes.gschema.override
+/usr/share/glib-2.0/schemas/20_org.gnome.nautilus.qubes.gschema.override
+/usr/share/glib-2.0/schemas/20_org.mate.NotificationDaemon.qubes.gschema.override
 /usr/share/nautilus-python/extensions/qvm_copy_nautilus.py*
 /usr/share/nautilus-python/extensions/qvm_move_nautilus.py*
 /usr/share/nautilus-python/extensions/qvm_dvm_nautilus.py*