Description: force the import path
 Revolt by default tries to guess the import path for the python files.
 However, it guesses the wrong path on a usr-merged system.  This forces
 the import path to include the path that the package uses.
Author: Hubert Chathi <uhoreg@debian.org>
Bug-Debian: https://bugs.debian.org/945163
Forwarded: not-needed
Last-Update: 2019-12-24

--- revolt-0.0+git20180813.6b10d57.orig/bin/revolt
+++ revolt-0.0+git20180813.6b10d57/bin/revolt
@@ -7,15 +7,8 @@
 # Distributed under terms of the GPLv3 license.
 
 def adjust_import_path():
-    from os import environ, path as P
     import sys
-    devel = environ.get("__REVOLT_DEVELOPMENT")
-    if devel and devel.strip():
-        # Prepend source directory path.
-        sys.path.insert(0, P.dirname(P.dirname(__file__)))
-    else:
-        sys.path.insert(0, P.join(P.dirname(P.dirname(__file__)),
-                                  "share", "revolt", "py"))
+    sys.path.insert(0, "/usr/share/revolt/py")
 
 
 if __name__ == "__main__":
--- revolt-0.0+git20180813.6b10d57.orig/revolt/app.py
+++ revolt-0.0+git20180813.6b10d57/revolt/app.py
@@ -23,17 +23,7 @@ APP_AUTHORS = (u"Adrián Pérez de Castro <aperez@igalia.com>",
 
 
 def _find_resources_path(program_path):
-    from os import path as P
-    devel = environ.get("__REVOLT_DEVELOPMENT")
-    if devel and devel.strip():
-        # Use the directory where the executable is located, most likely
-        # a checkout of the Git repository.
-        path = P.dirname(P.dirname(program_path))
-    else:
-        # Use an installed location: binary is in <prefix>/bin/revolt,
-        # and resources in <prefix>/share/revolt/*
-        path = P.join(P.dirname(P.dirname(program_path)), "share", "revolt")
-    return P.abspath(P.join(path, DEFAULT_APP_ID + ".gresource"))
+    return "/usr/share/revolt/" + DEFAULT_APP_ID + ".gresource"
 
 
 class RevoltApp(Gtk.Application):
