diff --git a/README.md b/README.md index 569d706d887..ba1a4066d8a 100644 --- a/README.md +++ b/README.md @@ -24,11 +24,9 @@ Read the [Wiki](https://github.com/brombinmirko/Bottles/wikis). In any case, ask for support [here](https://github.com/brombinmirko/Bottles/issues). ## Requirements -- wine (with wine64) +- wine-stable - xterm - python3 -- libgtk-3-dev -- libgranite-dev ## How to run ```bash @@ -44,10 +42,6 @@ com.github.mirkobrombin.bottles ## Installation -### From AppCenter -[![Get it on AppCenter](https://appcenter.elementary.io/badge.svg)](https://appcenter.elementary.io/com.github.mirkobrombin.bottles) - - ### From .deb package Grab an updated release [here](https://github.com/brombinmirko/Bottles/releases), then install: diff --git a/bottles/detail.py b/bottles/detail.py index aa7aa721f08..0dd53ea23f4 100644 --- a/bottles/detail.py +++ b/bottles/detail.py @@ -149,7 +149,7 @@ def __init__(self, parent): self.grid_5.add(self.button_regedit) # Uninstaller - self.button_uninstaller = Gtk.Button.new_from_icon_name("bottles_wine-uninstaller", Gtk.IconSize.DIALOG) + self.button_uninstaller = Gtk.Button.new_from_icon_name("edittrash", Gtk.IconSize.DIALOG) self.button_uninstaller.connect("clicked", self.on_button_uninstaller_clicked) self.grid_5.add(self.button_uninstaller) diff --git a/bottles/main.py b/bottles/main.py index a85c70f7a7a..164678eaae8 100755 --- a/bottles/main.py +++ b/bottles/main.py @@ -52,7 +52,7 @@ HLog.bold(_('Wine Version: %s' % w.Wine.get_wine_version())) HLog.bold(_('Wiki: %s' % cn.App.help_url)) -class Application(Granite.Application): +class Application(Gtk.Application): def do_activate(self): @@ -111,4 +111,4 @@ def do_activate(self): app.help_url = cn.App.help_url app.translate_url = cn.App.translate_url -app.run("", Gio.ApplicationFlags.FLAGS_NONE) +app.run("") diff --git a/bottles/wine.py b/bottles/wine.py index d7057bc9dd2..4e191edb74d 100644 --- a/bottles/wine.py +++ b/bottles/wine.py @@ -256,7 +256,7 @@ def run_software(self, working_dir, file_src): def check_special_chars(self, string): if not re.match(r'^\w+$', string): HLog.error('[BOTTLE_NAME_ERROR] '+_('Bottle name can not contain special characters')) - message_dialog = Granite.MessageDialog.new_with_image_from_icon_name( + message_dialog = Gtk.MessageDialog.new_with_image_from_icon_name( "BOTTLE_NAME_ERROR", _('Bottle name can not contain special characters'), "dialog-warning", diff --git a/debian/changelog b/debian/changelog index 0df18e642d1..7f4ee8f5f0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -com.github.mirkobrombin.bottles (0.1.9) precise; urgency=low +com.github.mirkobrombin.bottles (0.2.0) precise; urgency=low - * Fix icon issue on software upgrade + * Fix for elementary juno - -- Mirko Brombin Sun, 29 Apr 2018 08:23:00 +0200 + -- Mirko Brombin Sun, 15 Sep 2019 16:07:00 +0200 diff --git a/debian/control b/debian/control index 56e37a1b77c..64fc40ec72f 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +1,13 @@ Source: com.github.mirkobrombin.bottles Section: utils Priority: optional -Maintainer: Mirko Brombin -Build-Depends: debhelper (>= 10), - libgtk-3-dev, - libgranite-dev, - dh-python, - python3-all, - python3-setuptools +Maintainer: Mirko Brombin +Build-Depends: debhelper (>= 10.5.1), + python3 Standards-Version: 3.9.3 Package: com.github.mirkobrombin.bottles Architecture: any -Depends: python3, wine, libgranite-dev, ${misc:Depends} +Depends: python3, wine-stable, ${misc:Depends} Description: Bottles Easily manage your Wine bottles diff --git a/debian/files b/debian/files new file mode 100644 index 00000000000..293be77a4b3 --- /dev/null +++ b/debian/files @@ -0,0 +1,2 @@ +com.github.mirkobrombin.bottles_0.2.0_amd64.buildinfo utils optional +com.github.mirkobrombin.bottles_0.2.0_amd64.deb utils optional diff --git a/setup.py b/setup.py index e6e44d35787..b5996a6a30c 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ (inst_path+'/locale/de_DE/LC_MESSAGES',['bottles/locale/de_DE/LC_MESSAGES/bottles.po']),] setup( name='Bottles', - version='0.1.9', + version='0.2.0', author='Mirko Brombin', description='Easily manage your Wine bottles', url='https://github.com/mirkobrombin/bottles',