Print Indicator

Merge lp:~dobey/indicator-printers/no-more-autostart into lp:indicator-printers

  1. no-more-autostart
  2. Merge into trunk.16.10
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 81
Merged at revision: 81
Proposed branch: lp:~dobey/indicator-printers/no-more-autostart
Merge into: lp:indicator-printers
Diff against target: 99 lines (+1/-52)
6 files modified
configure.ac (+0/-1)
data/Makefile.am (+0/-17)
data/indicator-printers.desktop.in (+0/-8)
data/upstart/Makefile.am (+0/-17)
data/upstart/indicator-printers.desktop.in (+0/-9)
debian/indicator-printers.maintscript (+1/-0)
To merge this branch: bzr merge lp:~dobey/indicator-printers/no-more-autostart
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Approve
Ted Gould (community) Approve
Review via email: mp+316484@code.launchpad.net

Commit message

Remove old autostart files.

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) :
review: Approve
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:81
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-printers-ci/12/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1604
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1611
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1389
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1389/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1389
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1389/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1389
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1389/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1389
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1389/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1389
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1389/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1389
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1389/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-printers-ci/12/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure.ac'
--- configure.ac 2016-07-19 15:43:40 +0000
+++ configure.ac 2017-02-06 17:08:55 +0000
@@ -35,7 +35,6 @@
35 Makefile35 Makefile
36 src/Makefile36 src/Makefile
37 data/Makefile37 data/Makefile
38 data/upstart/Makefile
39 test/Makefile38 test/Makefile
40 po/Makefile.in39 po/Makefile.in
41])40])
4241
=== modified file 'data/Makefile.am'
--- data/Makefile.am 2016-07-19 15:43:40 +0000
+++ data/Makefile.am 2017-02-06 17:08:55 +0000
@@ -3,8 +3,6 @@
3CLEANFILES=3CLEANFILES=
4EXTRA_DIST=4EXTRA_DIST=
55
6SUBDIRS = upstart
7
8#6#
9# the systemd unit file7# the systemd unit file
10#8#
@@ -38,18 +36,3 @@
38BUILT_SOURCES += $(upstart_jobs_DATA)36BUILT_SOURCES += $(upstart_jobs_DATA)
39CLEANFILES += $(upstart_jobs_DATA)37CLEANFILES += $(upstart_jobs_DATA)
40EXTRA_DIST += $(upstart_jobs_in)38EXTRA_DIST += $(upstart_jobs_in)
41
42#
43# the xdg autostart job file
44#
45
46xdg_autostartdir = /etc/xdg/autostart
47xdg_autostart_DATA = indicator-printers.desktop
48xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
49$(xdg_autostart_DATA): $(xdg_autostart_in)
50 $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
51BUILT_SOURCES += $(xdg_autostart_DATA)
52CLEANFILES += $(xdg_autostart_DATA)
53EXTRA_DIST += $(xdg_autostart_in)
54
55
5639
=== removed file 'data/indicator-printers.desktop.in'
--- data/indicator-printers.desktop.in 2014-02-20 16:08:19 +0000
+++ data/indicator-printers.desktop.in 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
1[Desktop Entry]
2Type=Application
3Name=Indicator Printers
4Exec=@pkglibexecdir@/indicator-printers-service
5OnlyShowIn=Unity;
6NoDisplay=true
7StartupNotify=false
8Terminal=false
90
=== removed directory 'data/upstart'
=== removed file 'data/upstart/Makefile.am'
--- data/upstart/Makefile.am 2014-02-20 16:06:20 +0000
+++ data/upstart/Makefile.am 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
1BUILT_SOURCES=
2CLEANFILES=
3EXTRA_DIST=
4
5#
6# the upstart xdg autostart override
7#
8
9xdg_autostartdir = $(datadir)/upstart/xdg/autostart
10xdg_autostart_DATA = indicator-printers.desktop
11xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
12$(xdg_autostart_DATA): $(xdg_autostart_in)
13 $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
14BUILT_SOURCES += $(xdg_autostart_DATA)
15CLEANFILES += $(xdg_autostart_DATA)
16EXTRA_DIST += $(xdg_autostart_in)
17
180
=== removed file 'data/upstart/indicator-printers.desktop.in'
--- data/upstart/indicator-printers.desktop.in 2014-02-20 16:08:19 +0000
+++ data/upstart/indicator-printers.desktop.in 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
1[Desktop Entry]
2Type=Application
3Name=Indicator Printers
4Exec=@pkglibexecdir@/indicator-printers-service
5OnlyShowIn=Unity;
6NoDisplay=true
7StartupNotify=false
8Terminal=false
9Hidden=true
100
=== added file 'debian/indicator-printers.maintscript'
--- debian/indicator-printers.maintscript 1970-01-01 00:00:00 +0000
+++ debian/indicator-printers.maintscript 2017-02-06 17:08:55 +0000
@@ -0,0 +1,1 @@
1rm_conffile /etc/xdg/autostart/indicator-printers.desktop 0replaceme~

Subscribers

People subscribed via source and target branches