Ubuntu
logrotate package

Merge lp:~abone/ubuntu/wily/logrotate/fix-for-772214 into lp:ubuntu/wily/logrotate

  1. Wily (15.10)
  2. fix-for-772214
  3. Merge into wily
Proposed by Andrey Bondarenko
Status: Merged
Merge reported by: Marc Deslauriers
Merged at revision: not available
Proposed branch: lp:~abone/ubuntu/wily/logrotate/fix-for-772214
Merge into: lp:ubuntu/wily/logrotate
Diff against target: 86 lines (+21/-6)
5 files modified
.pc/man-su-explanation-729315.patch/logrotate.8 (+1/-1)
.pc/taboo-716649.patch/logrotate.8 (+1/-1)
debian/changelog (+6/-0)
debian/patches/manpage.patch (+12/-3)
logrotate.8 (+1/-1)
To merge this branch: bzr merge lp:~abone/ubuntu/wily/logrotate/fix-for-772214
Reviewer Review Type Date Requested Status
Marc Deslauriers Approve
Review via email: mp+269713@code.launchpad.net

Description of the change

Trivial fix in man page

To post a comment you must log in.
Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

ACK on the merge proposal. Uploaded to Wily with some minor formatting changes, and sent to Debian.

Thanks! :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.pc/man-su-explanation-729315.patch/logrotate.8'
2--- .pc/man-su-explanation-729315.patch/logrotate.8 2014-01-17 09:46:01 +0000
3+++ .pc/man-su-explanation-729315.patch/logrotate.8 2015-09-01 07:05:30 +0000
4@@ -528,7 +528,7 @@
5 .SH FILES
6 .PD 0
7 .TP 27
8-\fI/var/lib/logrotate.status\fR
9+\fI/var/lib/logrotate/status\fR
10 Default state file.
11 .TP 27
12 \fI/etc/logrotate.conf\fR
13
14=== modified file '.pc/taboo-716649.patch/logrotate.8'
15--- .pc/taboo-716649.patch/logrotate.8 2015-05-05 23:18:48 +0000
16+++ .pc/taboo-716649.patch/logrotate.8 2015-09-01 07:05:30 +0000
17@@ -531,7 +531,7 @@
18 .SH FILES
19 .PD 0
20 .TP 27
21-\fI/var/lib/logrotate.status\fR
22+\fI/var/lib/logrotate/status\fR
23 Default state file.
24 .TP 27
25 \fI/etc/logrotate.conf\fR
26
27=== modified file 'debian/changelog'
28--- debian/changelog 2015-05-21 16:58:31 +0000
29+++ debian/changelog 2015-09-01 07:05:30 +0000
30@@ -1,3 +1,9 @@
31+logrotate (3.8.7-2ubuntu2) UNRELEASED; urgency=medium
32+
33+ * patches/manpage.patch: fix state file path in FILES section (LP: #772214)
34+
35+ -- Andrey Bondarenko <abondarenko@users.sourceforge.net> Tue, 01 Sep 2015 11:56:43 +0500
36+
37 logrotate (3.8.7-2ubuntu1) wily; urgency=low
38
39 * Merge from Debian unstable. Remaining changes:
40
41=== modified file 'debian/patches/manpage.patch'
42--- debian/patches/manpage.patch 2013-10-29 08:20:39 +0000
43+++ debian/patches/manpage.patch 2015-09-01 07:05:30 +0000
44@@ -4,10 +4,10 @@
45 General fixes to manpages.
46
47
48-Index: logrotate-3.8.5/logrotate.8
49+Index: wily/logrotate.8
50 ===================================================================
51---- logrotate-3.8.5.orig/logrotate.8 2013-06-26 22:06:31.660308056 +0100
52-+++ logrotate-3.8.5/logrotate.8 2013-06-26 22:14:03.333646535 +0100
53+--- wily.orig/logrotate.8 2015-09-01 11:00:00.105355000 +0500
54++++ wily/logrotate.8 2015-09-01 11:09:55.863528685 +0500
55 @@ -11,8 +11,8 @@
56 weekly, monthly, or when it grows too large.
57 .P
58@@ -150,6 +150,15 @@
59 overrides the \fBolddir\fR option).
60
61 .TP
62+@@ -523,7 +528,7 @@
63+ .SH FILES
64+ .PD 0
65+ .TP 27
66+-\fI/var/lib/logrotate.status\fR
67++\fI/var/lib/logrotate/status\fR
68+ Default state file.
69+ .TP 27
70+ \fI/etc/logrotate.conf\fR
71 @@ -532,12 +537,15 @@
72 .SH SEE ALSO
73 .BR gzip (1)
74
75=== modified file 'logrotate.8'
76--- logrotate.8 2015-05-21 16:58:31 +0000
77+++ logrotate.8 2015-09-01 07:05:30 +0000
78@@ -531,7 +531,7 @@
79 .SH FILES
80 .PD 0
81 .TP 27
82-\fI/var/lib/logrotate.status\fR
83+\fI/var/lib/logrotate/status\fR
84 Default state file.
85 .TP 27
86 \fI/etc/logrotate.conf\fR

Subscribers

People subscribed via source and target branches