Merge branch 'sunweaver-pr/drop-ubuntuisms'

Attributes GH PR #11: https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth/pull/11
Approval in GH PR #3: https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth/pull/3

5 files changed, 0 insertions, 54 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 226ff81..e9ef0b9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,8 +2,6 @@ BUILT_SOURCES =
 EXTRA_DIST =
 CLEANFILES =
 
-SUBDIRS = upstart
-
 # the indicator bus file
 indicatorsdir = $(datadir)/ayatana/indicators
 dist_indicators_DATA = org.ayatana.indicator.bluetooth
@@ -18,21 +16,6 @@ BUILT_SOURCES += $(systemd_DATA)
 EXTRA_DIST += $(systemd_in)
 CLEANFILES += $(systemd_DATA)
 
-# the systemd upstart override
-upstart_overridedir = $(datadir)/upstart/systemd-session/upstart
-upstart_override_DATA = ayatana-indicator-bluetooth.override
-EXTRA_DIST += $(upstart_override_DATA)
-
-# the upstart job file
-upstart_jobsdir = $(datadir)/upstart/sessions
-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)|" $< > $@
-BUILT_SOURCES += $(upstart_jobs_DATA)
-EXTRA_DIST += $(upstart_jobs_in)
-CLEANFILES += $(upstart_jobs_DATA)
-
 # the xdg autostart job file
 xdg_autostartdir = /etc/xdg/autostart
 xdg_autostart_DATA = ayatana-indicator-bluetooth.desktop
@@ -50,7 +33,6 @@ gsettings_SCHEMAS = org.ayatana.indicator.bluetooth.gschema.xml
 
 EXTRA_DIST += \
   org.ayatana.indicator.bluetooth.gschema.xml.in \
-  ayatana-indicator-bluetooth.conf.in \
   ayatana-indicator-bluetooth.desktop.in
 
 CLEANFILES += \
diff --git a/data/ayatana-indicator-bluetooth.conf.in b/data/ayatana-indicator-bluetooth.conf.in
deleted file mode 100644
index 5262391..0000000
--- a/data/ayatana-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/ayatana-indicator-bluetooth.override b/data/ayatana-indicator-bluetooth.override
deleted file mode 100644
index 2905494..0000000
--- a/data/ayatana-indicator-bluetooth.override
+++ /dev/null
@@ -1 +0,0 @@
-manual
diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am
deleted file mode 100644
index e83f60c..0000000
--- a/data/upstart/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-BUILT_SOURCES =
-EXTRA_DIST =
-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 = 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)
-EXTRA_DIST += $(upstart_xdg_autostart_in)
-CLEANFILES += $(upstart_xdg_autostart_DATA)
-
-EXTRA_DIST += \
-  ayatana-indicator-bluetooth.upstart.desktop.in
diff --git a/data/upstart/ayatana-indicator-bluetooth.desktop.in b/data/upstart/ayatana-indicator-bluetooth.desktop.in
deleted file mode 100644
index 523cfa0..0000000
--- a/data/upstart/ayatana-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