Merge lp:~dstansby-deactivatedaccount/ubuntu/lucid/sysvinit/sysvinit-fix-529715 into lp:~ubuntu-branches/ubuntu/maverick/sysvinit/maverick-old

Proposed by David Stansby
Status: Rejected
Rejected by: Martin Pitt
Proposed branch: lp:~dstansby-deactivatedaccount/ubuntu/lucid/sysvinit/sysvinit-fix-529715
Merge into: lp:~ubuntu-branches/ubuntu/maverick/sysvinit/maverick-old
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/sysv-rc/etc/init.d/rc (+1/-1)
To merge this branch: bzr merge lp:~dstansby-deactivatedaccount/ubuntu/lucid/sysvinit/sysvinit-fix-529715
Reviewer Review Type Date Requested Status
Martin Pitt Disapprove
Review via email: mp+27625@code.launchpad.net

Description of the change

Fixed typo

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks for the fix! This is already fixed in Debian sid, so no forwarding necessary. Therefore we don't really need an upload for this specifically, as it's just a small cosmetical problem and will cause a conffile change. Instead, this will be fixed when we merge sysvinit with Debian the next time.

review: Disapprove

Unmerged revisions

115. By David Stansby

*Fix typo (fixed lp: #529715)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2009-06-25 11:08:20 +0000
+++ debian/changelog 2010-06-15 13:27:27 +0000
@@ -1,3 +1,9 @@
1sysvinit (2.86.ds1-61ubuntu14) maverick; urgency=low
2
3 *Fix typo (fixed lp: #529715)
4
5 -- David Stansby <dstansby@gmail.com> Tue, 15 Jun 2010 14:16:49 +0100
6
1sysvinit (2.86.ds1-61ubuntu13) karmic; urgency=low7sysvinit (2.86.ds1-61ubuntu13) karmic; urgency=low
28
3 * debian/initscripts/lib/init/bootclean.sh: announce execution9 * debian/initscripts/lib/init/bootclean.sh: announce execution
410
=== modified file 'debian/sysv-rc/etc/init.d/rc'
--- debian/sysv-rc/etc/init.d/rc 2008-11-05 07:29:32 +0000
+++ debian/sysv-rc/etc/init.d/rc 2010-06-15 13:27:27 +0000
@@ -190,7 +190,7 @@
190 # problem irrelevant. [pere 2005-09-10]190 # problem irrelevant. [pere 2005-09-10]
191 [ -n "$scripts" ] && $debug startpar -a $action $scripts191 [ -n "$scripts" ] && $debug startpar -a $action $scripts
192192
193 # Jump back one step to compencate for stepping one193 # Jump back one step to compensate for stepping one
194 # time too many in the for loop, and to keep the same194 # time too many in the for loop, and to keep the same
195 # location as the startup_progress call in the *.sh195 # location as the startup_progress call in the *.sh
196 # case.196 # case.

Subscribers

People subscribed via source and target branches

to all changes: