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
1=== modified file 'configure.ac'
2--- configure.ac 2016-07-19 15:43:40 +0000
3+++ configure.ac 2017-02-06 17:08:55 +0000
4@@ -35,7 +35,6 @@
5 Makefile
6 src/Makefile
7 data/Makefile
8- data/upstart/Makefile
9 test/Makefile
10 po/Makefile.in
11 ])
12
13=== modified file 'data/Makefile.am'
14--- data/Makefile.am 2016-07-19 15:43:40 +0000
15+++ data/Makefile.am 2017-02-06 17:08:55 +0000
16@@ -3,8 +3,6 @@
17 CLEANFILES=
18 EXTRA_DIST=
19
20-SUBDIRS = upstart
21-
22 #
23 # the systemd unit file
24 #
25@@ -38,18 +36,3 @@
26 BUILT_SOURCES += $(upstart_jobs_DATA)
27 CLEANFILES += $(upstart_jobs_DATA)
28 EXTRA_DIST += $(upstart_jobs_in)
29-
30-#
31-# the xdg autostart job file
32-#
33-
34-xdg_autostartdir = /etc/xdg/autostart
35-xdg_autostart_DATA = indicator-printers.desktop
36-xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
37-$(xdg_autostart_DATA): $(xdg_autostart_in)
38- $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
39-BUILT_SOURCES += $(xdg_autostart_DATA)
40-CLEANFILES += $(xdg_autostart_DATA)
41-EXTRA_DIST += $(xdg_autostart_in)
42-
43-
44
45=== removed file 'data/indicator-printers.desktop.in'
46--- data/indicator-printers.desktop.in 2014-02-20 16:08:19 +0000
47+++ data/indicator-printers.desktop.in 1970-01-01 00:00:00 +0000
48@@ -1,8 +0,0 @@
49-[Desktop Entry]
50-Type=Application
51-Name=Indicator Printers
52-Exec=@pkglibexecdir@/indicator-printers-service
53-OnlyShowIn=Unity;
54-NoDisplay=true
55-StartupNotify=false
56-Terminal=false
57
58=== removed directory 'data/upstart'
59=== removed file 'data/upstart/Makefile.am'
60--- data/upstart/Makefile.am 2014-02-20 16:06:20 +0000
61+++ data/upstart/Makefile.am 1970-01-01 00:00:00 +0000
62@@ -1,17 +0,0 @@
63-BUILT_SOURCES=
64-CLEANFILES=
65-EXTRA_DIST=
66-
67-#
68-# the upstart xdg autostart override
69-#
70-
71-xdg_autostartdir = $(datadir)/upstart/xdg/autostart
72-xdg_autostart_DATA = indicator-printers.desktop
73-xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
74-$(xdg_autostart_DATA): $(xdg_autostart_in)
75- $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
76-BUILT_SOURCES += $(xdg_autostart_DATA)
77-CLEANFILES += $(xdg_autostart_DATA)
78-EXTRA_DIST += $(xdg_autostart_in)
79-
80
81=== removed file 'data/upstart/indicator-printers.desktop.in'
82--- data/upstart/indicator-printers.desktop.in 2014-02-20 16:08:19 +0000
83+++ data/upstart/indicator-printers.desktop.in 1970-01-01 00:00:00 +0000
84@@ -1,9 +0,0 @@
85-[Desktop Entry]
86-Type=Application
87-Name=Indicator Printers
88-Exec=@pkglibexecdir@/indicator-printers-service
89-OnlyShowIn=Unity;
90-NoDisplay=true
91-StartupNotify=false
92-Terminal=false
93-Hidden=true
94
95=== added file 'debian/indicator-printers.maintscript'
96--- debian/indicator-printers.maintscript 1970-01-01 00:00:00 +0000
97+++ debian/indicator-printers.maintscript 2017-02-06 17:08:55 +0000
98@@ -0,0 +1,1 @@
99+rm_conffile /etc/xdg/autostart/indicator-printers.desktop 0replaceme~

Subscribers

People subscribed via source and target branches