From 67376d6a03a49eec1fdcb2c07509a6994d089e69 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 25 Oct 2020 16:14:34 +0100 Subject: Switch over from Ubuntu System Indicator to Ayatana System Indicator. --- data/Makefile.am | 20 ++++++++++---------- data/ayatana-indicator-bluetooth.conf.in | 9 +++++++++ data/ayatana-indicator-bluetooth.desktop.in | 8 ++++++++ data/ayatana-indicator-bluetooth.override | 1 + data/ayatana-indicator-bluetooth.service.in | 11 +++++++++++ data/com.canonical.indicator.bluetooth | 19 ------------------- .../com.canonical.indicator.bluetooth.gschema.xml.in | 9 --------- data/indicator-bluetooth.conf.in | 9 --------- data/indicator-bluetooth.desktop.in | 9 --------- data/indicator-bluetooth.override | 1 - data/indicator-bluetooth.service.in | 8 -------- data/org.ayatana.indicator.bluetooth | 19 +++++++++++++++++++ data/org.ayatana.indicator.bluetooth.gschema.xml.in | 9 +++++++++ data/upstart/Makefile.am | 6 +++--- data/upstart/ayatana-indicator-bluetooth.desktop.in | 9 +++++++++ data/upstart/indicator-bluetooth.desktop.in | 9 --------- 16 files changed, 79 insertions(+), 77 deletions(-) create mode 100644 data/ayatana-indicator-bluetooth.conf.in create mode 100644 data/ayatana-indicator-bluetooth.desktop.in create mode 100644 data/ayatana-indicator-bluetooth.override create mode 100644 data/ayatana-indicator-bluetooth.service.in delete mode 100644 data/com.canonical.indicator.bluetooth delete mode 100644 data/com.canonical.indicator.bluetooth.gschema.xml.in delete mode 100644 data/indicator-bluetooth.conf.in delete mode 100644 data/indicator-bluetooth.desktop.in delete mode 100644 data/indicator-bluetooth.override delete mode 100644 data/indicator-bluetooth.service.in create mode 100644 data/org.ayatana.indicator.bluetooth create mode 100644 data/org.ayatana.indicator.bluetooth.gschema.xml.in create mode 100644 data/upstart/ayatana-indicator-bluetooth.desktop.in delete mode 100644 data/upstart/indicator-bluetooth.desktop.in (limited to 'data') 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/ayatana-indicator-bluetooth.conf.in b/data/ayatana-indicator-bluetooth.conf.in new file mode 100644 index 0000000..5262391 --- /dev/null +++ b/data/ayatana-indicator-bluetooth.conf.in @@ -0,0 +1,9 @@ +description "Indicator Bluetooth Backend" + +start on indicator-services-start +stop on desktop-end or indicator-services-end + +respawn +respawn limit 2 10 + +exec @pkglibexecdir@/indicator-bluetooth-service 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/ayatana-indicator-bluetooth.override b/data/ayatana-indicator-bluetooth.override new file mode 100644 index 0000000..2905494 --- /dev/null +++ b/data/ayatana-indicator-bluetooth.override @@ -0,0 +1 @@ +manual 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/com.canonical.indicator.bluetooth.gschema.xml.in b/data/com.canonical.indicator.bluetooth.gschema.xml.in deleted file mode 100644 index cb60641..0000000 --- a/data/com.canonical.indicator.bluetooth.gschema.xml.in +++ /dev/null @@ -1,9 +0,0 @@ - - - - true - <_summary>Whether or not to show the bluetooth indicator in the menu bar. - <_description>Whether or not to show the bluetooth indicator in the menu bar. - - - diff --git a/data/indicator-bluetooth.conf.in b/data/indicator-bluetooth.conf.in deleted file mode 100644 index 5262391..0000000 --- a/data/indicator-bluetooth.conf.in +++ /dev/null @@ -1,9 +0,0 @@ -description "Indicator Bluetooth Backend" - -start on indicator-services-start -stop on desktop-end or indicator-services-end - -respawn -respawn limit 2 10 - -exec @pkglibexecdir@/indicator-bluetooth-service 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.override b/data/indicator-bluetooth.override deleted file mode 100644 index 2905494..0000000 --- a/data/indicator-bluetooth.override +++ /dev/null @@ -1 +0,0 @@ -manual 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/org.ayatana.indicator.bluetooth.gschema.xml.in b/data/org.ayatana.indicator.bluetooth.gschema.xml.in new file mode 100644 index 0000000..e1f5f8e --- /dev/null +++ b/data/org.ayatana.indicator.bluetooth.gschema.xml.in @@ -0,0 +1,9 @@ + + + + true + <_summary>Whether or not to show the bluetooth indicator in the menu bar. + <_description>Whether or not to show the bluetooth indicator in the menu bar. + + + 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/ayatana-indicator-bluetooth.desktop.in b/data/upstart/ayatana-indicator-bluetooth.desktop.in new file mode 100644 index 0000000..523cfa0 --- /dev/null +++ b/data/upstart/ayatana-indicator-bluetooth.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Indicator Bluetooth +Exec=@pkglibexecdir@/indicator-bluetooth-service +NoDisplay=true +StartupNotify=false +Terminal=false +OnlyShowIn=Unity; +Hidden=true diff --git a/data/upstart/indicator-bluetooth.desktop.in b/data/upstart/indicator-bluetooth.desktop.in deleted file mode 100644 index 523cfa0..0000000 --- a/data/upstart/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; -Hidden=true -- cgit v1.2.3