Hello community, here is the log from the commit of package blueberry for openSUSE:Factory checked in at 2018-05-11 09:15:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blueberry (Old) and /work/SRC/openSUSE:Factory/.blueberry.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blueberry" Fri May 11 09:15:01 2018 rev:27 rq:605730 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/blueberry/blueberry.changes 2018-01-17 21:58:59.369306430 +0100 +++ /work/SRC/openSUSE:Factory/.blueberry.new/blueberry.changes 2018-05-11 09:15:02.893529764 +0200 @@ -1,0 +2,10 @@ +Thu May 8 20:40:20 UTC 2018 - [email protected] + +- Update to version 1.2.0: + * Fix some depreciation warnings. + * Remove unused applet label. + * applet: Use bluetooth icon, remove dangerous flag. + * Update translations. +- Rebase blueberry-fix-rfkill-path.patch. + +------------------------------------------------------------------- Old: ---- blueberry-1.1.20.tar.gz New: ---- blueberry-1.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blueberry.spec ++++++ --- /var/tmp/diff_new_pack.vvLiKi/_old 2018-05-11 09:15:04.009489336 +0200 +++ /var/tmp/diff_new_pack.vvLiKi/_new 2018-05-11 09:15:04.013489191 +0200 @@ -18,12 +18,12 @@ %define __requires_exclude typelib\\((St)\\) Name: blueberry -Version: 1.1.20 +Version: 1.2.0 Release: 0 Summary: A configuration tool for Bluetooth -License: GPL-3.0+ +License: GPL-3.0-or-later Group: System/GUI/Other -Url: https://github.com/linuxmint/blueberry +URL: https://github.com/linuxmint/blueberry Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE blueberry-fix-rfkill-path.patch boo#1076134 [email protected] -- Fix rfkill's path. Patch0: blueberry-fix-rfkill-path.patch @@ -35,12 +35,13 @@ Requires: bluez-tools Requires: gnome-bluetooth >= 3.14 Requires: python3-gobject +Requires: python3-gobject-Gdk Requires: python3-setproctitle Requires: wmctrl Recommends: %{name}-lang BuildArch: noarch %glib2_gsettings_schema_requires -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} >= 1500 Requires: python3-dbus-python Requires: util-linux %else @@ -48,9 +49,6 @@ Requires: dbus-1-python3 Requires: rfkill %endif -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 -Requires: python3-gobject-Gdk -%endif %description Utility for Bluetooth devices graphical configuration. @@ -72,7 +70,7 @@ %find_lang %{name} %fdupes %{buildroot}%{_datadir}/ -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post %desktop_database_post %icon_theme_cache_post @@ -85,7 +83,12 @@ %endif %files -%doc COPYING README.md debian/changelog +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc README.md debian/changelog %{_sysconfdir}/xdg/autostart/%{name}-tray.desktop %{_sysconfdir}/xdg/autostart/%{name}-obex-agent.desktop %{_bindir}/%{name}* ++++++ blueberry-1.1.20.tar.gz -> blueberry-1.2.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.1.20/blueberry.pot new/blueberry-1.2.0/blueberry.pot --- old/blueberry-1.1.20/blueberry.pot 2017-12-18 13:26:20.000000000 +0100 +++ new/blueberry-1.2.0/blueberry.pot 2018-05-07 16:25:47.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-27 13:45+0100\n" +"POT-Creation-Date: 2018-05-07 15:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -91,81 +91,81 @@ msgstr[0] "" msgstr[1] "" -#: usr/lib/blueberry/blueberry.py:76 usr/lib/blueberry/blueberry-tray.py:37 -#: usr/lib/blueberry/blueberry-tray.py:67 generate_desktop_files:25 +#: usr/lib/blueberry/blueberry.py:76 usr/lib/blueberry/blueberry-tray.py:45 +#: usr/lib/blueberry/blueberry-tray.py:75 generate_desktop_files:25 msgid "Bluetooth" msgstr "" -#: usr/lib/blueberry/blueberry.py:126 usr/lib/blueberry/blueberry-tray.py:54 +#: usr/lib/blueberry/blueberry.py:125 usr/lib/blueberry/blueberry-tray.py:62 msgid "Bluetooth is disabled" msgstr "" -#: usr/lib/blueberry/blueberry.py:127 +#: usr/lib/blueberry/blueberry.py:126 msgid "No Bluetooth adapters found" msgstr "" -#: usr/lib/blueberry/blueberry.py:128 +#: usr/lib/blueberry/blueberry.py:127 msgid "Bluetooth is disabled by hardware switch" msgstr "" -#: usr/lib/blueberry/blueberry.py:146 +#: usr/lib/blueberry/blueberry.py:145 msgid "Devices" msgstr "" -#: usr/lib/blueberry/blueberry.py:152 +#: usr/lib/blueberry/blueberry.py:151 msgid "Bluetooth settings" msgstr "" -#: usr/lib/blueberry/blueberry.py:158 +#: usr/lib/blueberry/blueberry.py:157 msgid "Name" msgstr "" -#: usr/lib/blueberry/blueberry.py:159 +#: usr/lib/blueberry/blueberry.py:158 msgid "This is the Bluetooth name of your computer" msgstr "" -#: usr/lib/blueberry/blueberry.py:166 +#: usr/lib/blueberry/blueberry.py:165 msgid "Receive files from remote devices" msgstr "" -#: usr/lib/blueberry/blueberry.py:167 +#: usr/lib/blueberry/blueberry.py:166 msgid "" "This option allows your computer to receive files transferred over Bluetooth " "(OBEX)" msgstr "" -#: usr/lib/blueberry/blueberry.py:174 +#: usr/lib/blueberry/blueberry.py:173 msgid "Show a tray icon" msgstr "" -#: usr/lib/blueberry/blueberry.py:178 +#: usr/lib/blueberry/blueberry.py:177 msgid "Settings" msgstr "" -#: usr/lib/blueberry/blueberry.py:256 +#: usr/lib/blueberry/blueberry.py:255 #, python-format msgid "Visible as %s and available for Bluetooth file transfers." msgstr "" -#: usr/lib/blueberry/blueberry.py:258 +#: usr/lib/blueberry/blueberry.py:257 #, python-format msgid "Visible as %s." msgstr "" -#: usr/lib/blueberry/blueberry-tray.py:64 +#: usr/lib/blueberry/blueberry-tray.py:72 #, python-format msgid "Bluetooth: Connected to %s" msgstr "" -#: usr/lib/blueberry/blueberry-tray.py:107 +#: usr/lib/blueberry/blueberry-tray.py:115 msgid "Send files to a device" msgstr "" -#: usr/lib/blueberry/blueberry-tray.py:111 +#: usr/lib/blueberry/blueberry-tray.py:119 msgid "Open Bluetooth device manager" msgstr "" -#: usr/lib/blueberry/blueberry-tray.py:117 +#: usr/lib/blueberry/blueberry-tray.py:125 msgid "Quit" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.1.20/debian/changelog new/blueberry-1.2.0/debian/changelog --- old/blueberry-1.1.20/debian/changelog 2017-12-18 13:26:20.000000000 +0100 +++ new/blueberry-1.2.0/debian/changelog 2018-05-07 16:25:47.000000000 +0200 @@ -1,3 +1,25 @@ +blueberry (1.2.0) tara; urgency=medium + + [ FriedrichFroebel ] + * Fix PyGIDeprecationWarnings (#51) + + [ Leigh Scott ] + * fix some depreciation warnings (#49) + + [ Germán Franco ] + * Remove unused applet label (#53) + + [ NikoKrause ] + * applet: use bluetooth icon, remove dangerous flag (#57) + + [ Leigh Scott ] + * Fix PyGIDeprecationWarning (#56) + + [ Clement Lefebvre ] + * l10n: Update files + + -- Clement Lefebvre <[email protected]> Mon, 07 May 2018 15:25:00 +0100 + blueberry (1.1.20) sylvia; urgency=medium [ Jeremy Fleischman ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.1.20/usr/lib/blueberry/blueberry-obex-agent.py new/blueberry-1.2.0/usr/lib/blueberry/blueberry-obex-agent.py --- old/blueberry-1.1.20/usr/lib/blueberry/blueberry-obex-agent.py 2017-12-18 13:26:20.000000000 +0100 +++ new/blueberry-1.2.0/usr/lib/blueberry/blueberry-obex-agent.py 2018-05-07 16:25:47.000000000 +0200 @@ -723,11 +723,11 @@ self._interface.UnregisterAgent(agent_path, reply_handler=on_unregistered, error_handler=on_unregister_failed) if __name__ == '__main__': - settings = Gio.Settings("org.blueberry") + settings = Gio.Settings(schema="org.blueberry") if settings.get_boolean("obex-enabled"): try: dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) - mainloop = GObject.MainLoop() + mainloop = GLib.MainLoop() service = TransferService() service.load() cont = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.1.20/usr/lib/blueberry/blueberry-tray.py new/blueberry-1.2.0/usr/lib/blueberry/blueberry-tray.py --- old/blueberry-1.1.20/usr/lib/blueberry/blueberry-tray.py 2017-12-18 13:26:20.000000000 +0100 +++ new/blueberry-1.2.0/usr/lib/blueberry/blueberry-tray.py 2018-05-07 16:25:47.000000000 +0200 @@ -27,7 +27,7 @@ debug = True self.rfkill = rfkillMagic.Interface(self.update_icon_callback, debug) - self.settings = Gio.Settings("org.blueberry") + self.settings = Gio.Settings(schema="org.blueberry") self.settings.connect("changed::tray-enabled", self.on_settings_changed_cb) # If we have no adapter, or disabled tray, end early diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.1.20/usr/lib/blueberry/blueberry.py new/blueberry-1.2.0/usr/lib/blueberry/blueberry.py --- old/blueberry-1.1.20/usr/lib/blueberry/blueberry.py 2017-12-18 13:26:20.000000000 +0100 +++ new/blueberry-1.2.0/usr/lib/blueberry/blueberry.py 2018-05-07 16:25:47.000000000 +0200 @@ -23,7 +23,7 @@ def __init__(self): Gtk.Application.__init__(self, application_id='com.linuxmint.blueberry', flags=Gio.ApplicationFlags.FLAGS_NONE) - self.window = Gtk.Window(Gtk.WindowType.TOPLEVEL) + self.window = Gtk.Window(type=Gtk.WindowType.TOPLEVEL) self.detect_desktop_environment() self.connect("activate", self.on_activate) @@ -103,7 +103,7 @@ stack_switcher.set_halign(Gtk.Align.CENTER) toolbar.show_all() - self.settings = Gio.Settings("org.blueberry") + self.settings = Gio.Settings(schema="org.blueberry") debug = False if len(sys.argv) > 1 and sys.argv[1] == "debug": @@ -162,7 +162,7 @@ self.obex_switch.set_active(self.settings.get_boolean("obex-enabled")) self.obex_switch.connect("notify::active", self.on_obex_switch_toggled) self.settings.connect("changed", self.on_settings_changed) - row = SettingsRow(Gtk.Label(_("Receive files from remote devices")), self.obex_switch) + row = SettingsRow(Gtk.Label(label=_("Receive files from remote devices")), self.obex_switch) row.set_tooltip_text(_("This option allows your computer to receive files transferred over Bluetooth (OBEX)")) section.add_row(row) @@ -170,7 +170,7 @@ self.tray_switch.set_active(self.settings.get_boolean("tray-enabled")) self.tray_switch.connect("notify::active", self.on_tray_switch_toggled) self.settings.connect("changed", self.on_settings_changed) - section.add_row(SettingsRow(Gtk.Label(_("Show a tray icon")), self.tray_switch)) + section.add_row(SettingsRow(Gtk.Label(label=_("Show a tray icon")), self.tray_switch)) self.window.add(self.main_box) @@ -221,7 +221,7 @@ self.obex_switch.set_active(self.settings.get_boolean("obex-enabled")) def add_stack_page(self, message, name): - label = Gtk.Label(message) + label = Gtk.Label(label=message) self.stack.add_named(label, name) label.show() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.1.20/usr/lib/blueberry/rfkillMagic.py new/blueberry-1.2.0/usr/lib/blueberry/rfkillMagic.py --- old/blueberry-1.1.20/usr/lib/blueberry/rfkillMagic.py 2017-12-18 13:26:20.000000000 +0100 +++ new/blueberry-1.2.0/usr/lib/blueberry/rfkillMagic.py 2018-05-07 16:25:47.000000000 +0200 @@ -3,7 +3,7 @@ import subprocess import os import re -from gi.repository import GObject +from gi.repository import GLib RFKILL_CHK = ["/usr/sbin/rfkill", "list", "bluetooth"] RFKILL_BLOCK = ["/usr/sbin/rfkill", "block", "bluetooth"] @@ -108,7 +108,7 @@ self.update_ui() def update_ui(self): - GObject.idle_add(self.output_callback) + GLib.idle_add(self.output_callback) def try_set_blocked(self, blocked): thread.start_new_thread(self.set_block_thread, (blocked,)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.1.20/usr/share/applications/blueberry.desktop new/blueberry-1.2.0/usr/share/applications/blueberry.desktop --- old/blueberry-1.1.20/usr/share/applications/blueberry.desktop 2017-12-18 13:26:20.000000000 +0100 +++ new/blueberry-1.2.0/usr/share/applications/blueberry.desktop 2018-05-07 16:25:47.000000000 +0200 @@ -2,6 +2,7 @@ Name=Bluetooth Name[am]=ብሉቱዝ Name[ar]=بلوتوث +Name[ar_AR]=بلوتوث Name[ar_MA]=بلوتوث Name[as]=ব্লুটুথ Name[ber]=ⴱⵍⵓⵜⵓⵜ @@ -34,6 +35,7 @@ Name[shn]=ၸၢတ်ႇၸိတ်ႇ Name[sr]=Блутут Name[sr@Latn]=Блутут +Name[sr@cyrillic]=Блутут Name[sr@ije]=Блутут Name[sr@ijekavianlatin]=Блутут Name[sr@latin]=Блутут @@ -60,15 +62,12 @@ Comment[bs]=Konfiguriši Bluetooth postavke Comment[ca]=Configura els ajusts de Bluetooth Comment[ca@valencia]=Configura els paràmetres del Bluetooth -Comment[ca_ES]=Configura els ajusts de Bluetooth Comment[ca_ES@valencia]=Configura els paràmetres del Bluetooth Comment[cs]=Nastavení Bluetooth Comment[cs_CZ]=Nastavení Bluetooth Comment[cy]=Ffurfweddu gosodiadau Bluetooth Comment[da]=Konfigurér Bluetooth-indstillinger -Comment[da_DK]=Konfigurér Bluetooth-indstillinger Comment[de]=Bluetooth-Einstellungen bearbeiten -Comment[de@hebrew]=Bluetooth-Einstellungen bearbeiten Comment[de_CH]=Bluetooth-Einstellungen bearbeiten Comment[de_DE]=Bluetooth-Einstellungen bearbeiten Comment[el]=Διαμόρφωση ρυθμίσεων Bluetooth @@ -108,6 +107,7 @@ Comment[id_ID]=Konfigurasi Bluetooth Comment[is]=Stilla Bluetooth-uppsetningu Comment[it]=Configura le impostazioni Bluetooth +Comment[it_IT]=Configura le impostazioni Bluetooth Comment[ja]=Bluetooth の設定を調整する Comment[ja_JP]=Bluetooth の設定を調整する Comment[kab]=Swel iɣewwaṛen n Bluetooth @@ -149,6 +149,7 @@ Comment[sq]=Konfiguro parametrat e Bluetooth-it Comment[sr]=Измените подешавања блутута Comment[sr@Latn]=Измените подешавања блутута +Comment[sr@cyrillic]=Измените подешавања блутута Comment[sr@ije]=Измените подешавања блутута Comment[sr@ijekavianlatin]=Измените подешавања блутута Comment[sr@latin]=Измените подешавања блутута @@ -161,7 +162,6 @@ Comment[th]=กำหนดค่าตั้งบลูทูธ Comment[th_TH]=กำหนดค่าตั้งบลูทูธ Comment[tr]=Bluetooth ayarlarını yapılandır -Comment[tr_TR]=Bluetooth ayarlarını yapılandır Comment[tt]=Bluetooth-ны көйләү Comment[tt@iqtelif]=Bluetooth-ны көйләү Comment[uk]=Налаштувати параметри Bluetooth diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.1.20/usr/share/cinnamon/applets/[email protected]/applet.js new/blueberry-1.2.0/usr/share/cinnamon/applets/[email protected]/applet.js --- old/blueberry-1.1.20/usr/share/cinnamon/applets/[email protected]/applet.js 2017-12-18 13:26:20.000000000 +0100 +++ new/blueberry-1.2.0/usr/share/cinnamon/applets/[email protected]/applet.js 2018-05-07 16:25:47.000000000 +0200 @@ -22,10 +22,10 @@ } MyApplet.prototype = { - __proto__: Applet.TextIconApplet.prototype, + __proto__: Applet.IconApplet.prototype, _init: function(metadata, orientation, panel_height, instance_id) { - Applet.TextIconApplet.prototype._init.call(this, orientation, panel_height, instance_id); + Applet.IconApplet.prototype._init.call(this, orientation, panel_height, instance_id); this.setAllowedLayout(Applet.AllowedLayout.BOTH); @@ -51,8 +51,6 @@ })); this.menu.addMenuItem(item); - this.on_orientation_changed(orientation); - this._client = new GnomeBluetooth.Client(); this._model = this._client.get_model(); this._model.connect('row-changed', Lang.bind(this, this._sync)); @@ -73,13 +71,6 @@ Main.systrayManager.unregisterId(this.metadata.uuid); }, - on_orientation_changed: function(orientation) { - if (orientation == St.Side.LEFT || orientation == St.Side.RIGHT) - this.hide_applet_label(true); - else - this.hide_applet_label(false); - }, - _getDefaultAdapter: function() { let [ret, iter] = this._model.get_iter_first(); while (ret) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.1.20/usr/share/cinnamon/applets/[email protected]/metadata.json new/blueberry-1.2.0/usr/share/cinnamon/applets/[email protected]/metadata.json --- old/blueberry-1.1.20/usr/share/cinnamon/applets/[email protected]/metadata.json 2017-12-18 13:26:20.000000000 +0100 +++ new/blueberry-1.2.0/usr/share/cinnamon/applets/[email protected]/metadata.json 2018-05-07 16:25:47.000000000 +0200 @@ -1,7 +1,6 @@ { - "dangerous": false, - "description": "Blueberry applet", - "uuid": "[email protected]", - "name": "Bluetooth", - "last-edited": "1355436562" -} \ No newline at end of file + "description": "Blueberry applet", + "uuid": "[email protected]", + "name": "Bluetooth", + "icon": "bluetooth" +} ++++++ blueberry-fix-rfkill-path.patch ++++++ --- /var/tmp/diff_new_pack.vvLiKi/_old 2018-05-11 09:15:04.229481367 +0200 +++ /var/tmp/diff_new_pack.vvLiKi/_new 2018-05-11 09:15:04.229481367 +0200 @@ -6,7 +6,7 @@ import os +import os.path import re - from gi.repository import GObject + from gi.repository import GLib -RFKILL_CHK = ["/usr/sbin/rfkill", "list", "bluetooth"] -RFKILL_BLOCK = ["/usr/sbin/rfkill", "block", "bluetooth"] @@ -17,11 +17,11 @@ + RFKILL_BINARY = "/usr/sbin/rfkill" -RFKILL_EVENT_MONITOR = ["/usr/lib/blueberry/safechild", "/usr/sbin/rfkill", "event"] -+RFKILL_CHK = (RFKILL_BINARY, "list", "bluetooth") -+RFKILL_BLOCK = (RFKILL_BINARY, "block", "bluetooth") -+RFKILL_UNBLOCK = (RFKILL_BINARY, "unblock", "bluetooth") ++RFKILL_CHK = [RFKILL_BINARY, "list", "bluetooth"] ++RFKILL_BLOCK = [RFKILL_BINARY, "block", "bluetooth"] ++RFKILL_UNBLOCK = [RFKILL_BINARY, "unblock", "bluetooth"] + -+RFKILL_EVENT_MONITOR = ("/usr/lib/blueberry/safechild", RFKILL_BINARY, "event") ++RFKILL_EVENT_MONITOR = ["/usr/lib/blueberry/safechild", RFKILL_BINARY, "event"] class Interface: def __init__(self, output_callback, debug):
