Merge lp:~brightbox/ubuntu/raring/lvm2/fix-for-1076304 into lp:ubuntu/raring/lvm2

Proposed by Neil Wilson on 2013-01-09
Status: Merged
Merged at revision: 74
Proposed branch: lp:~brightbox/ubuntu/raring/lvm2/fix-for-1076304
Merge into: lp:ubuntu/raring/lvm2
Diff against target: 51 lines (+6/-28)
3 files modified
debian/changelog (+6/-0)
debian/dmeventd.8 (+0/-27)
debian/dmeventd.manpages (+0/-1)
To merge this branch: bzr merge lp:~brightbox/ubuntu/raring/lvm2/fix-for-1076304
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Approve on 2013-01-10
Ubuntu branches 2013-01-09 Pending
Review via email: mp+142535@code.launchpad.net

Description of the change

Again retarget at raring and hopefully without patchmagedon this time.

To post a comment you must log in.
Dimitri John Ledkov (xnox) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-26 10:35:00 +0000
3+++ debian/changelog 2013-01-09 15:37:59 +0000
4@@ -1,3 +1,9 @@
5+lvm2 (2.02.95-5ubuntu2) UNRELEASED; urgency=low
6+
7+ * Use upstream dmeventd.8 manpage (LP: #1076304)
8+
9+ -- Neil Wilson <neil@aldur.co.uk> Wed, 09 Jan 2013 15:28:11 +0000
10+
11 lvm2 (2.02.95-5ubuntu1) raring; urgency=low
12
13 * Merge from Debian unstable, remaining changes (LP: #1082325):
14
15=== removed file 'debian/dmeventd.8'
16--- debian/dmeventd.8 2010-02-16 10:40:31 +0000
17+++ debian/dmeventd.8 1970-01-01 00:00:00 +0000
18@@ -1,27 +0,0 @@
19-.TH DMEVENTD 8 "Aug 18 2008"
20-.SH NAME
21-dmeventd \- Device-mapper event monitoring daemon.
22-.SH SYNOPSIS
23-.ad l
24-.B dmeventd
25-.I [-V|-d|-h]
26-.ad b
27-.SH DESCRIPTION
28-dmeventd is the event monitoring daemon for device-mapper devices.
29-.SH OPTIONS
30-.TP
31-.B -V
32-Show version of dmeventd
33-.TP
34-.B -d
35-Don't fork, run in the foreground
36-.TP
37-.B -h
38-Display command-line arguments
39-.SH AUTHORS
40-Original author: Joe Thornber (thornber@sistina.com)
41-.PP
42-This manual page was written by Luke Yelavich <themuso@ubuntu.com>, for the Ubuntu project (but may be used by others).
43-
44-.SH SEE ALSO
45-Device-mapper resource page: http://sources.redhat.com/dm/
46
47=== removed file 'debian/dmeventd.manpages'
48--- debian/dmeventd.manpages 2010-02-16 10:40:31 +0000
49+++ debian/dmeventd.manpages 1970-01-01 00:00:00 +0000
50@@ -1,1 +0,0 @@
51-debian/dmeventd.8

Subscribers

People subscribed via source and target branches

to all changes: