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

[Andrey Bondarenko]

Trivial fix in man page

[Marc Deslauriers (mdeslaur)]

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

Thanks! :)

review: Approve

=== modified file '.pc/man-su-explanation-729315.patch/logrotate.8'
--- .pc/man-su-explanation-729315.patch/logrotate.8	2014-01-17 09:46:01 +0000
+++ .pc/man-su-explanation-729315.patch/logrotate.8	2015-09-01 07:05:30 +0000
@@ -528,7 +528,7 @@
 .SH FILES
 .PD 0
 .TP 27
-\fI/var/lib/logrotate.status\fR
+\fI/var/lib/logrotate/status\fR
 Default state file.
 .TP 27
 \fI/etc/logrotate.conf\fR
 
=== modified file '.pc/taboo-716649.patch/logrotate.8'
--- .pc/taboo-716649.patch/logrotate.8	2015-05-05 23:18:48 +0000
+++ .pc/taboo-716649.patch/logrotate.8	2015-09-01 07:05:30 +0000
@@ -531,7 +531,7 @@
 .SH FILES
 .PD 0
 .TP 27
-\fI/var/lib/logrotate.status\fR
+\fI/var/lib/logrotate/status\fR
 Default state file.
 .TP 27
 \fI/etc/logrotate.conf\fR
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-05-21 16:58:31 +0000
+++ debian/changelog	2015-09-01 07:05:30 +0000
@@ -1,3 +1,9 @@
+logrotate (3.8.7-2ubuntu2) UNRELEASED; urgency=medium
+
+  * patches/manpage.patch: fix state file path in FILES section (LP: #772214)
+
+ -- Andrey Bondarenko <[e-mail]>  Tue, 01 Sep 2015 11:56:43 +0500
+
 logrotate (3.8.7-2ubuntu1) wily; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
 
=== modified file 'debian/patches/manpage.patch'
--- debian/patches/manpage.patch	2013-10-29 08:20:39 +0000
+++ debian/patches/manpage.patch	2015-09-01 07:05:30 +0000
@@ -4,10 +4,10 @@
 General fixes to manpages.
 
 
-Index: logrotate-3.8.5/logrotate.8
+Index: wily/logrotate.8
 ===================================================================
---- logrotate-3.8.5.orig/logrotate.8	2013-06-26 22:06:31.660308056 +0100
-+++ logrotate-3.8.5/logrotate.8	2013-06-26 22:14:03.333646535 +0100
+--- wily.orig/logrotate.8	2015-09-01 11:00:00.105355000 +0500
++++ wily/logrotate.8	2015-09-01 11:09:55.863528685 +0500
 @@ -11,8 +11,8 @@
  weekly, monthly, or when it grows too large.
  .P
@@ -150,6 +150,15 @@
  overrides the \fBolddir\fR option).
  
  .TP
+@@ -523,7 +528,7 @@
+ .SH FILES
+ .PD 0
+ .TP 27
+-\fI/var/lib/logrotate.status\fR
++\fI/var/lib/logrotate/status\fR
+ Default state file.
+ .TP 27
+ \fI/etc/logrotate.conf\fR
 @@ -532,12 +537,15 @@
  .SH SEE ALSO
  .BR gzip (1)
 
=== modified file 'logrotate.8'
--- logrotate.8	2015-05-21 16:58:31 +0000
+++ logrotate.8	2015-09-01 07:05:30 +0000
@@ -531,7 +531,7 @@
 .SH FILES
 .PD 0
 .TP 27
-\fI/var/lib/logrotate.status\fR
+\fI/var/lib/logrotate/status\fR
 Default state file.
 .TP 27
 \fI/etc/logrotate.conf\fR