aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRodney Dawes <rodney.dawes@canonical.com>2017-02-27 15:12:14 +0000
committerBileto Bot <ci-train-bot@canonical.com>2017-02-27 15:12:14 +0000
commit89b030a289765eab79256865a51d3cda0c499bc4 (patch)
tree321475edc363f17114bd6f7f5001b9ffcc6c66a5
parentc0c08dfdbe1d56cecea66c22b07a2fe799d4581d (diff)
parentfcbd561ad7ecbc0d7273facf6185c7364192cd88 (diff)
downloadayatana-indicator-printers-89b030a289765eab79256865a51d3cda0c499bc4.tar.gz
ayatana-indicator-printers-89b030a289765eab79256865a51d3cda0c499bc4.tar.bz2
ayatana-indicator-printers-89b030a289765eab79256865a51d3cda0c499bc4.zip
Remove old autostart files.
Approved by: Ted Gould, unity-api-1-bot
-rw-r--r--configure.ac1
-rw-r--r--data/Makefile.am17
-rw-r--r--data/indicator-printers.desktop.in8
-rw-r--r--data/upstart/Makefile.am17
-rw-r--r--data/upstart/indicator-printers.desktop.in9
-rw-r--r--debian/indicator-printers.maintscript1
6 files changed, 1 insertions, 52 deletions
diff --git a/configure.ac b/configure.ac
index 67ac462..f257415 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,6 @@ AC_CONFIG_FILES([
Makefile
src/Makefile
data/Makefile
- data/upstart/Makefile
test/Makefile
po/Makefile.in
])
diff --git a/data/Makefile.am b/data/Makefile.am
index c040edb..e5ae964 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,8 +3,6 @@ BUILT_SOURCES=
CLEANFILES=
EXTRA_DIST=
-SUBDIRS = upstart
-
#
# the systemd unit file
#
@@ -38,18 +36,3 @@ $(upstart_jobs_DATA): $(upstart_jobs_in)
BUILT_SOURCES += $(upstart_jobs_DATA)
CLEANFILES += $(upstart_jobs_DATA)
EXTRA_DIST += $(upstart_jobs_in)
-
-#
-# the xdg autostart job file
-#
-
-xdg_autostartdir = /etc/xdg/autostart
-xdg_autostart_DATA = indicator-printers.desktop
-xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
-$(xdg_autostart_DATA): $(xdg_autostart_in)
- $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-BUILT_SOURCES += $(xdg_autostart_DATA)
-CLEANFILES += $(xdg_autostart_DATA)
-EXTRA_DIST += $(xdg_autostart_in)
-
-
diff --git a/data/indicator-printers.desktop.in b/data/indicator-printers.desktop.in
deleted file mode 100644
index a4b6908..0000000
--- a/data/indicator-printers.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Printers
-Exec=@pkglibexecdir@/indicator-printers-service
-OnlyShowIn=Unity;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am
deleted file mode 100644
index 8eb41e9..0000000
--- a/data/upstart/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-BUILT_SOURCES=
-CLEANFILES=
-EXTRA_DIST=
-
-#
-# the upstart xdg autostart override
-#
-
-xdg_autostartdir = $(datadir)/upstart/xdg/autostart
-xdg_autostart_DATA = indicator-printers.desktop
-xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
-$(xdg_autostart_DATA): $(xdg_autostart_in)
- $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-BUILT_SOURCES += $(xdg_autostart_DATA)
-CLEANFILES += $(xdg_autostart_DATA)
-EXTRA_DIST += $(xdg_autostart_in)
-
diff --git a/data/upstart/indicator-printers.desktop.in b/data/upstart/indicator-printers.desktop.in
deleted file mode 100644
index 8c011a9..0000000
--- a/data/upstart/indicator-printers.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Printers
-Exec=@pkglibexecdir@/indicator-printers-service
-OnlyShowIn=Unity;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-Hidden=true
diff --git a/debian/indicator-printers.maintscript b/debian/indicator-printers.maintscript
new file mode 100644
index 0000000..b96bd47
--- /dev/null
+++ b/debian/indicator-printers.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/xdg/autostart/indicator-printers.desktop 0replaceme~