Port the patches into the overlay

1 files changed, 0 insertions, 49 deletions

diff --git a/debian/patches/fix-installed-paths.patch b/debian/patches/fix-installed-paths.patch
deleted file mode 100644
index 0fb0757..0000000
--- a/debian/patches/fix-installed-paths.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Andrej Shadura <andrewsh@debian.org>
-Subject: point gtimelog into the right places
-
---- a/src/gtimelog/main.py
-+++ b/src/gtimelog/main.py
-@@ -50,22 +50,6 @@
- 
- HERE = os.path.dirname(__file__)
- 
--SCHEMA_DIR = os.path.join(HERE, 'data')
--if SCHEMA_DIR and not os.environ.get('GSETTINGS_SCHEMA_DIR'):
--    # Have to do this before importing 'gi'.
--    os.environ['GSETTINGS_SCHEMA_DIR'] = SCHEMA_DIR
--    if not os.path.exists(os.path.join(SCHEMA_DIR, 'gschemas.compiled')):
--        # This, too, I have to do before importing 'gi'.
--        print("Compiling GSettings schema")
--        glib_compile_schemas = os.path.join(sys.prefix, 'lib', 'site-packages', 'gnome', 'glib-compile-schemas.exe')
--        if not os.path.exists(glib_compile_schemas):
--            glib_compile_schemas = 'glib-compile-schemas'
--        try:
--            subprocess.call([glib_compile_schemas, SCHEMA_DIR])
--        except OSError as e:
--            print("Failed: %s" % e)
--
--
- import gi
- gi.require_version('Gtk', '3.0')
- gi.require_version('Soup', '2.4')
-@@ -95,7 +79,7 @@
- 
- mark_time("gtimelog imports done")
- 
--UI_DIR = HERE
-+UI_DIR = '/usr/share/gtimelog'
- 
- if (Gtk.MAJOR_VERSION, Gtk.MINOR_VERSION) < (3, 12):
-     UI_FILE = os.path.join(UI_DIR, 'gtimelog-gtk3.10.ui')
-@@ -108,9 +92,9 @@
- SHORTCUTS_UI_FILE = os.path.join(UI_DIR, 'shortcuts.ui')
- MENUS_UI_FILE = os.path.join(UI_DIR, 'menus.ui')
- CSS_FILE = os.path.join(UI_DIR, 'gtimelog.css')
--LOCALE_DIR = os.path.join(UI_DIR, 'locale')
-+LOCALE_DIR = '/usr/share/locale'
- 
--CONTRIBUTORS_FILE = os.path.join(UI_DIR, 'CONTRIBUTORS.rst')
-+CONTRIBUTORS_FILE = os.path.join('/usr/share/doc/gtimelog', 'CONTRIBUTORS.rst')
- 
- 
- log = logging.getLogger('gtimelog')