From 76e12cae2d91e3e9491487ff343be462ae3d63ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Mon, 14 Mar 2016 16:06:52 +0100
Subject: [PATCH] Rename qubes.xdg python module to qubesxdg

Do not interfere with 'qubes' module.

QubesOS/qubes-issues#1813
---
 Makefile                     | 4 ++--
 misc/Makefile                | 2 +-
 misc/qubes-desktop-run       | 2 +-
 misc/qubes-session-autostart | 4 ++--
 misc/{xdg.py => qubesxdg.py} | 0
 rpm_spec/core-vm.spec        | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename misc/{xdg.py => qubesxdg.py} (100%)

diff --git a/Makefile b/Makefile
index 85afde2..a72df19 100644
--- a/Makefile
+++ b/Makefile
@@ -249,9 +249,9 @@ install-common:
 	mkdir -p $(DESTDIR)/$(PYTHON_SITEARCH)/qubes/
 
 ifeq ($(shell lsb_release -is), Debian)
-	install -m 0644 misc/xdg.py $(DESTDIR)/$(PYTHON_SITEARCH)/qubes/
+	install -m 0644 misc/qubesxdg.py $(DESTDIR)/$(PYTHON2_SITELIB)/
 else
-	install -m 0644 misc/py2/xdg.py* $(DESTDIR)/$(PYTHON_SITEARCH)/qubes/
+	install -m 0644 misc/py2/qubesxdg.py* $(DESTDIR)/$(PYTHON2_SITELIB)/
 endif
 
 	install -d $(DESTDIR)/mnt/removable
diff --git a/misc/Makefile b/misc/Makefile
index 932f636..01533c3 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -23,7 +23,7 @@ python2:
 python3:
 	rm -rf py3
 	mkdir -p py3
-	cp dnf-qubes-hooks.py xdg.py py3/
+	cp dnf-qubes-hooks.py qubesxdg.py py3/
 	python3 -m compileall py3
 	python3 -O -m compileall py3
 
diff --git a/misc/qubes-desktop-run b/misc/qubes-desktop-run
index eb79c93..e1116fb 100755
--- a/misc/qubes-desktop-run
+++ b/misc/qubes-desktop-run
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-from qubes.xdg import launch
+from qubesxdg import launch
 import sys
 
 if __name__ == '__main__':
diff --git a/misc/qubes-session-autostart b/misc/qubes-session-autostart
index fcf3439..e7bfe11 100644
--- a/misc/qubes-session-autostart
+++ b/misc/qubes-session-autostart
@@ -25,7 +25,7 @@ import subprocess
 import sys
 
 from xdg.DesktopEntry import DesktopEntry
-from qubes.xdg import launch
+from qubesxdg import launch
 import xdg.BaseDirectory
 import os
 
@@ -86,4 +86,4 @@ def main():
     process_autostart(sys.argv[1:])
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()
diff --git a/misc/xdg.py b/misc/qubesxdg.py
similarity index 100%
rename from misc/xdg.py
rename to misc/qubesxdg.py
diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index 88929c0..75377ae 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -424,7 +424,7 @@ rm -f %{name}-%{version}
 /usr/lib/qubes/upgrades-status-notify
 /usr/lib/yum-plugins/yum-qubes-hooks.py*
 /usr/lib/dracut/dracut.conf.d/30-qubes.conf
-/usr/lib64/python2.7/site-packages/qubes/xdg.py*
+/usr/lib/python2.7/site-packages/qubesxdg.py*
 /usr/sbin/qubes-firewall
 /usr/sbin/qubes-netwatcher
 /usr/share/qubes/serial.conf