diff options
24 files changed, 156 insertions, 92 deletions
diff --git a/configure.ac b/configure.ac index e744e3b..7dfa45d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([indicator-bluetooth],[13.10.0]) +AC_INIT([ayatana-indicator-bluetooth],[13.10.0]) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign]) AC_CONFIG_HEADERS([config.h]) AM_SILENT_RULES([yes]) @@ -47,7 +47,7 @@ dnl ########################### IT_PROG_INTLTOOL([0.41.0]) -GETTEXT_PACKAGE=indicator-bluetooth +GETTEXT_PACKAGE=ayatana-indicator-bluetooth AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the default get text domain]) AC_DEFINE_PATH(GNOMELOCALEDIR, "${datadir}/locale", [locale directory]) diff --git a/data/Makefile.am b/data/Makefile.am index 9dd100b..226ff81 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -5,12 +5,12 @@ CLEANFILES = SUBDIRS = upstart # the indicator bus file -indicatorsdir = $(datadir)/unity/indicators -dist_indicators_DATA = com.canonical.indicator.bluetooth +indicatorsdir = $(datadir)/ayatana/indicators +dist_indicators_DATA = org.ayatana.indicator.bluetooth # the systemd unit file systemddir = $(SYSTEMD_USERDIR) -systemd_DATA = indicator-bluetooth.service +systemd_DATA = ayatana-indicator-bluetooth.service systemd_in = $(systemd_DATA:.service=.service.in) $(systemd_DATA): $(systemd_in) $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ @@ -20,12 +20,12 @@ CLEANFILES += $(systemd_DATA) # the systemd upstart override upstart_overridedir = $(datadir)/upstart/systemd-session/upstart -upstart_override_DATA = indicator-bluetooth.override +upstart_override_DATA = ayatana-indicator-bluetooth.override EXTRA_DIST += $(upstart_override_DATA) # the upstart job file upstart_jobsdir = $(datadir)/upstart/sessions -upstart_jobs_DATA = indicator-bluetooth.conf +upstart_jobs_DATA = ayatana-indicator-bluetooth.conf upstart_jobs_in = $(upstart_jobs_DATA:.conf=.conf.in) $(upstart_jobs_DATA): $(upstart_jobs_in) $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ @@ -35,7 +35,7 @@ CLEANFILES += $(upstart_jobs_DATA) # the xdg autostart job file xdg_autostartdir = /etc/xdg/autostart -xdg_autostart_DATA = indicator-bluetooth.desktop +xdg_autostart_DATA = ayatana-indicator-bluetooth.desktop xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in) $(xdg_autostart_DATA): $(xdg_autostart_in) $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ @@ -44,14 +44,14 @@ EXTRA_DIST += $(xdg_autostart_in) CLEANFILES += $(xdg_autostart_DATA) # the gsettings schema -gsettings_SCHEMAS = com.canonical.indicator.bluetooth.gschema.xml +gsettings_SCHEMAS = org.ayatana.indicator.bluetooth.gschema.xml @INTLTOOL_XML_NOMERGE_RULE@ @GSETTINGS_RULES@ EXTRA_DIST += \ - com.canonical.indicator.bluetooth.gschema.xml.in \ - indicator-bluetooth.conf.in \ - indicator-bluetooth.desktop.in + org.ayatana.indicator.bluetooth.gschema.xml.in \ + ayatana-indicator-bluetooth.conf.in \ + ayatana-indicator-bluetooth.desktop.in CLEANFILES += \ $(dbus_services_DATA) \ diff --git a/data/indicator-bluetooth.conf.in b/data/ayatana-indicator-bluetooth.conf.in index 5262391..5262391 100644 --- a/data/indicator-bluetooth.conf.in +++ b/data/ayatana-indicator-bluetooth.conf.in diff --git a/data/ayatana-indicator-bluetooth.desktop.in b/data/ayatana-indicator-bluetooth.desktop.in new file mode 100644 index 0000000..8eb5e1f --- /dev/null +++ b/data/ayatana-indicator-bluetooth.desktop.in @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Ayatana Indicator Bluetooth +Exec=@pkglibexecdir@/ayatana-indicator-bluetooth/ayatana-indicator-bluetooth-service +NoDisplay=true +StartupNotify=false +Terminal=false +OnlyShowIn=Unity;MATE;XFCE; diff --git a/data/indicator-bluetooth.override b/data/ayatana-indicator-bluetooth.override index 2905494..2905494 100644 --- a/data/indicator-bluetooth.override +++ b/data/ayatana-indicator-bluetooth.override diff --git a/data/ayatana-indicator-bluetooth.service.in b/data/ayatana-indicator-bluetooth.service.in new file mode 100644 index 0000000..92344c8 --- /dev/null +++ b/data/ayatana-indicator-bluetooth.service.in @@ -0,0 +1,11 @@ +[Unit] +Description=Ayatana Indicator Bluetooth Service +PartOf=graphical-session.target +PartOf=ayatana-indicators.target + +[Service] +ExecStart=@pkglibexecdir@/ayatana-indicator-bluetooth/ayatana-indicator-bluetooth-service +Restart=on-failure + +[Install] +WantedBy=ayatana-indicators.target diff --git a/data/com.canonical.indicator.bluetooth b/data/com.canonical.indicator.bluetooth deleted file mode 100644 index 74e9c13..0000000 --- a/data/com.canonical.indicator.bluetooth +++ /dev/null @@ -1,19 +0,0 @@ -[Indicator Service] -Name=indicator-bluetooth -ObjectPath=/com/canonical/indicator/bluetooth -Position=70 - -[desktop] -ObjectPath=/com/canonical/indicator/bluetooth/desktop - -[phone] -ObjectPath=/com/canonical/indicator/bluetooth/phone -Position=36 - -[ubiquity] -ObjectPath=/com/canonical/indicator/bluetooth/desktop - -[phone_greeter] -ObjectPath=/com/canonical/indicator/bluetooth/phone -Position=36 - diff --git a/data/indicator-bluetooth.desktop.in b/data/indicator-bluetooth.desktop.in deleted file mode 100644 index 6048c3c..0000000 --- a/data/indicator-bluetooth.desktop.in +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Indicator Bluetooth -Exec=@pkglibexecdir@/indicator-bluetooth-service -NoDisplay=true -StartupNotify=false -Terminal=false -OnlyShowIn=Unity;GNOME; -AutostartCondition=GNOME3 unless-session gnome diff --git a/data/indicator-bluetooth.service.in b/data/indicator-bluetooth.service.in deleted file mode 100644 index e99e610..0000000 --- a/data/indicator-bluetooth.service.in +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Indicator Bluetooth Backend -PartOf=graphical-session.target -After=indicators-pre.target - -[Service] -ExecStart=@pkglibexecdir@/indicator-bluetooth-service -Restart=on-failure diff --git a/data/org.ayatana.indicator.bluetooth b/data/org.ayatana.indicator.bluetooth new file mode 100644 index 0000000..a57ce0a --- /dev/null +++ b/data/org.ayatana.indicator.bluetooth @@ -0,0 +1,19 @@ +[Indicator Service] +Name=ayatana-indicator-bluetooth +ObjectPath=/org/ayatana/indicator/bluetooth +Position=70 + +[desktop] +ObjectPath=/org/ayatana/indicator/bluetooth/desktop + +[phone] +ObjectPath=/org/ayatana/indicator/bluetooth/phone +Position=36 + +[ubiquity] +ObjectPath=/org/ayatana/indicator/bluetooth/desktop + +[phone_greeter] +ObjectPath=/org/ayatana/indicator/bluetooth/phone +Position=36 + diff --git a/data/com.canonical.indicator.bluetooth.gschema.xml.in b/data/org.ayatana.indicator.bluetooth.gschema.xml.in index cb60641..e1f5f8e 100644 --- a/data/com.canonical.indicator.bluetooth.gschema.xml.in +++ b/data/org.ayatana.indicator.bluetooth.gschema.xml.in @@ -1,5 +1,5 @@ <schemalist> - <schema id="com.canonical.indicator.bluetooth" path="/com/canonical/indicator/bluetooth/"> + <schema id="org.ayatana.indicator.bluetooth" path="/org/ayatana/indicator/bluetooth/"> <key name="visible" type="b"> <default>true</default> <_summary>Whether or not to show the bluetooth indicator in the menu bar.</_summary> diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am index 2012021..e83f60c 100644 --- a/data/upstart/Makefile.am +++ b/data/upstart/Makefile.am @@ -5,8 +5,8 @@ CLEANFILES = # the upstart version of the xdg autostart job file # see https://code.launchpad.net/~charlesk/indicator-bluetooth/upstart-job/+merge/198100 upstart_xdg_autostartdir = $(datadir)/upstart/xdg/autostart -upstart_xdg_autostart_DATA = indicator-bluetooth.desktop -upstart_xdg_autostart_in = indicator-bluetooth.desktop.in +upstart_xdg_autostart_DATA = ayatana-indicator-bluetooth.desktop +upstart_xdg_autostart_in = ayatana-indicator-bluetooth.desktop.in $(upstart_xdg_autostart_DATA): $(upstart_xdg_autostart_in) $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ BUILT_SOURCES += $(upstart_xdg_autostart_DATA) @@ -14,4 +14,4 @@ EXTRA_DIST += $(upstart_xdg_autostart_in) CLEANFILES += $(upstart_xdg_autostart_DATA) EXTRA_DIST += \ - indicator-bluetooth.upstart.desktop.in + ayatana-indicator-bluetooth.upstart.desktop.in diff --git a/data/upstart/indicator-bluetooth.desktop.in b/data/upstart/ayatana-indicator-bluetooth.desktop.in index 523cfa0..523cfa0 100644 --- a/data/upstart/indicator-bluetooth.desktop.in +++ b/data/upstart/ayatana-indicator-bluetooth.desktop.in diff --git a/debian/ayatana-indicator-bluetooth.links b/debian/ayatana-indicator-bluetooth.links new file mode 100644 index 0000000..40d2c98 --- /dev/null +++ b/debian/ayatana-indicator-bluetooth.links @@ -0,0 +1,3 @@ +# Because dh-systemd does not support user units for compat levels below 12, we manually make the WantedBy link +# FIXME: drop this once we bump DH compat level to 12 or higher +/usr/lib/systemd/user/ayatana-indicator-bluetooth.service /usr/lib/systemd/user/ayatana-indicators.target.wants/ayatana-indicator-bluetooth.service diff --git a/debian/changelog b/debian/changelog index 5449352..a979863 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ayatana-indicator-bluetooth (0.8.0-0) unstable; urgency=medium + + * Port from Ubuntu Indicators to Ayatana Indicators. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 25 Oct 2020 16:38:02 +0100 + indicator-bluetooth (0.0.7+ubports1) xenial; urgency=medium * Update Jenkinsfile for xenial diff --git a/debian/control b/debian/control index 1a4d509..0af5bc0 100644 --- a/debian/control +++ b/debian/control @@ -1,34 +1,31 @@ -Source: indicator-bluetooth +Source: ayatana-indicator-bluetooth Section: gnome -Priority: extra -Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> +Priority: optional +Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Build-Depends: debhelper (>= 9.0), dh-autoreconf, - dh-translations, + dh-systemd, gnome-common, - libglib2.0-dev, + libglib2.0-dev (>= 2.32.0), liburl-dispatcher1-dev, - systemd, - valac (>=0.18), -Standards-Version: 3.9.4 -Homepage: https://launchpad.net/indicator-bluetooth -# If you aren't a member of ~indicator-applet-developers but need to upload -# packaging changes, just go ahead. ~indicator-applet-developers will notice -# and sync up the code again. -Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-bluetooth/trunk -Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/indicator-bluetooth/trunk/files + systemd [linux-any], + valac (>= 0.20), +Standards-Version: 4.1.1 +Homepage: https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth +Vcs-Git: git://github.com:AyatanaIndicators/ayatana-indicator-bluetooth.git +Vcs-Browser: https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth.git -Package: indicator-bluetooth +Package: ayatana-indicator-bluetooth Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, bluez (>= 5), unity-control-center | gnome-control-center | ubuntu-system-settings, - gnome-bluetooth | ubuntu-system-settings, - indicator-common, + gnome-bluetooth | ubuntu-system-settings | blueman-manager, + ayatana-indicator-common, Replaces: gnome-bluetooth (<< 3.6.1-0ubuntu2) Breaks: gnome-bluetooth (<< 3.6.1-0ubuntu2) -Description: System bluetooth indicator. - System bluetooth indicator which provides fast user controls for Bluetooth +Description: Ayatana system bluetooth indicator + Ayatana system bluetooth indicator which provides fast user controls for Bluetooth devices. diff --git a/debian/rules b/debian/rules index ca87700..d63d8ab 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,16 @@ #!/usr/bin/make -f +NULL = + export DPKG_GENSYMBOLS_CHECK_LEVEL=4 %: - dh $@ --with translations,autoreconf + dh $@ --parallel --fail-missing --with systemd override_dh_autoreconf: NOCONFIGURE=1 dh_autoreconf ./autogen.sh override_dh_install: - find debian/indicator-bluetooth/usr/lib -name *.la -delete - find debian/indicator-bluetooth/usr/lib -name *.a -delete + find debian/ayatana-indicator-bluetooth/usr/lib -name *.la -delete + find debian/ayatana-indicator-bluetooth/usr/lib -name *.a -delete dh_install --fail-missing diff --git a/debian/watch b/debian/watch index d75864c..87170a6 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -https://launchpad.net/indicator-bluetooth/+download .*/indicator-bluetooth-([0-9.]+)\.tar\.xz +https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth/archive/([0-9.]+)\.tar\.gz diff --git a/po/POTFILES.in b/po/POTFILES.in index 50ceb50..6f4337a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,7 @@ # List of source files containing translatable strings. # Please keep this file in alphabetical order. [encoding: UTF-8] -data/com.canonical.indicator.bluetooth.gschema.xml.in +data/org.ayatana.indicator.bluetooth.gschema.xml.in src/bluetooth.vala src/bluez.vala src/desktop.vala diff --git a/po/ayatana-indicator-bluetooth.pot b/po/ayatana-indicator-bluetooth.pot new file mode 100644 index 0000000..72b3b9a --- /dev/null +++ b/po/ayatana-indicator-bluetooth.pot @@ -0,0 +1,54 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Canonical Ltd. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-08-28 20:27+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../src/indicator-bluetooth-service.vala:48 +msgid "Enabled" +msgstr "" + +#: ../src/indicator-bluetooth-service.vala:62 +msgid "Visible" +msgstr "" + +#: ../src/indicator-bluetooth-service.vala:111 +msgid "Bluetooth Settings..." +msgstr "" + +#: ../src/indicator-bluetooth-service.vala:253 +msgid "Connection" +msgstr "" + +#: ../src/indicator-bluetooth-service.vala:276 +msgid "Send files..." +msgstr "" + +#: ../src/indicator-bluetooth-service.vala:284 +msgid "Browse files..." +msgstr "" + +#: ../src/indicator-bluetooth-service.vala:293 +msgid "Keyboard Settings..." +msgstr "" + +#: ../src/indicator-bluetooth-service.vala:301 +msgid "Mouse and Touchpad Settings..." +msgstr "" + +#: ../src/indicator-bluetooth-service.vala:310 +msgid "Sound Settings..." +msgstr "" diff --git a/src/Makefile.am b/src/Makefile.am index 3a47f8e..245b0f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ -pkglibexec_PROGRAMS = indicator-bluetooth-service +pkglibexec_PROGRAMS = ayatana-indicator-bluetooth-service -indicator_bluetooth_service_SOURCES = \ +ayatana_indicator_bluetooth_service_SOURCES = \ bluetooth.vala \ bluez.vala \ desktop.vala \ @@ -11,7 +11,7 @@ indicator_bluetooth_service_SOURCES = \ killswitch.vala \ service.vala -indicator_bluetooth_service_VALAFLAGS = \ +ayatana_indicator_bluetooth_service_VALAFLAGS = \ --ccode \ --vapidir=$(top_srcdir)/vapi/ \ --vapidir=./ \ @@ -23,13 +23,13 @@ indicator_bluetooth_service_VALAFLAGS = \ --pkg gio-2.0 # -w to disable warnings for vala-generated code -indicator_bluetooth_service_CFLAGS = \ +ayatana_indicator_bluetooth_service_CFLAGS = \ -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ -DLOCALE_DIR=\"$(datadir)/locale\" \ -w \ $(SERVICE_DEPS_CFLAGS) -indicator_bluetooth_service_LDADD = \ +ayatana_indicator_bluetooth_service_LDADD = \ $(SERVICE_DEPS_LIBS) CLEANFILES = \ diff --git a/src/desktop.vala b/src/desktop.vala index 5adaaf1..4186daa 100644 --- a/src/desktop.vala +++ b/src/desktop.vala @@ -47,7 +47,7 @@ class Desktop: Profile connect_actions = new HashTable<uint,SimpleAction>(direct_hash, direct_equal); - settings = new Settings ("com.canonical.indicator.bluetooth"); + settings = new Settings ("org.ayatana.indicator.bluetooth"); // build the static actions Action[] actions = {}; @@ -94,8 +94,8 @@ class Desktop: Profile var action_name = @"desktop-device-$(id)-connected"; var item = new MenuItem (_("Connection"), @"indicator.$action_name"); - item.set_attribute ("x-canonical-type", - "s", "com.canonical.indicator.switch"); + item.set_attribute ("x-ayatana-type", + "s", "org.ayatana.indicator.switch"); // if this doesn't already have an action, create one if (!connect_actions.contains (id)) @@ -190,8 +190,8 @@ class Desktop: Profile section = new Menu (); section.append_item (create_enabled_menuitem ()); item = new MenuItem (_("Visible"), "indicator.desktop-discoverable"); - item.set_attribute ("x-canonical-type", "s", - "com.canonical.indicator.switch"); + item.set_attribute ("x-ayatana-type", "s", + "org.ayatana.indicator.switch"); section.append_item (item); menu.append_section (null, section); diff --git a/src/profile.vala b/src/profile.vala index 4320ac8..767a5cd 100644 --- a/src/profile.vala +++ b/src/profile.vala @@ -88,8 +88,8 @@ class Profile: Object { var item = new MenuItem (_("Bluetooth"), "indicator.bluetooth-enabled"); - item.set_attribute ("x-canonical-type", "s", - "com.canonical.indicator.switch"); + item.set_attribute ("x-ayatana-type", "s", + "org.ayatana.indicator.switch"); return item; } @@ -98,8 +98,8 @@ class Profile: Object { var item = new MenuItem (null, @"indicator.root-$profile_name"); - item.set_attribute ("x-canonical-type", "s", - "com.canonical.indicator.root"); + item.set_attribute ("x-ayatana-type", "s", + "org.ayatana.indicator.root"); return item; } diff --git a/src/service.vala b/src/service.vala index 20fdd1e..4df3590 100644 --- a/src/service.vala +++ b/src/service.vala @@ -29,7 +29,7 @@ public class Service: Object private HashTable<string,Profile> profiles; private DBusConnection connection; private uint exported_action_id; - private const string OBJECT_PATH = "/com/canonical/indicator/bluetooth"; + private const string OBJECT_PATH = "/org/ayatana/indicator/bluetooth"; private void unexport () { @@ -65,7 +65,7 @@ public class Service: Object } var own_name_id = Bus.own_name (BusType.SESSION, - "com.canonical.indicator.bluetooth", + "org.ayatana.indicator.bluetooth", BusNameOwnerFlags.NONE, on_bus_acquired, null, |