Merge lp://qastaging/~james-page/ubuntu/quantal/samba/cups-integration into lp://qastaging/ubuntu/quantal/samba

Proposed by James Page
Status: Merged
Merge reported by: James Page
Merged at revision: not available
Proposed branch: lp://qastaging/~james-page/ubuntu/quantal/samba/cups-integration
Merge into: lp://qastaging/ubuntu/quantal/samba
Diff against target: 49 lines (+22/-4)
3 files modified
debian/changelog (+10/-0)
debian/samba.reload-smbd.conf (+12/-0)
debian/samba.smbd.upstart (+0/-4)
To merge this branch: bzr merge lp://qastaging/~james-page/ubuntu/quantal/samba/cups-integration
Reviewer Review Type Date Requested Status
Steve Langasek Needs Fixing
Review via email: mp+123503@code.qastaging.launchpad.net

Description of the change

Refactored integration with cups to ensure that samba configuration is reloaded after cups has started.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

+ - d/samba.reload-smbd.upstart: Add upstart task which reloads smbd
<snip>
=== added file 'debian/samba.reload-smbd.conf'

mismatched names; should really be .upstart.

Also, looks like a change to debian/rules is missing here to get debhelper to install the added script (dh_installinit -psamba --upstart-only --no-start --name reload-smbd)

Otherwise, looks good.

review: Needs Fixing
Revision history for this message
James Page (james-page) wrote :

Issues fixed, uploaded to quantal

Thanks for the feedback.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: