From b0369406d1c676384a4b7b4ceb32fed6dc547c5c Mon Sep 17 00:00:00 2001 From: gm10 <13855078+gm10@users.noreply.github.com> Date: Wed, 16 Jan 2019 11:04:04 +0100 Subject: [PATCH 1/2] mintcommon-v2 compatibility --- debian/control | 3 ++- usr/lib/linuxmint/mintSources/foreign_packages.py | 4 ++-- usr/lib/linuxmint/mintSources/mintSources.py | 4 ++-- usr/lib/linuxmint/mintSources/ppa_browser.py | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index 211663ad..81fdf8ad 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,8 @@ Depends: python3-apt, gir1.2-xapp-1.0, dash, iso-flag-png, - lsb-release + lsb-release, + mint-common (>= 2) Replaces: software-properties-common (<< 1), software-properties-gtk (<< 1), python-software-properties (<< 1), diff --git a/usr/lib/linuxmint/mintSources/foreign_packages.py b/usr/lib/linuxmint/mintSources/foreign_packages.py index 68c47177..b8fd6eed 100755 --- a/usr/lib/linuxmint/mintSources/foreign_packages.py +++ b/usr/lib/linuxmint/mintSources/foreign_packages.py @@ -5,7 +5,7 @@ import gettext import tempfile import subprocess -import mintcommon +import mintcommon.aptdaemon import gi import locale @@ -85,7 +85,7 @@ def __init__(self): treeview.append_column(col) col.set_sort_column_id(PKG_REPO_VERSION) - self.apt = mintcommon.APT(self.window) + self.apt = mintcommon.aptdaemon.APT(self.window) cache = apt.Cache() for key in cache.keys(): diff --git a/usr/lib/linuxmint/mintSources/mintSources.py b/usr/lib/linuxmint/mintSources/mintSources.py index cdad652e..d774a3a8 100755 --- a/usr/lib/linuxmint/mintSources/mintSources.py +++ b/usr/lib/linuxmint/mintSources/mintSources.py @@ -19,7 +19,7 @@ import requests from optparse import OptionParser import locale -import mintcommon +import mintcommon.aptdaemon import glob import gi gi.require_version('Gtk', '3.0') @@ -769,7 +769,7 @@ def __init__(self): self._official_repositories_page = self.builder.get_object("official_repositories_page") - self.apt = mintcommon.APT(self._main_window) + self.apt = mintcommon.aptdaemon.APT(self._main_window) config_parser = configparser.RawConfigParser() config_parser.read("/usr/share/mintsources/%s/mintsources.conf" % self.lsb_codename) diff --git a/usr/lib/linuxmint/mintSources/ppa_browser.py b/usr/lib/linuxmint/mintSources/ppa_browser.py index ba811b67..edaec2ef 100755 --- a/usr/lib/linuxmint/mintSources/ppa_browser.py +++ b/usr/lib/linuxmint/mintSources/ppa_browser.py @@ -5,7 +5,7 @@ import gettext import tempfile import subprocess -import mintcommon +import mintcommon.aptdaemon import platform import locale import gi @@ -73,7 +73,7 @@ def __init__(self, base_codename, ppa_owner, ppa_name): col.set_sort_column_id(2) cache = apt.Cache() - self.apt = mintcommon.APT(self.window) + self.apt = mintcommon.aptdaemon.APT(self.window) packages = subprocess.getoutput("grep 'Package:' %s | sort | awk {'print $2;'}" % ppa_file).split("\n") for package in packages: From 090ee87bc70f70c29c73f03bdbc219eb0c3079a8 Mon Sep 17 00:00:00 2001 From: gm10 <13855078+gm10@users.noreply.github.com> Date: Wed, 23 Jan 2019 19:10:09 +0100 Subject: [PATCH 2/2] seeing double --- debian/control | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 81fdf8ad..0083850b 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Essential: yes Depends: python3-apt, python3-gi, python3-pycurl, - mint-common (>= 1.3.0), + mint-common (>= 2), gir1.2-gdkpixbuf-2.0, gir1.2-glib-2.0, gir1.2-gtk-3.0, @@ -20,8 +20,7 @@ Depends: python3-apt, gir1.2-xapp-1.0, dash, iso-flag-png, - lsb-release, - mint-common (>= 2) + lsb-release Replaces: software-properties-common (<< 1), software-properties-gtk (<< 1), python-software-properties (<< 1),