Merge ~waveform/ubuntu/+source/lvm2:merge into ubuntu/+source/lvm2:debian/sid

[Dave Jones]

[Paride Legovini (paride)]

The diffs all match the expected ones (including the diff to the Debian tags), I rebuilt and did some simple testing of the package, it LGTM. Uploading.

review: Approve

[Paride Legovini (paride)]

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading lvm2_2.03.16-3ubuntu1.dsc: done.
  Uploading lvm2_2.03.16-3ubuntu1.debian.tar.xz: done.
  Uploading lvm2_2.03.16-3ubuntu1_source.buildinfo: done.
  Uploading lvm2_2.03.16-3ubuntu1_source.changes: done.

Unmerged commits

8f9ec08... by Dave Jones on 2024-02-22

reconstruct-changelog

063b3e7... by Dave Jones on 2024-02-22

metadata

c2b88e5... by Dave Jones on 2024-02-22

merge-changelog

3d5e737... by Dave Jones on 2022-08-22

  * Don't build udeb targets.

eb870f4... by Dave Jones on 2022-08-22

    - d/control: add thin-provisioning-tools build-dep as configure wants it
      around for some checks at build time.

bdd5d23... by Dave Jones on 2022-08-22

    - Fix patch of systemd-run in 69-lvm-metad.rules

ced5439... by Dave Jones on 2022-08-22

    - Do not start lvm2-monitor in containers (LP #1576341)

8b02f2b... by Dave Jones on 2022-08-22

    - debian/initramfs-tools/lvm2/hooks/lvm2: depend on udev since we ship
      udev rules.

1d8dc37... by Dave Jones on 2022-08-22

    - debian/rules:
      + Copy .po file to .pot file for Rosetta (Ubuntu specific).

0e34e50... by Dave Jones on 2022-08-22

    - Add enable-issue-discards.patch: Enable "issue_discards" option by
      default to trim SSDs when changing PVs. This option has no effect if the
      kernel or the drive does not support trimming, so it's safe to enable by
      default. (Debian #717313)

diff --git a/debian/changelog b/debian/changelog
index bb1ac81..c1c4acd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+lvm2 (2.03.16-3ubuntu1) noble; urgency=medium
+
+  * Merge from Debian unstable (LP: #2054683). Remaining changes:
+    - Lower libdevmapper1.02.1's Depends: dmsetup to a Recommends:. This
+      breaks the circular dependency that causes upgrade failures. As dmsetup
+      is "Priority: required", this has no other practical consequences.
+      (Debian #586424)
+    - Add debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2: We cannot
+      properly synthesize LVM LV change events with udevadm trigger, so if we
+      use LVM, we need to let it finish; otherwise we get missing LV symlinks.
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+    - debian/rules:
+      - Copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/initramfs-tools/lvm2/hooks/lvm2: depend on udev since we ship
+      udev rules.
+    - Do not start lvm2-monitor in containers (LP #1576341)
+    - Fix patch of systemd-run in 69-lvm-metad.rules
+    - d/control: add thin-provisioning-tools build-dep as configure wants it
+      around for some checks at build time.
+    - Don't build udeb targets.
+
+ -- Dave Jones <[e-mail]>  Thu, 22 Feb 2024 10:28:18 +0000
+
 lvm2 (2.03.16-3) unstable; urgency=medium
 
   * Remove obsolete dependency on lsb-base.
@@ -6,6 +32,35 @@ lvm2 (2.03.16-3) unstable; urgency=medium
 
  -- Bastian Blank <[e-mail]>  Sat, 06 Jan 2024 18:47:24 +0100
 
+lvm2 (2.03.16-2ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian unstable (LP: #2020464). Remaining changes:
+    - Lower libdevmapper1.02.1's Depends: dmsetup to a Recommends:. This
+      breaks the circular dependency that causes upgrade failures. As dmsetup
+      is "Priority: required", this has no other practical consequences.
+      (Debian #586424)
+    - Add debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2: We cannot
+      properly synthesize LVM LV change events with udevadm trigger, so if we
+      use LVM, we need to let it finish; otherwise we get missing LV symlinks.
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+    - debian/rules:
+      - Copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/initramfs-tools/lvm2/hooks/lvm2: depend on udev since we ship
+      udev rules.
+    - Do not start lvm2-monitor in containers (LP #1576341)
+    - Fix patch of systemd-run in 69-lvm-metad.rules
+    - d/control: add thin-provisioning-tools build-dep as configure wants it
+      around for some checks at build time.
+    - Don't build udeb targets.
+  * Removed obsolete patches/changes:
+    - Disable lto build. Other distros build it with lto, however Debian has
+      an old work around from 2015 for an ABI break. See #791888.
+
+ -- Dave Jones <[e-mail]>  Tue, 23 May 2023 11:20:09 +0100
+
 lvm2 (2.03.16-2) unstable; urgency=medium
 
   * Remove remaining unused init scripts.
@@ -13,6 +68,44 @@ lvm2 (2.03.16-2) unstable; urgency=medium
 
  -- Bastian Blank <[e-mail]>  Wed, 19 Oct 2022 21:37:31 +0200
 
+lvm2 (2.03.16-1ubuntu1) kinetic; urgency=medium
+
+  * Merge from Debian unstable (LP: #1987340). Remaining changes:
+    - Lower libdevmapper1.02.1's Depends: dmsetup to a Recommends:. This
+      breaks the circular dependency that causes upgrade failures. As dmsetup
+      is "Priority: required", this has no other practical consequences.
+      (Closes: #586424, LP: #1032823)
+    - Add debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2: We cannot
+      properly synthesize LVM LV change events with udevadm trigger, so if we
+      use LVM, we need to let it finish; otherwise we get missing LV symlinks.
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+    - debian/rules:
+      - Copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/initramfs-tools/lvm2/hooks/lvm2: depend on udev since we ship
+      udev rules.
+    - Do not start lvm2-monitor in containers (LP: #1576341)
+    - Fix patch of systemd-run in 69-lvm-metad.rules
+    - d/control: add thin-provisioning-tools build-dep as configure wants it
+      around for some checks at build time.
+    - Disable lto build. Other distros build it with lto, however Debian has
+      an old work around from 2015 for an ABI break. See #791888.
+    - Don't build udeb targets.
+  * Removed obsolete patches/changes:
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/dmsetup-udeb.install: install udev rules in udebs (Debian
+      #504341).
+      - Ship correct udev rules in lvm2-udeb package.
+    - Enable udev-sync in udeb build as it is used by partman when
+      partitioning devicemapper devices.
+    - Define PYTHON_PREFIX in make.tmpl.in for new ax-python.
+  * Removed patches obsoleted/merged by upstream:
+    - Fix file mode of debian/initramfs-tools/lvm2/hooks/lvm2 (LP: #1915579)
+
+ -- Dave Jones <[e-mail]>  Mon, 22 Aug 2022 21:35:55 +0100
+
 lvm2 (2.03.16-1) unstable; urgency=medium
 
   * New upstream release.
@@ -36,6 +129,137 @@ lvm2 (2.03.15-1) unstable; urgency=medium
 
  -- Bastian Blank <[e-mail]>  Sun, 03 Jul 2022 20:09:13 +0200
 
+lvm2 (2.03.11-2.1ubuntu4) jammy; urgency=medium
+
+  * No-change rebuild to update maintainer scripts, see LP: 1959054
+
+ -- Dave Jones <[e-mail]>  Wed, 16 Feb 2022 17:06:22 +0000
+
+lvm2 (2.03.11-2.1ubuntu3) impish; urgency=medium
+
+  * Fix-up noudeb build profile support.
+  * Define PYTHON_PREFIX in make.tmpl.in for new ax-python.
+  * Fixes FTBFS in impish.
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 06 Oct 2021 10:31:36 +0100
+
+lvm2 (2.03.11-2.1ubuntu2) impish; urgency=medium
+
+  * Don't build udeb targets.
+  * Work around an installation issue about installing python files into
+    lib/python* instead of usr/lib/python*.
+
+ -- Matthias Klose <[e-mail]>  Fri, 01 Oct 2021 10:49:59 +0200
+
+lvm2 (2.03.11-2.1ubuntu1) impish; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Lower libdevmapper1.02.1's Depends: dmsetup to a Recommends:. This
+      breaks the circular dependency that causes upgrade failures. As dmsetup
+      is "Priority: required", this has no other practical consequences.
+      (Closes: #586424, LP: #1032823)
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/dmsetup-udeb.install: install udev rules in udebs (Debian
+      #504341).
+      - Ship correct udev rules in lvm2-udeb package.
+    - Enable udev-sync in udeb build as it is used by partman when
+      partitioning devicemapper devices.
+    - Add debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2: We cannot
+      properly synthesize LVM LV change events with udevadm trigger, so if we
+      use LVM, we need to let it finish; otherwise we get missing LV symlinks.
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+    - debian/rules:
+      + Copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/initramfs-tools/lvm2/hooks/lvm2: depend on udev since we ship
+      udev rules.
+    - Do not start lvm2-monitor in containers (LP #1576341)
+    - Fix patch of systemd-run in 69-lvm-metad.rules
+    - d/control: add thin-provisioning-tools build-dep as configure wants it
+      around for some checks at build time.
+    - Fix file mode of debian/initramfs-tools/lvm2/hooks/lvm2 (LP: #1915579)
+    - Disable lto build. Other distros build it with lto, however Debian has
+      an old work around from 2015 for an ABI break. See #791888.
+  * Removed obsolete patches/changes:
+    - Add debian/initramfs-tools/lvm2/scripts/init-premount/lvm2: failure
+      hooks to help fix bad boots (Debian #468115) (mountroot failure hooks
+      removed in last initramfs-tools merge)
+    - Disable udev using systemd-run background jobs in udeb build as
+      systemd is not available. (removed previously, but erroneously noted)
+    - Add udev-prefix spec to udeb build (erroneous addition)
+  * Removed patches obsoleted/merged by upstream:
+    - scripts/blkdeactivate.sh.in: Refer to /usr/bin/sort, not /bin/sort
+
+ -- Dave Jones <[e-mail]>  Wed, 19 May 2021 18:35:39 +0100
+
+lvm2 (2.03.11-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch to fix path to sort in blkdeactivate. (closes: #946882)
+
+ -- Ivo De Decker <[e-mail]>  Mon, 22 Feb 2021 21:39:14 +0000
+
+lvm2 (2.03.11-2ubuntu4) hirsute; urgency=medium
+
+  * Disable lto build. Other distros build it with lto, however Debian has
+    an old work around from 2015 for an ABI break. See #791888.
+
+ -- Matthias Klose <[e-mail]>  Tue, 23 Mar 2021 12:36:07 +0100
+
+lvm2 (2.03.11-2ubuntu3) hirsute; urgency=medium
+
+  * Fix file mode of debian/initramfs-tools/lvm2/hooks/lvm2 (LP: #1915579)
+
+ -- Lukas Märdian <[e-mail]>  Thu, 04 Mar 2021 11:00:58 +0100
+
+lvm2 (2.03.11-2ubuntu2) hirsute; urgency=medium
+
+  * No-change rebuild to drop the udeb package.
+
+ -- Matthias Klose <[e-mail]>  Mon, 22 Feb 2021 10:35:19 +0100
+
+lvm2 (2.03.11-2ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Lower libdevmapper1.02.1's Depends: dmsetup to a Recommends:. This
+      breaks the circular dependency that causes upgrade failures. As dmsetup
+      is "Priority: required", this has no other practical consequences.
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/dmsetup-udeb.install: install udev rules in udebs
+      (Debian #504341).
+    - Add debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2: We cannot
+      properly synthesize LVM LV change events with udevadm trigger, so
+      if we use LVM, we need to let it finish; otherwise we get missing LV
+      symlinks.
+    - Add debian/initramfs-tools/lvm2/scripts/init-premount/lvm2: failure
+      hooks to help fix bad boots (Debian #468115)
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+    - debian/rules:
+      + Copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/initramfs-tools/lvm2/hooks/lvm2: depend on udev since
+      we ship udev rules.
+    - Do not start lvm2-monitor in containers (LP #1576341)
+    - scripts/blkdeactivate.sh.in: Refer to /usr/bin/sort, not /bin/sort
+    - Fix patch of systemd-run in 69-lvm-metad.rules
+    - Enable udev-sync in udeb build as it is used by partman when
+      partitioning devicemapper devices.
+    - Disable udev using systemd-run background jobs in udeb build as
+      systemd is not available.
+    - Ship correct udev rules in lvm2-udeb package.
+    - d/control: add thin-provisioning-tools build-dep as configure
+      wants it around for some checks at build time.
+  * Dropped changes, included upstream:
+    - Include raid1 in the list of modules installed by the initramfs hook
+    - Detect systemd in udev rule at runtime:
+      debian/patches/Detect-systemd-at-run-time-in-69-dm-lvm-metad.rules.patch
+
+ -- Lukas Märdian <[e-mail]>  Tue, 09 Feb 2021 11:55:15 +0100
+
 lvm2 (2.03.11-2) unstable; urgency=medium
 
   * Make sure lvmlockd can use sd notify. (closes: #980225)
@@ -87,6 +311,67 @@ lvm2 (2.03.09-1) unstable; urgency=medium
 
  -- Bastian Blank <[e-mail]>  Sat, 25 Jul 2020 21:14:19 +0200
 
+lvm2 (2.03.07-1ubuntu4) hirsute; urgency=medium
+
+  * No-change rebuild to build with python3.9 as default.
+
+ -- Matthias Klose <[e-mail]>  Thu, 19 Nov 2020 20:19:25 +0100
+
+lvm2 (2.03.07-1ubuntu3) groovy; urgency=medium
+
+  * Revert "Fix incorrect path to mountroot fail hook. LP: #1871154"
+    regression is in the initramfs-tools package.
+
+ -- Dimitri John Ledkov <[e-mail]>  Sat, 30 May 2020 15:02:01 +0100
+
+lvm2 (2.03.07-1ubuntu2) groovy; urgency=medium
+
+  * Fix incorrect path to mountroot fail hook. LP: #1871154
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 26 May 2020 13:11:44 +0100
+
+lvm2 (2.03.07-1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Lower libdevmapper1.02.1's Depends: dmsetup to a Recommends:. This
+      breaks the circular dependency that causes upgrade failures. As dmsetup
+      is "Priority: required", this has no other practical consequences.
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/dmsetup-udeb.install: install udev rules in udebs
+      (Debian #504341).
+    - Add debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2: We cannot
+      properly synthesize LVM LV change events with udevadm trigger, so
+      if we use LVM, we need to let it finish; otherwise we get missing LV
+      symlinks.
+    - Add debian/initramfs-tools/lvm2/scripts/init-premount/lvm2: failure
+      hooks to help fix bad boots (Debian #468115)
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+    - debian/rules:
+      + Copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/initramfs-tools/lvm2/hooks/lvm2: depend on udev since
+      we ship udev rules.
+    - Do not start lvm2-monitor in containers (LP #1576341)
+    - scripts/blkdeactivate.sh.in: Refer to /usr/bin/sort, not /bin/sort
+    - Fix patch of systemd-run in 69-lvm-metad.rules
+    - Enable udev-sync in udeb build as it is used by partman when
+      partitioning devicemapper devices.
+    - Disable udev using systemd-run background jobs in udeb build as
+      systemd is not available.
+    - Ship correct udev rules in lvm2-udeb package.
+    - Detect systemd in udev rule at runtime.
+    - d/control: add thin-provisioning-tools build-dep as configure
+      wants it around for some checks at build time.
+    - Include raid1 in the list of modules installed by the initramfs hook
+    - Detect systemd in udev rule at runtime.
+  * Dropped changes, included upstream:
+    - d/p/lp-1842436-*: Avoid creation of mixed-blocksize PV on LVM
+      volume groups as it can cause FS corruption
+
+ -- Steve Langasek <[e-mail]>  Thu, 13 Feb 2020 13:21:51 -0800
+
 lvm2 (2.03.07-1) unstable; urgency=medium
 
   * New upstream release.
@@ -108,6 +393,93 @@ lvm2 (2.03.02-3) unstable; urgency=medium
 
  -- Bastian Blank <[e-mail]>  Fri, 21 Jun 2019 12:29:17 +0200
 
+lvm2 (2.03.02-2ubuntu8) focal; urgency=medium
+
+  * No-change rebuild to build with python3.8.
+
+ -- Matthias Klose <[e-mail]>  Sat, 25 Jan 2020 04:35:13 +0000
+
+lvm2 (2.03.02-2ubuntu7) focal; urgency=medium
+
+  * Include raid1 in the list of modules installed by the initramfs hook,
+    as this is not a kernel module dependency of dm-raid but if the user's
+    root disk is configured as RAID1 it is definitely required.
+    Closes: #841423, LP: #1509717.
+
+ -- Steve Langasek <[e-mail]>  Fri, 22 Nov 2019 13:59:47 -0800
+
+lvm2 (2.03.02-2ubuntu6) eoan; urgency=medium
+
+  * d/control: stop dropping thin-provisioning-tools to Suggests as it
+    is ready to be promoted via MIR LP 1828887. Fixes usability issues
+    of thin-provisioning-tools not being installed by default (LP: #1657646).
+    - d/control: also add thin-provisioning-tools build-dep as configure
+      wants it around for some checks at build time.
+  * d/p/lp-1842436-*: Avoid creation of mixed-blocksize PV on LVM
+    volume groups as it can cause FS corruption (LP: #1842436)
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 06 Sep 2019 08:23:10 +0200
+
+lvm2 (2.03.02-2ubuntu5) eoan; urgency=medium
+
+  * Detect systemd in udev rule at runtime.
+
+ -- Julian Andres Klode <[e-mail]>  Thu, 25 Jul 2019 16:11:11 -0300
+
+lvm2 (2.03.02-2ubuntu4) eoan; urgency=medium
+
+  * Ship correct udev rules in lvm2-udeb package.
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 20 Jun 2019 20:50:55 +0100
+
+lvm2 (2.03.02-2ubuntu3) eoan; urgency=medium
+
+  * Enable udev-sync in udeb build as it is used by partman when
+    partitioning devicemapper devices.
+  * Disable udev using systemd-run background jobs in udeb build as
+    systemd is not available.
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 20 Jun 2019 11:38:55 +0100
+
+lvm2 (2.03.02-2ubuntu2) eoan; urgency=medium
+
+  * Fix patch of systemd-run in 69-lvm-metad.rules (LP: #1830169)
+
+ -- Julian Andres Klode <[e-mail]>  Thu, 23 May 2019 16:24:43 +0200
+
+lvm2 (2.03.02-2ubuntu1) eoan; urgency=low
+
+  * Merge with Debian unstable. Remaining changes:
+    - Lower libdevmapper1.02.1's Depends: dmsetup to a Recommends:. This
+      breaks the circular dependency that causes upgrade failures. As dmsetup
+      is "Priority: required", this has no other practical consequences.
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/dmsetup-udeb.install: install udev rules in udebs
+      (Debian #504341).
+    - Add debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2: We cannot
+      properly synthesize LVM LV change events with udevadm trigger, so
+      if we use LVM, we need to let it finish; otherwise we get missing LV
+      symlinks.
+    - Add debian/initramfs-tools/lvm2/scripts/init-premount/lvm2: failure
+      hooks to help fix bad boots (Debian #468115)
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+    - debian/rules:
+      + Copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/initramfs-tools/lvm2/hooks/lvm2: depend on udev since
+      we ship udev rules.
+    - Do not start lvm2-monitor in containers (LP #1576341)
+    - scripts/blkdeactivate.sh.in: Refer to /usr/bin/sort, not /bin/sort
+  * Removed changes, related to dropped services:
+    - Add and install clvmd resource agent
+    - Do not start lvmetad when inside a container.
+    - debian/clvm.maintscripts: Drop the /etc/default/clvm conffile on
+      upgrade.  This delta can be dropped after 18.04 release.
+
+ -- Julian Andres Klode <[e-mail]>  Wed, 24 Apr 2019 11:40:02 +0200
+
 lvm2 (2.03.02-2) unstable; urgency=medium
 
   * Remove lvm2-lvmetad init script as well. (closes: #917159)
@@ -152,6 +524,61 @@ lvm2 (2.03.01-1) experimental; urgency=medium
 
  -- Bastian Blank <[e-mail]>  Sat, 08 Dec 2018 18:12:40 +0100
 
+lvm2 (2.02.176-4.1ubuntu4) disco; urgency=medium
+
+  * No-change rebuild to build for python3.7 as the default.
+
+ -- Matthias Klose <[e-mail]>  Wed, 31 Oct 2018 12:35:49 +0000
+
+lvm2 (2.02.176-4.1ubuntu3) bionic; urgency=medium
+
+  * scripts/blkdeactivate.sh.in: Refer to /usr/bin/sort, not /bin/sort
+
+ -- Julian Andres Klode <[e-mail]>  Thu, 12 Apr 2018 10:35:07 +0200
+
+lvm2 (2.02.176-4.1ubuntu2) bionic; urgency=medium
+
+  * Demote Recommends: thin-provisioning-tools to Suggests, as it's not
+    in main.
+
+ -- Julian Andres Klode <[e-mail]>  Tue, 30 Jan 2018 08:31:47 +0100
+
+lvm2 (2.02.176-4.1ubuntu1) bionic; urgency=low
+
+  * Merge with Debian unstable. Remaining changes:
+    - Add and install clvmd resource agent
+    - Lower libdevmapper1.02.1's Depends: dmsetup to a Recommends:. This
+      breaks the circular dependency that causes upgrade failures. As dmsetup
+      is "Priority: required", this has no other practical consequences.
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/dmsetup-udeb.install: install udev rules in udebs
+      (Debian #504341).
+    - Add debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2: We cannot
+      properly synthesize LVM LV change events with udevadm trigger, so
+      if we use LVM, we need to let it finish; otherwise we get missing LV
+      symlinks.
+    - Add debian/initramfs-tools/lvm2/scripts/init-premount/lvm2: failure
+      hooks to help fix bad boots (Debian #468115)
+    - Do not start lvmetad when inside a container.
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+    - debian/rules:
+      + Copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/initramfs-tools/lvm2/hooks/lvm2: depend on udev since
+      we ship udev rules.
+    - debian/clvm.maintscripts: Drop the /etc/default/clvm conffile on
+      upgrade.  This delta can be dropped after 18.04 release.
+    - Do not start lvm2-monitor in containers (LP #1576341)
+  * Dropped, merged upstream:
+    - Add a patch to fix crashes on 32bit platforms:
+      + 0013-fix-lvmetad-32bit.patch
+    - d/p/fix-strips-limit.patch: Fix regression limiting number of
+      stripes to 8 (LP #1675770)
+
+ -- Julian Andres Klode <[e-mail]>  Fri, 26 Jan 2018 17:06:20 +0100
+
 lvm2 (2.02.176-4.1) unstable; urgency=high
 
   * Non-maintainer upload.
@@ -225,6 +652,58 @@ lvm2 (2.02.173-1) unstable; urgency=medium
 
  -- Bastian Blank <[e-mail]>  Sun, 13 Aug 2017 14:17:51 +0200
 
+lvm2 (2.02.168-2ubuntu3) artful; urgency=medium
+
+  * No-change rebuild to build to drop python3.5.
+
+ -- Matthias Klose <[e-mail]>  Sat, 05 Aug 2017 16:25:53 +0000
+
+lvm2 (2.02.168-2ubuntu2) artful; urgency=medium
+
+  * No change rebuild to add Python 3.6 support.
+
+ -- Michael Hudson-Doyle <[e-mail]>  Mon, 15 May 2017 15:32:22 +1200
+
+lvm2 (2.02.168-2ubuntu1) artful; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Add and install clvmd resource agent
+    - Lower libdevmapper1.02.1's Depends: dmsetup to a Recommends:. This
+      breaks the circular dependency that causes upgrade failures. As dmsetup
+      is "Priority: required", this has no other practical consequences.
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/dmsetup-udeb.install: install udev rules in udebs
+      (Debian #504341).
+    - Add debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2: We cannot
+      properly synthesize LVM LV change events with udevadm trigger, so
+      if we use LVM, we need to let it finish; otherwise we get missing LV
+      symlinks.
+    - Add debian/initramfs-tools/lvm2/scripts/init-premount/lvm2: failure
+      hooks to help fix bad boots (Debian #468115)
+    - Do not start lvmetad when inside a container.
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+    - debian/rules:
+      + Copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/initramfs-tools/lvm2/hooks/lvm2: depend on udev since
+      we ship udev rules.
+    - debian/clvm.maintscripts: Drop the /etc/default/clvm conffile on
+      upgrade.  This delta can be dropped after 18.04 release.
+    - Add a patch to fix crashes on 32bit platforms:
+      + 0013-fix-lvmetad-32bit.patch
+      [ patch renamed ]
+    - d/p/fix-strips-limit.patch: Fix regression limiting number of
+      stripes to 8 (LP #1675770)
+      [ patch refreshed ]
+
+  [ Balint Reczey ]
+  * Do not start lvm2-monitor in containers (LP #1576341)
+    [ patch renamed ]
+
+ -- Nishanth Aravamudan <[e-mail]>  Mon, 08 May 2017 16:59:53 -0700
+
 lvm2 (2.02.168-2) unstable; urgency=medium
 
   * Don't try to disable cluster locking on clvm purge. (closes: #856696)
@@ -240,24 +719,183 @@ lvm2 (2.02.168-1) unstable; urgency=medium
 
  -- Bastian Blank <[e-mail]>  Fri, 16 Dec 2016 15:29:17 +0100
 
+lvm2 (2.02.167-1ubuntu6) artful; urgency=medium
+
+  * Drop:
+    - Depend on 'dlm' rather than 'dlm-controld', the package is named
+      differently in Ubuntu.
+      + LP: #1669133
+      [ Package is renamed to dlm-controld in line with Debian ]
+
+ -- Nishanth Aravamudan <[e-mail]>  Wed, 03 May 2017 17:14:00 -0700
+
+lvm2 (2.02.167-1ubuntu5) zesty; urgency=medium
+
+  * d/p/fix-strips-limit.patch: Fix regression limiting number of
+    stripes to 8 (LP: #1675770)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 27 Mar 2017 09:23:51 +0200
+
+lvm2 (2.02.167-1ubuntu2) zesty; urgency=medium
+
+  * Add a patch to fix crashes on 32bit platforms:
+    - 0011-fix-lvmetad-32bit.patch
+
+ -- Stéphane Graber <[e-mail]>  Fri, 10 Mar 2017 14:22:35 -0500
+
+lvm2 (2.02.167-1ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add and install clvmd resource agent
+    - Lower libdevmapper1.02.1's Depends: dmsetup to a Recommends:. This
+      breaks the circular dependency that causes upgrade failures. As dmsetup
+      is "Priority: required", this has no other practical consequences.
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/dmsetup-udeb.install: install udev rules in udebs
+      (Debian #504341).
+    - Add debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2: We cannot
+      properly synthesize LVM LV change events with udevadm trigger, so
+      if we use LVM, we need to let it finish; otherwise we get missing LV
+      symlinks.
+    - Add debian/initramfs-tools/lvm2/scripts/init-premount/lvm2: failure
+      hooks to help fix bad boots (Debian #468115)
+    - Do not start lvmetad when inside a container.
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+    - debian/rules:
+      + Copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/initramfs-tools/lvm2/hooks/lvm2: depend on udev since
+      we ship udev rules.
+    - Depend on 'dlm' rather than 'dlm-controld', the package is named
+      differently in Ubuntu.
+    - debian/clvm.maintscripts: Drop the /etc/default/clvm conffile on
+      upgrade.  This delta can be dropped after 18.04 release.
+
+ -- Steve Langasek <[e-mail]>  Sun, 13 Nov 2016 17:05:42 -0800
+
 lvm2 (2.02.167-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Bastian Blank <[e-mail]>  Wed, 09 Nov 2016 23:34:42 +0100
 
+lvm2 (2.02.164-1ubuntu1) zesty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add and install clvmd resource agent
+    - Lower libdevmapper1.02.1's Depends: dmsetup to a Recommends:. This
+      breaks the circular dependency that causes upgrade failures. As dmsetup
+      is "Priority: required", this has no other practical consequences.
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/dmsetup-udeb.install: install udev rules in udebs
+      (Debian #504341).
+    - Add debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2: We cannot
+      properly synthesize LVM LV change events with udevadm trigger, so
+      if we use LVM, we need to let it finish; otherwise we get missing LV
+      symlinks.
+    - Add debian/initramfs-tools/lvm2/scripts/init-premount/lvm2: failure
+      hooks to help fix bad boots (Debian #468115)
+    - Do not start lvmetad when inside a container.
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+    - debian/rules:
+      + Copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/initramfs-tools/lvm2/hooks/lvm2: depend on udev since
+      we ship udev rules.
+    - Depend on 'dlm' rather than 'dlm-controld', the package is named
+      differently in Ubuntu.
+    - debian/clvm.maintscripts: Drop the /etc/default/clvm conffile on
+      upgrade.  This delta can be dropped after 18.04 release.
+
+ -- Steve Langasek <[e-mail]>  Tue, 18 Oct 2016 22:32:44 -0700
+
 lvm2 (2.02.164-1) unstable; urgency=medium
 
   * New upstream version.
 
  -- Bastian Blank <[e-mail]>  Wed, 17 Aug 2016 17:03:41 +0200
 
+lvm2 (2.02.160-1ubuntu1) yakkety; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add and install clvmd resource agent
+    - Lower libdevmapper1.02.1's Depends: dmsetup to a Recommends:. This
+      breaks the circular dependency that causes upgrade failures. As dmsetup
+      is "Priority: required", this has no other practical consequences.
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/dmsetup-udeb.install: install udev rules in udebs
+      (Debian #504341).
+    - Add debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2: We cannot
+      properly synthesize LVM LV change events with udevadm trigger, so
+      if we use LVM, we need to let it finish; otherwise we get missing LV
+      symlinks.
+    - Add debian/initramfs-tools/lvm2/scripts/init-premount/lvm2: failure
+      hooks to help fix bad boots (Debian #468115)
+    - Do not start lvmetad when inside a container.
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+    - debian/rules:
+      + Copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/initramfs-tools/lvm2/hooks/lvm2: depend on udev since
+      we ship udev rules.
+    - Depend on 'dlm' rather than 'dlm-controld', the package is named
+      differently in Ubuntu.
+    - debian/clvm.maintscripts: Drop the /etc/default/clvm conffile on
+      upgrade.  This delta can be dropped after 18.04 release.
+
+ -- Steve Langasek <[e-mail]>  Sun, 10 Jul 2016 22:26:18 -0700
+
 lvm2 (2.02.160-1) unstable; urgency=medium
 
   * New upstream version.
 
  -- Bastian Blank <[e-mail]>  Sat, 09 Jul 2016 22:11:07 +0200
 
+lvm2 (2.02.156-1ubuntu1) yakkety; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add and install clvmd resource agent
+    - Lower libdevmapper1.02.1's Depends: dmsetup to a Recommends:. This
+      breaks the circular dependency that causes upgrade failures. As dmsetup
+      is "Priority: required", this has no other practical consequences.
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/dmsetup-udeb.install: install udev rules in udebs
+      (Debian #504341).
+    - Add debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2: We cannot
+      properly synthesize LVM LV change events with udevadm trigger, so
+      if we use LVM, we need to let it finish; otherwise we get missing LV
+      symlinks.
+    - Add debian/initramfs-tools/lvm2/scripts/init-premount/lvm2: failure
+      hooks to help fix bad boots (Debian #468115)
+    - Do not start lvmetad when inside a container.
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+    - debian/rules:
+      + Copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/initramfs-tools/lvm2/hooks/lvm2: depend on udev since
+      we ship udev rules.
+  * Dropped changes, no longer needed:
+    - debian/clvm.init: drop all changes; service is now systemd-only.
+    - rename debian/clvm.defaults to debian/clvm.default: no defaults needed
+      with systemd, the only setting in this file is one that is unused
+      anyway.
+    - Install the missing fsadm manpage: included differently in Debian.
+    - Call dh_installman: included differently in Debian.
+  * Depend on 'dlm' rather than 'dlm-controld', the package is named
+    differently in Ubuntu.
+  * debian/clvm.maintscripts: Drop the /etc/default/clvm conffile on upgrade.
+    This delta can be dropped after 18.04 release.
+
+ -- Steve Langasek <[e-mail]>  Thu, 30 Jun 2016 13:47:43 -0700
+
 lvm2 (2.02.156-1) unstable; urgency=medium
 
   * New upstream version.
@@ -268,6 +906,45 @@ lvm2 (2.02.156-1) unstable; urgency=medium
 
  -- Bastian Blank <[e-mail]>  Wed, 22 Jun 2016 16:18:48 +0200
 
+lvm2 (2.02.153-1ubuntu1) yakkety; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - rename debian/clvm.defaults to debian/clvm.default so it is installed
+      correctly. (Debian #569292)
+    - Add and install clvmd resource agent
+    - debian/clvm.init:
+      + check corosync cluster status since the cman tooling isn't available.
+        Change start/stop dependencies to dlm instead of cman and openais
+        since neither are available.
+      + create /run/lvm if it doesn't exist.
+      + exit 3 if not running on status action.
+    - Lower libdevmapper1.02.1's Depends: dmsetup to a Recommends:. This
+      breaks the circular dependency that causes upgrade failures. As dmsetup
+      is "Priority: required", this has no other practical consequences.
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/dmsetup-udeb.install: install udev rules in udebs
+      (Debian #504341).
+    - Add debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2: We cannot
+      properly synthesize LVM LV change events with udevadm trigger, so
+      if we use LVM, we need to let it finish; otherwise we get missing LV
+      symlinks.
+    - Add debian/initramfs-tools/lvm2/scripts/init-premount/lvm2: failure
+      hooks to help fix bad boots (Debian #468115)
+    - Install the missing fsadm manpage.
+    - Do not start lvmetad when inside a container.
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+    - debian/rules:
+      + Copy .po file to .pot file for Rosetta (Ubuntu specific).
+      + Call dh_installman so that our dmeventd manpage actually gets
+        installed.
+    - debian/initramfs-tools/lvm2/hooks/lvm2: depend on udev since
+      we ship udev rules.
+
+ -- Steve Langasek <[e-mail]>  Tue, 17 May 2016 18:21:40 -0700
+
 lvm2 (2.02.153-1) unstable; urgency=medium
 
   * New upstream version.
@@ -280,6 +957,58 @@ lvm2 (2.02.151-1) unstable; urgency=medium
 
  -- Bastian Blank <[e-mail]>  Thu, 28 Apr 2016 15:46:51 +0200
 
+lvm2 (2.02.150-1ubuntu1) yakkety; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - rename debian/clvm.defaults to debian/clvm.default so it is installed
+      correctly. (Debian #569292)
+    - Add and install clvmd resource agent
+    - debian/clvm.init:
+      + check corosync cluster status since the cman tooling isn't available.
+        Change start/stop dependencies to dlm instead of cman and openais
+        since neither are available.
+      + create /run/lvm if it doesn't exist.
+      + exit 3 if not running on status action.
+    - Lower libdevmapper1.02.1's Depends: dmsetup to a Recommends:. This
+      breaks the circular dependency that causes upgrade failures. As dmsetup
+      is "Priority: required", this has no other practical consequences.
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/dmsetup-udeb.install: install udev rules in udebs
+      (Debian #504341).
+    - Add debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2: We cannot
+      properly synthesize LVM LV change events with udevadm trigger, so
+      if we use LVM, we need to let it finish; otherwise we get missing LV
+      symlinks.
+    - Add debian/initramfs-tools/lvm2/scripts/init-premount/lvm2: failure
+      hooks to help fix bad boots (Debian #468115)
+    - Install the missing fsadm manpage.
+    - Do not start lvmetad when inside a container.
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+    - debian/rules:
+      + Copy .po file to .pot file for Rosetta (Ubuntu specific).
+      + Call dh_installman so that our dmeventd manpage actually gets
+        installed.
+    - debian/initramfs-tools/lvm2/hooks/lvm2: depend on udev since
+      we ship udev rules.
+  * Dropped changes, included in Debian:
+    - debian/rules: enable dmeventd during configure.
+    - debian/dmeventd.{8,manpages}: install dmeventd files.
+    - Build-depend on libcorosync-common-dev and others, instead of
+      libcorosync-dev.
+  * Dropped changes:
+    - Replaces for udev (<< 228-2ubuntu2), Depends on udev (>= 228-2ubuntu2):
+      no longer needed post 16.04 LTS.
+    - debian/lvm2.postinst: the lvm2 init script is no longer missing but is
+      masked by systemd; no delta needed.
+    - debian/rules: drop extra cp of config.guess and config.sub; unnecessary
+      because we use autoreconf.
+    - debian/rules: don't disable dmeventd for the udeb build.
+
+ -- Steve Langasek <[e-mail]>  Fri, 22 Apr 2016 16:01:22 -0700
+
 lvm2 (2.02.150-1) unstable; urgency=medium
 
   * New upstream version.
@@ -331,6 +1060,136 @@ lvm2 (2.02.133-2) unstable; urgency=medium
 
  -- Bastian Blank <[e-mail]>  Sun, 13 Dec 2015 18:02:40 +0100
 
+lvm2 (2.02.133-1ubuntu10) xenial; urgency=medium
+
+  * Cherry-pick change from lvm2 2.02.133-2 in Debian to move event plugins
+    back onto the main library patch, which fixes problems with monitoring
+    failing for snapshots and raid volumes.  Closes: #807279, LP: #1556451,
+    LP: #1561228.
+
+ -- Steve Langasek <[e-mail]>  Sat, 16 Apr 2016 00:06:53 -0700
+
+lvm2 (2.02.133-1ubuntu9) xenial; urgency=medium
+
+  * Do not start when inside a container (LP: #1568954)
+
+ -- Simon Deziel <[e-mail]>  Mon, 11 Apr 2016 18:21:59 +0000
+
+lvm2 (2.02.133-1ubuntu8) xenial; urgency=medium
+
+  * Drop debian/85-lvm2.rules. This is redundant now, VGs are already
+    auto-assembled via lvmetad and 69-lvm-metad.rules. This gets rid of using
+    watershed, which causes deadlocks due to blocking udev rule processing.
+    (LP: #1560710)
+  * debian/rules: Put back initramfs-tools script to ensure that the root and
+    resume devices are activated (lvmetad is not yet running in the initrd).
+  * debian/rules: Put back activation systemd generator, to assemble LVs in
+    case the admin disabled lvmetad.
+  * Make debian/initramfs-tools/lvm2/scripts/init-premount/lvm2 executable and
+    remove spurious chmod +x Ubuntu delta in debian/rules.
+
+ -- Martin Pitt <[e-mail]>  Wed, 30 Mar 2016 10:56:49 +0200
+
+lvm2 (2.02.133-1ubuntu7) xenial; urgency=medium
+
+  * Build-depend on libcorosync-common-dev and others, instead of
+    libcorosync-dev.
+
+ -- Matthias Klose <[e-mail]>  Fri, 12 Feb 2016 10:40:28 +0100
+
+lvm2 (2.02.133-1ubuntu5) xenial; urgency=medium
+
+  * Drop udev rules from lvm2-udeb package. Otherwise, lvm groups and
+    volumes are activated behind partman's back e.g. after dasd drive
+    activation. And thus prevents dasdfmt from succeeding. LP: #1536664
+  * Drop watershed-udeb dependency, no longer needed.
+  * Keep dmsetup udev rules.
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 09 Feb 2016 10:14:58 +0000
+
+lvm2 (2.02.133-1ubuntu4) xenial; urgency=medium
+
+  * Remove the init script dependency on cman_tool. (LP: #1089013)
+    - debian/clvm.init: check corosync cluster status since the cman
+      tooling isn't available in Xenial. Change start/stop dependencies
+      to dlm instead of cman and openais since neither cman nor openais
+      are available.
+
+ -- Billy Olsen <[e-mail]>  Thu, 28 Jan 2016 11:38:39 +0100
+
+lvm2 (2.02.133-1ubuntu3) xenial; urgency=medium
+
+  * No-change rebuild to drop python3.4 support.
+
+ -- Matthias Klose <[e-mail]>  Tue, 19 Jan 2016 13:33:41 +0000
+
+lvm2 (2.02.133-1ubuntu2) xenial; urgency=medium
+
+  * Lower libdevmapper1.02.1's Depends: dmsetup to a Recommends:. This breaks
+    the circular dependency that causes upgrade failures. As dmsetup is
+    "Priority: required", this has no other practical consequences.
+    (Closes: #586424, LP: #1032823)
+
+ -- Martin Pitt <[e-mail]>  Wed, 16 Dec 2015 15:55:09 +0100
+
+lvm2 (2.02.133-1ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+    - debian/rules:
+      + copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/{dmsetup,lvm2}-udeb.install: install udev rules in udebs
+      (Debian #504341).
+    - auto-start VGs as their PVs are discovered (Debian #455979):
+      + add debian/85-lvm2.rules: use watershed plus the sledgehammer of
+        vgscan/vgchange to turn on VGs as they come online.
+      + debian/initramfs-tools/lvm2/hooks/lvm2: Add 85-lvm2.rules to the list
+        of udev rules to copy and depend on udev.
+      + debian/control:
+        - add versioned Depend on watershed in lvm2 for udev rules.
+        - add Depends on watershed-udeb in lvm2-udeb for udev rules.
+      + debian/rules:
+        - do not install local-top scripts since Ubuntu mounts root using udev.
+        - do not install activation systemd generator for lvm2, since udev
+          starts LVM.
+        - continue to build clvm support.
+      + debian/lvm2.postinst: handle missing lvm2 init script.
+    - Add debian/initramfs-tools/lvm2/scripts/init-premount/lvm2: failure
+      hooks to help fix bad boots (Debian #468115)
+    - remaining changes to upstream event manager packages (Debian #514706):
+      + debian/rules: enable dmeventd during configure.
+      + debian/dmeventd.{8,manpages}: install dmeventd files.
+    - rename debian/clvm.defaults to debian/clvm.default so it is installed
+      correctly. (Debian #569292)
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/rules: make sure dmsetup and lvm2 initramfs-tools scripts are
+      executable.  When the Ubuntu-specific ones are added with a patch,
+      they may lose their executable bit.
+    - Add and install clvmd resource agent
+    - debian/{clvmd.ra,clvm.init}:
+      - create /run/lvm if it doesn't exist.
+    - debian/clvm.init:
+      - exit 3 if not running on status action.
+    - Call dh_installman so that our dmeventd manpage actually gets installed
+     Install the missing fsadm manpage.
+    - Complete libdevmapper-dev multiarch: (Debian #731294)
+      - mark libdevmapper-dev M-A: same
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+  * Add debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2: We cannot
+    properly synthesize LVM LV change events with udevadm trigger, so
+    if we use LVM, we need to let it finish; otherwise we get missing LV
+    symlinks. This hack used to be in udev, but really belongs into lvm2.
+    (LP: #1185394)
+  * Add Replaces: for udev (<< 228-2ubuntu2), as the lvm2.{init,service} dummy
+    jobs move from udev to lvm2. Note that we don't set a Breaks:, as
+    unfortunately previous (released) udev prerm scripts don't support
+    "deconfigure"; so use a versioned dependency instead. This can be dropped
+    after 16.04 LTS.
+
+ -- Martin Pitt <[e-mail]>  Thu, 10 Dec 2015 12:45:39 +0100
+
 lvm2 (2.02.133-1) unstable; urgency=medium
 
   * New upstream version.
@@ -386,6 +1245,56 @@ lvm2 (2.02.122-2) unstable; urgency=medium
 
  -- Bastian Blank <[e-mail]>  Wed, 15 Jul 2015 21:58:12 +0200
 
+lvm2 (2.02.122-1ubuntu1) wily; urgency=medium
+
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+    - debian/rules:
+      + copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/{dmsetup,lvm2}-udeb.install: install udev rules in udebs
+      (Debian #504341).
+    - auto-start VGs as their PVs are discovered (Debian #455979):
+      + add debian/85-lvm2.rules: use watershed plus the sledgehammer of
+        vgscan/vgchange to turn on VGs as they come online.
+      + debian/initramfs-tools/lvm2/hooks/lvm2: Add 85-lvm2.rules to the list
+        of udev rules to copy and depend on udev.
+      + debian/control:
+        - add versioned Depend on watershed in lvm2 for udev rules.
+        - add Depends on watershed-udeb in lvm2-udeb for udev rules.
+      + debian/rules:
+        - do not install local-top scripts since Ubuntu mounts root using udev.
+        - do not install init scripts or activation systemd units for lvm2,
+          since udev starts LVM.
+        - continue to build clvm support.
+      + debian/lvm2.postinst: handle missing lvm2 init script.
+    - Add debian/initramfs-tools/lvm2/scripts/init-premount/lvm2: failure
+      hooks to help fix bad boots (Debian #468115)
+    - remaining changes to upstream event manager packages (Debian #514706):
+      + debian/rules: enable dmeventd during configure.
+      + debian/dmeventd.{8,manpages}: install dmeventd files.
+    - rename debian/clvm.defaults to debian/clvm.default so it is installed
+      correctly. (Debian #569292)
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/rules: make sure dmsetup and lvm2 initramfs-tools scripts are
+      executable.  When the Ubuntu-specific ones are added with a patch,
+      they may lose their executable bit.
+    - Add and install clvmd resource agent
+    - Add dependency on libudev-dev to libdevmapper-dev so that the .pc file
+      works.
+    - debian/{clvmd.ra,clvm.init}:
+      - create /run/lvm if it doesn't exist.
+    - debian/clvm.init:
+      - exit 3 if not running on status action.
+    - Call dh_installman so that our dmeventd manpage actually gets installed
+    - Install the missing fsadm manpage.
+    - Complete libdevmapper-dev multiarch: (Debian #731294)
+      - mark libdevmapper-dev M-A: same
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+
+ -- Martin Pitt <[e-mail]>  Fri, 10 Jul 2015 07:31:48 +0200
+
 lvm2 (2.02.122-1) unstable; urgency=medium
 
   * New upsream version.
@@ -411,6 +1320,61 @@ lvm2 (2.02.111-2.1) unstable; urgency=medium
 
  -- Ben Hutchings <[e-mail]>  Sun, 01 Mar 2015 21:19:37 +0000
 
+lvm2 (2.02.111-2ubuntu1) vivid; urgency=medium
+
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+    - debian/rules:
+      + copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/{dmsetup,lvm2}-udeb.install: install udev rules in udebs
+      (Debian #504341).
+    - auto-start VGs as their PVs are discovered (Debian #455979):
+      + add debian/85-lvm2.rules: use watershed plus the sledgehammer of
+        vgscan/vgchange to turn on VGs as they come online.
+      + debian/initramfs-tools/lvm2/hooks/lvm2: Add 85-lvm2.rules to the list
+        of udev rules to copy and depend on udev.
+      + debian/control:
+        - add versioned Depend on watershed in lvm2 for udev rules.
+        - add Depends on watershed-udeb in lvm2-udeb for udev rules.
+      + debian/rules:
+        - do not install local-top scripts since Ubuntu mounts root using udev.
+        - do not install init scripts or activation systemd units for lvm2,
+          since udev starts LVM.
+        - continue to build clvm support.
+      + debian/lvm2.postinst: handle missing lvm2 init script.
+    - Add debian/initramfs-tools/lvm2/scripts/init-premount/lvm2: failure
+      hooks to help fix bad boots (Debian #468115)
+    - remaining changes to upstream event manager packages (Debian #514706):
+      + debian/rules: enable dmeventd during configure.
+      + debian/dmeventd.{8,manpages}: install dmeventd files.
+    - rename debian/clvm.defaults to debian/clvm.default so it is installed
+      correctly. (Debian #569292)
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/rules: make sure dmsetup and lvm2 initramfs-tools scripts are
+      executable.  When the Ubuntu-specific ones are added with a patch,
+      they may lose their executable bit.
+    - Add and install clvmd resource agent
+    - Add dependency on libudev-dev to libdevmapper-dev so that the .pc file
+      works.
+    - debian/{clvmd.ra,clvm.init}:
+      - create /run/lvm if it doesn't exist.
+    - debian/clvm.init:
+      - exit 3 if not running on status action.
+    - Call dh_installman so that our dmeventd manpage actually gets installed
+    - Install the missing fsadm manpage.
+    - Complete libdevmapper-dev multiarch: (Debian #731294)
+      - mark libdevmapper-dev M-A: same
+    - Add enable-issue-discards.patch: Enable "issue_discards" option by
+      default to trim SSDs when changing PVs. This option has no effect if the
+      kernel or the drive does not support trimming, so it's safe to enable by
+      default. (Debian #717313)
+
+  * Dropped changes:
+    - debian/patches/avoid-dev-block.patch (Prefer any other device name over
+      names in /dev/block/ since lvm.conf won't handle this) -- Obsolete as
+      udev rules do this part now (see Debian #569290)
+
+ -- Martin Pitt <[e-mail]>  Wed, 19 Nov 2014 15:38:45 +0100
+
 lvm2 (2.02.111-2) unstable; urgency=medium
 
   * Install additional man-pages. (closes: #587277, #760679)
@@ -480,6 +1444,79 @@ lvm2 (2.02.104-1) unstable; urgency=medium
 
  -- Bastian Blank <[e-mail]>  Wed, 29 Jan 2014 22:09:35 +0100
 
+lvm2 (2.02.98-6ubuntu2) trusty; urgency=medium
+
+  * Add enable-issue-discards.patch: Enable "issue_discards" option by default
+    to trim SSDs when changing PVs. This option has no effect if the kernel or
+    the drive does not support trimming, so it's safe to enable by default.
+    [https://blueprints.launchpad.net/ubuntu/+spec/core-1311-ssd-trimming]
+    (Closes: #717313)
+
+ -- Martin Pitt <[e-mail]>  Fri, 13 Dec 2013 10:51:54 +0100
+
+lvm2 (2.02.98-6ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - debian/patches/avoid-dev-block.patch: Prefer any other device name over
+      names in /dev/block/ since lvm.conf won't handle this.
+    - debian/rules:
+      - copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/{dmsetup,lvm2}-udeb.install:
+      - install initramfs and udev hooks in udebs (Debian bug 504341).
+    - auto-start VGs as their PVs are discovered (Ubuntu specific):
+      - add debian/tree/lvm2/lib/udev/rules.d/85-lvm2.rules: use watershed plus
+        the sledgehammer of vgscan/vgchange to turn on VGs as they come online.
+      - debian/tree/lvm2/usr/share/initramfs-tools/scripts/hooks/lvm2:
+        - add 85-lvm2.rules to the list of udev rules to copy.
+        - depend on udev.
+      - debian/control:
+        - add versioned Depend on watershed in lvm2 for udev rules.
+        - add Depends on watershed-udeb in lvm2-udeb for udev rules.
+        - add versioned Depend/Breaks on udev in dmsetup for udev rules.
+        - add Depend on initramfs-tools in dmsetup so system is not potentially
+          rendered unbootable by out-of-order dpkg configuration.
+        - In libdevmapper-event1.02.1 add Breaks: dmeventd
+          (<< 2.02.95-4ubuntu1) due to debian symbol rename
+      - debian/rules:
+        - do not install local-top scripts since Ubuntu mounts root using udev.
+        - do not install init scripts for lvm2, since udev starts LVM.
+        - continue to build clvm support.
+      - debian/lvm2.postinst: handle missing lvm2 init script.
+    - add mountroot failure hooks to help fix bad boots (Debian bug 468115):
+      - debian/tree/lvm2/usr/share/initramfs-tools/scripts/init-premount/lvm2
+    - remaining changes to upstream event manager packages (Debian bug 514706):
+      - debian/rules:
+        - enable dmeventd during configure.
+      - debian/dmeventd.{8,manpages}: install dmeventd files.
+    - rename debian/clvm.defaults to debian/clvm.default so it is installed
+      correctly.
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/rules: make sure dmsetup and lvm2 initramfs-tools scripts are
+      executable.  When the Ubuntu-specific ones are added with a patch,
+      they may lose their executable bit.
+    - Add and install clvmd resource agent
+    - Add dependency on libudev-dev to libdevmapper-dev so that the .pc file
+      works.
+    - debian/{clvmd.ra,clvm.init}:
+      - create /run/lvm if it doesn't exist.
+    - debian/clvm.init:
+      - exit 3 if not running on status action.
+    - Call dh_installman so that our dmeventd manpage actually gets installed
+    - Install the missing fsadm manpage.
+    - Complete libdevmapper-dev multiarch:
+      - move .so symlinks and pkgconfig files to multiarched locations.
+      - mark libdevmapper-dev M-A: same
+
+  * New changes:
+    - keep ocf resource directory
+    - build with only corosync clvmd support
+
+  * Dropped changes:
+    - debian/tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules:
+      watch dm devices for changes with inotify. This udev rule is gone.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Mon, 16 Sep 2013 10:39:47 +0100
+
 lvm2 (2.02.98-6) unstable; urgency=low
 
   * Update init script:
@@ -520,6 +1557,102 @@ lvm2 (2.02.98-2) unstable; urgency=low
 
  -- Bastian Blank <[e-mail]>  Sat, 08 Jun 2013 12:50:57 +0200
 
+lvm2 (2.02.98-1ubuntu5) saucy; urgency=low
+
+  * Reenabled clvm
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 28 Aug 2013 10:46:43 +0100
+
+lvm2 (2.02.98-1ubuntu4) saucy; urgency=low
+
+  * hooks/lvm2: add dm_raid to the dm personality modules to be included in
+    the initramfs as this is a valid personality for the root filesystem
+    and such volumes lead to extended boot times and boot failures.
+    (LP: #1206235)
+
+ -- Andy Whitcroft <[e-mail]>  Mon, 29 Jul 2013 20:37:28 +0100
+
+lvm2 (2.02.98-1ubuntu3) saucy; urgency=low
+
+  * Disable clvm for the time being, given that redhat-cluster will soon
+    be removed from the archives (provides libdml-dev, libcman-dev), in
+    favor of the new cluster stack (corosync). Once corosync > 2.X is
+    released and a new source package 'dlm' (will provide libdlm-dev)
+    hits the archive, clvm can be reenabled.
+    - debian/control: Drop Build-Depends on libcman-dev, libcorosync-dev,
+      libdlm-dev, openais-dev; Comment out clvm binary package.
+    - debian/rules: Do not build --with-clvmd; comment clvm related rules.
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 26 Jul 2013 12:45:06 -0400
+
+lvm2 (2.02.98-1ubuntu2) saucy; urgency=low
+
+  * Update config.guess and config.sub.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Thu, 11 Jul 2013 20:35:43 +0100
+
+lvm2 (2.02.98-1ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - debian/patches/avoid-dev-block.patch: Prefer any other device name over
+      names in /dev/block/ since lvm.conf won't handle this.
+    - debian/rules:
+      - copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/{dmsetup,lvm2}-udeb.install:
+      - install initramfs and udev hooks in udebs (Debian bug 504341).
+    - auto-start VGs as their PVs are discovered (Ubuntu specific):
+      - add debian/tree/lvm2/lib/udev/rules.d/85-lvm2.rules: use watershed plus
+        the sledgehammer of vgscan/vgchange to turn on VGs as they come online.
+      - debian/tree/lvm2/usr/share/initramfs-tools/scripts/hooks/lvm2:
+        - add 85-lvm2.rules to the list of udev rules to copy.
+        - depend on udev.
+      - debian/control:
+        - add versioned Depend on watershed in lvm2 for udev rules.
+        - add Depends on watershed-udeb in lvm2-udeb for udev rules.
+        - add versioned Depend/Breaks on udev in dmsetup for udev rules.
+        - add Depend on initramfs-tools in dmsetup so system is not potentially
+          rendered unbootable by out-of-order dpkg configuration.
+        - In libdevmapper-event1.02.1 add Breaks: dmeventd
+          (<< 2.02.95-4ubuntu1) due to debian symbol rename
+      - debian/rules:
+        - do not install local-top scripts since Ubuntu mounts root using udev.
+        - do not install init scripts for lvm2, since udev starts LVM.
+        - continue to build clvm support.
+      - debian/lvm2.postinst: handle missing lvm2 init script.
+      - debian/tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules:
+        watch dm devices for changes with inotify
+    - add mountroot failure hooks to help fix bad boots (Debian bug 468115):
+      - debian/tree/lvm2/usr/share/initramfs-tools/scripts/init-premount/lvm2
+    - remaining changes to upstream event manager packages (Debian bug 514706):
+      - debian/rules:
+        - enable dmeventd during configure.
+      - debian/dmeventd.{8,manpages}: install dmeventd files.
+    - rename debian/clvm.defaults to debian/clvm.default so it is installed
+      correctly.
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/rules: make sure dmsetup and lvm2 initramfs-tools scripts are
+      executable.  When the Ubuntu-specific ones are added with a patch,
+      they may lose their executable bit.
+    - Add and install clvmd resource agent
+    - Add dependency on libudev-dev to libdevmapper-dev so that the .pc file
+      works.
+    - debian/{clvmd.ra,clvm.init}:
+      - create /run/lvm if it doesn't exist.
+    - debian/clvm.init:
+      - exit 3 if not running on status action.
+    - Call dh_installman so that our dmeventd manpage actually gets installed
+    - Install the missing fsadm manpage.
+    - Complete libdevmapper-dev multiarch:
+      - move .so symlinks and pkgconfig files to multiarched locations.
+      - mark libdevmapper-dev M-A: same
+
+  * Dropped changes, applied upstream:
+    - Update Micron PCIe SSD and other device-types to latest available.
+    - Cherry pick from upstream, remove unsupported udev_get_dev_path() call.
+    - Move thin check to global section.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Thu, 30 May 2013 11:02:10 +0100
+
 lvm2 (2.02.98-1) unstable; urgency=low
 
   * New upstream version.
@@ -535,6 +1668,41 @@ lvm2 (2.02.95-7) testing; urgency=low
 
  -- Bastian Blank <[e-mail]>  Sun, 24 Mar 2013 09:03:10 +0100
 
+lvm2 (2.02.95-6ubuntu4) raring; urgency=low
+
+  * Actually just update all device-types to latest available. (LP: #1122445)
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Thu, 14 Mar 2013 15:03:49 +0000
+
+lvm2 (2.02.95-6ubuntu3) raring; urgency=low
+
+  * Add Micron PCIe SSD devices filter (LP: #1122445)
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Thu, 14 Mar 2013 12:05:00 +0000
+
+lvm2 (2.02.95-6ubuntu2) raring; urgency=low
+
+  * Add upstream-drop-udev_get_dev_path.patch: Remove udev_get_dev_path()
+    libudev call, as this is unsupported in libudev1. Backported from upstream
+    git.
+
+ -- Martin Pitt <[e-mail]>  Tue, 12 Mar 2013 07:54:19 +0100
+
+lvm2 (2.02.95-6ubuntu1) raring; urgency=low
+
+  [ Neil Wilson ]
+  * Use upstream dmeventd.8 manpage (LP: #1076304)
+  * debian/patches/1075994_move_thin_check_executable_to_proper_section.
+    patch:
+    - put thin_check_executable in the 'global' section
+    - look for thin_check in /usr/sbin (LP: #1075994)
+
+  [ Dmitrijs Ledkovs ]
+  * Revert drop of clvm support. Still to be supported in ubuntu.
+  * All other changes as in -5ubuntu1.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Sat, 02 Mar 2013 22:43:10 +0000
+
 lvm2 (2.02.95-6) unstable; urgency=low
 
   * Drop cluster (clvm) support. It never properly worked and is more dead
@@ -542,6 +1710,66 @@ lvm2 (2.02.95-6) unstable; urgency=low
 
  -- Bastian Blank <[e-mail]>  Wed, 02 Jan 2013 11:11:41 +0100
 
+lvm2 (2.02.95-5ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable, remaining changes (LP: #1082325):
+    - debian/patches/avoid-dev-block.patch: Prefer any other device name over
+      names in /dev/block/ since lvm.conf won't handle this.
+    - debian/rules:
+      - copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/{dmsetup,lvm2}-udeb.install:
+      - install initramfs and udev hooks in udebs (Debian bug 504341).
+    - auto-start VGs as their PVs are discovered (Ubuntu specific):
+      - add debian/tree/lvm2/lib/udev/rules.d/85-lvm2.rules: use watershed plus
+        the sledgehammer of vgscan/vgchange to turn on VGs as they come online.
+      - debian/tree/lvm2/usr/share/initramfs-tools/scripts/hooks/lvm2:
+        - add 85-lvm2.rules to the list of udev rules to copy.
+        - depend on udev.
+      - debian/control:
+        - add versioned Depend on watershed in lvm2 for udev rules.
+        - add Depends on watershed-udeb in lvm2-udeb for udev rules.
+        - add versioned Depend/Breaks on udev in dmsetup for udev rules.
+        - add Depend on initramfs-tools in dmsetup so system is not potentially
+          rendered unbootable by out-of-order dpkg configuration.
+        - In libdevmapper-event1.02.1 add Breaks: dmeventd
+          (<< 2.02.95-4ubuntu1) due to debian symbol rename
+      - debian/rules:
+        - do not install local-top scripts since Ubuntu mounts root using udev.
+        - do not install init scripts for lvm2, since udev starts LVM.
+      - debian/lvm2.postinst: handle missing lvm2 init script.
+      - debian/tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules:
+        watch dm devices for changes with inotify
+    - add mountroot failure hooks to help fix bad boots (Debian bug 468115):
+      - debian/tree/lvm2/usr/share/initramfs-tools/scripts/init-premount/lvm2
+    - remaining changes to upstream event manager packages (Debian bug 514706):
+      - debian/rules:
+        - enable dmeventd during configure.
+      - debian/dmeventd.{8,manpages}: install dmeventd files.
+    - rename debian/clvm.defaults to debian/clvm.default so it is installed
+      correctly.
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/rules: make sure dmsetup and lvm2 initramfs-tools scripts are
+      executable.  When the Ubuntu-specific ones are added with a patch,
+      they may lose their executable bit.
+    - Add and install clvmd resource agent
+    - Add dependency on libudev-dev to libdevmapper-dev so that the .pc file
+      works.
+    - debian/{clvmd.ra,clvm.init}:
+      - create /run/lvm if it doesn't exist.
+    - debian/clvm.init:
+      - exit 3 if not running on status action.
+    - Call dh_installman so that our dmeventd manpage actually gets installed
+    - Install the missing fsadm manpage.
+    - Complete libdevmapper-dev multiarch:
+      - move .so symlinks and pkgconfig files to multiarched locations.
+      - mark libdevmapper-dev M-A: same
+
+  * Dropped changes debian/lvm2.{preinst,postinst,postrm}, not needed in Raring:
+    - Implement removal of obsolete /etc/init.d/lvm2 conffile, which
+      should not have been re-introduced in Quantal.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Mon, 26 Nov 2012 10:35:00 +0000
+
 lvm2 (2.02.95-5) unstable; urgency=low
 
   * Don't discard pv areas on pvmove commands. (closes: #691271)
@@ -549,6 +1777,87 @@ lvm2 (2.02.95-5) unstable; urgency=low
 
  -- Bastian Blank <[e-mail]>  Mon, 19 Nov 2012 12:11:15 +0100
 
+lvm2 (2.02.95-4ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - debian/patches/avoid-dev-block.patch: Prefer any other device name over
+      names in /dev/block/ since lvm.conf won't handle this.
+    - debian/rules:
+      - copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/{dmsetup,lvm2}-udeb.install:
+      - install initramfs and udev hooks in udebs (Debian bug 504341).
+    - auto-start VGs as their PVs are discovered (Ubuntu specific):
+      - add debian/tree/lvm2/lib/udev/rules.d/85-lvm2.rules: use watershed plus
+        the sledgehammer of vgscan/vgchange to turn on VGs as they come online.
+      - debian/tree/lvm2/usr/share/initramfs-tools/scripts/hooks/lvm2:
+        - add 85-lvm2.rules to the list of udev rules to copy.
+        - depend on udev.
+      - debian/control:
+        - add versioned Depend on watershed in lvm2 for udev rules.
+        - add Depends on watershed-udeb in lvm2-udeb for udev rules.
+        - add versioned Depend/Breaks on udev in dmsetup for udev rules.
+        - add Depend on initramfs-tools in dmsetup so system is not potentially
+          rendered unbootable by out-of-order dpkg configuration.
+      - debian/rules:
+        - do not install local-top scripts since Ubuntu mounts root using udev.
+        - do not install init scripts for lvm2, since udev starts LVM.
+      - debian/lvm2.postinst: handle missing lvm2 init script.
+      - debian/tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules:
+        watch dm devices for changes with inotify
+    - add mountroot failure hooks to help fix bad boots (Debian bug 468115):
+      - debian/tree/lvm2/usr/share/initramfs-tools/scripts/init-premount/lvm2
+    - remaining changes to upstream event manager packages (Debian bug 514706):
+      - debian/rules:
+        - enable dmeventd during configure.
+      - debian/dmeventd.{8,manpages}: install dmeventd files.
+    - rename debian/clvm.defaults to debian/clvm.default so it is installed
+      correctly.
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - debian/rules: make sure dmsetup and lvm2 initramfs-tools scripts are
+      executable.  When the Ubuntu-specific ones are added with a patch,
+      they may lose their executable bit.
+    - Add and install clvmd resource agent
+    - Add dependency on libudev-dev to libdevmapper-dev so that the .pc file
+      works.
+    - debian/{clvmd.ra,clvm.init}:
+      - create /run/lvm if it doesn't exist.
+    - debian/clvm.init:
+      - exit 3 if not running on status action.
+    - Call dh_installman so that our dmeventd manpage actually gets installed
+    - Install the missing fsadm manpage.
+
+   * libdevmapper-dev:
+    - move .so symlinks and pkgconfig files to multiarched locations.
+    - mark libdevmapper-dev M-A: same
+
+   * libdevmapper-event1.02.1:
+    - Add Breaks: dmeventd (<< 2.02.95-4ubuntu1) due to debian symbol rename
+
+   * debian/lvm2.{preinst,postinst,postrm}:
+    - Implement removal of obsolete /etc/init.d/lvm2 conffile, which
+      should not have been re-introduced in Quantal.
+
+   * Dropped Changes, included in Debian:
+    - Mostly included packages for upstream event manager (Debian bug 514706).
+    - debian/patches/rules-subdir.patch: removed as reordering will cause
+      build failure with dmeventd.
+    - debian/patches/libdm-event-static.patch: removed as other static libs
+      aren't being built anymore either.
+    - Update symbols for libdevmapper-event.
+    - Update libdevmapper-event, dmeventd descriptions to match Debian
+      boilerplate.
+
+   * Disappeared Changes:
+    - Don't install documentation in udebs. No diff found, but no docs are
+      installed into udebs either.
+
+   * Resurected Changes:
+    - corrected dropping the wrong init script. Now clvm.init is shipped
+      and lvm2.init is dropped in favor of udev rules as per original
+      intention (LP: #1037033).
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Tue, 14 Aug 2012 14:35:57 +0100
+
 lvm2 (2.02.95-4) unstable; urgency=low
 
   * Force building with -j1.
@@ -586,6 +1895,92 @@ lvm2 (2.02.95-1) unstable; urgency=low
 
  -- Bastian Blank <[e-mail]>  Tue, 01 May 2012 20:27:50 +0200
 
+lvm2 (2.02.88-2ubuntu2) quantal-proposed; urgency=low
+
+  [ Ante Karamatic ]
+  * debian/{clvmd.ra,clvm.init}:
+    - create /var/run/lvm if it doesn't exist (LP: #959218)
+
+  [ Andres Rodriguez ]
+  * debian/clvm.init: exit 3 if not running on status action. (LP: #988881)
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 05 Jun 2012 16:30:18 -0400
+
+lvm2 (2.02.88-2ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable (LP: #726677), remaining changes:
+    - debian/patches/avoid-dev-block.patch: Prefer any other device name over
+      names in /dev/block/ since lvm.conf won't handle this.
+    - debian/rules:
+      - copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/{dmsetup,lvm2}-udeb.install:
+      - install initramfs and udev hooks in udebs (Debian bug 504341).
+    - auto-start VGs as their PVs are discovered (Ubuntu specific):
+      - add debian/tree/lvm2/lib/udev/rules.d/85-lvm2.rules: use watershed plus
+        the sledgehammer of vgscan/vgchange to turn on VGs as they come online.
+      - debian/tree/lvm2/usr/share/initramfs-tools/scripts/hooks/lvm2:
+        - add 85-lvm2.rules to the list of udev rules to copy.
+        - depend on udev.
+      - debian/control:
+        - add versioned Depend on watershed in lvm2 for udev rules.
+        - add versioned Depend/Breaks on udev in dmsetup for udev rules.
+        - add Depend on initramfs-tools in dmsetup so system is not potentially
+          rendered unbootable by out-of-order dpkg configuration.  LP: #358654.
+      - debian/rules:
+        - do not install local-top scripts since Ubuntu mounts root using udev.
+        - do not install init scripts for lvm2, since udev starts LVM.
+      - debian/lvm2.postinst: handle missing lvm2 init script.
+      - debian/tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules:
+        watch dm devices for changes with inotify
+    - add mountroot failure hooks to help fix bad boots (Debian bug 468115):
+      - debian/tree/lvm2/usr/share/initramfs-tools/scripts/init-premount/lvm2
+    - add packages for upstream event manager (Debian bug 514706):
+      - debian/control: define libdevmapper-event1.02.1 and dmeventd packages.
+      - debian/rules:
+        - enable dmeventd during configure.
+        - add build targets.
+        - fix shlibs invocation with a cleared DH_OPTIONS to get udeb shlibs.
+      - debian/dmeventd.{install,8,manpages}: install dmeventd files.
+      - debian/libdevmapper-event*.{install,symbols}: install dmeventd files.
+      - debian/libdevmapper-dev.install: install libdevmapper-event files.
+      - debian/patches/monitoring-default-off.patch: by default, do not
+        expect to talk to dmeventd.  Monitoring can be done via "--monitor y".
+    - rename debian/clvm.defaults to debian/clvm.default so it is intalled
+      correctly.
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - lidevmapper-dev: move .so symlinks to /usr/lib where they belong
+    - debian/patches/rules-subdir.patch: removed as reordering will cause
+      build failure with dmeventd.
+    - debian/patches/libdm-event-static.patch: removed as other static libs
+      aren't being built anymore either.
+    - debian/rules: make sure dmsetup and lvm2 initramfs-tools scripts are
+      executable.  When the Ubuntu-specific ones are added with a patch,
+      they may lose their executable bit.
+    - Add and install clvmd resource agent
+    - Add dependency on libudev-dev to libdevmapper-dev so that the .pc file
+      works.
+    - Make lvm2-udeb depend on watershed-udeb, since it has udev rules that
+      use watershed.
+  * Dropped changes, included in Debian:
+    - Build clvm with support for corosync, openais and cman
+    - debian/control: change to libreadline-dev for build.
+  * Dropped changes, included upstream:
+    - debian/patches/open-readonly.patch: do not open every device for
+      write, otherwise udev thinks they've all changed (see inotify above).
+  * Dropped changes, superseded upstream:
+    - debian/tree/dmsetup/lib/udev/rules.d/55-dm.rules: properly respond
+      to "add" events during boot.  Upstream now distinguishes between
+      coldplug add events initial ones, so this is not supposed to be a
+      problem now.
+  * Update symbols for libdevmapper-event.
+  * Update libdevmapper-event, dmeventd descriptions to match Debian
+    boilerplate.
+  * Don't install documentation in udebs.
+  * Call dh_installman so that our dmeventd manpage actually gets installed
+  * Install the missing fsadm manpage.
+
+ -- Steve Langasek <[e-mail]>  Wed, 02 May 2012 07:48:42 -0700
+
 lvm2 (2.02.88-2) unstable; urgency=low
 
   * Enable corosync and openais support. (closes: #563320)
@@ -651,6 +2046,114 @@ lvm2 (2.02.66-5) unstable; urgency=low
 
  -- Bastian Blank <[e-mail]>  Sun, 23 Jan 2011 18:30:01 +0100
 
+lvm2 (2.02.66-4ubuntu7) precise; urgency=low
+
+  * Revert the last change.
+
+ -- Matthias Klose <[e-mail]>  Sun, 04 Dec 2011 17:30:41 +0100
+
+lvm2 (2.02.66-4ubuntu6) precise; urgency=low
+
+  * Don't build clvmd on armhf.
+
+ -- Matthias Klose <[e-mail]>  Sun, 04 Dec 2011 16:01:51 +0100
+
+lvm2 (2.02.66-4ubuntu5) precise; urgency=low
+
+  * Build-depend on openais-dev rather than libopenais-dev.
+
+ -- Colin Watson <[e-mail]>  Tue, 22 Nov 2011 00:42:29 +0000
+
+lvm2 (2.02.66-4ubuntu4) precise; urgency=low
+
+  * Make lvm2-udeb depend on watershed-udeb, since it has udev rules that
+    use watershed.
+
+ -- Colin Watson <[e-mail]>  Mon, 21 Nov 2011 23:47:38 +0000
+
+lvm2 (2.02.66-4ubuntu3) oneiric; urgency=low
+
+  * Add dependency on libudev-dev to libdevmapper-dev so that the .pc file
+    works.
+
+ -- Steve Langasek <[e-mail]>  Tue, 16 Aug 2011 18:30:40 -0700
+
+lvm2 (2.02.66-4ubuntu2) natty; urgency=low
+
+  * Add support for corosync based clusters. (LP: #525287)
+    - Build clvm with support for corosync, openais and cman
+    - Add and install clvmd resource agent, written by Xinwei Hu,
+      slightly modified by Ante Karamatic to work on Ubuntu
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 14 Jan 2011 15:39:03 -0600
+
+lvm2 (2.02.66-4ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - debian/patches/avoid-dev-block.patch: Prefer any other device name over
+      names in /dev/block/ since lvm.conf won't handle this (Debian bug 569290).
+    - debian/rules:
+      - copy .po file to .pot file for Rosetta (Ubuntu specific).
+    - debian/{dmsetup,lvm2}-udeb.install:
+      - install initramfs and udev hooks in udebs (Debian bug 504341).
+    - auto-start VGs as their PVs are discovered (Ubuntu specific):
+      - add debian/tree/lvm2/lib/udev/rules.d/85-lvm2.rules: use watershed plus
+        the sledgehammer of vgscan/vgchange to turn on VGs as they come online.
+      - debian/tree/lvm2/usr/share/initramfs-tools/scripts/hooks/lvm2:
+        - add 85-lvm2.rules to the list of udev rules to copy.
+        - depend on udev.
+      - debian/control:
+        - add versioned Depend on watershed in lvm2 for udev rules.
+        - add versioned Depend/Breaks on udev in dmsetup for udev rules.
+        - add Depend on initramfs-tools in dmsetup so system is not potentially
+          rendered unbootable by out-of-order dpkg configuration.
+      - debian/rules:
+        - do not install local-top scripts since Ubuntu mounts root using udev.
+        - do not install init scripts for lvm2, since udev starts LVM.
+      - debian/lvm2.postinst: handle missing lvm2 init script.
+      - debian/tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules:
+        watch dm devices for changes with inotify.
+      - debian/patches/open-readonly.patch: do not open every device for
+        write, otherwise udev thinks they've all changed (see inotify above).
+    - add mountroot failure hooks to help fix bad boots (Debian bug 468115):
+      - debian/tree/lvm2/usr/share/initramfs-tools/scripts/init-premount/lvm2
+    - add packages for upstream event manager (Debian bug 514706):
+      - debian/control: define libdevmapper-event1.02.1 and dmeventd packages.
+      - debian/rules:
+        - enable dmeventd during configure.
+        - add build targets.
+        - fix shlibs invocation with a cleared DH_OPTIONS to get udeb shlibs.
+      - debian/dmeventd.{install,8,manpages}: install dmeventd files.
+      - debian/libdevmapper-event*.{install,symbols}: install dmeventd files.
+      - debian/libdevmapper-dev.install: install libdevmapper-event files.
+      - debian/patches/monitoring-default-off.patch: by default, do not
+        expect to talk to dmeventd.  Monitoring can be done via "--monitor y".
+    - rename debian/clvm.defaults to debian/clvm.default so it is intalled
+      correctly (Debian bug 569292).
+    - debian/control: change to libreadline-dev for build.
+    - debian/tree/dmsetup/lib/udev/rules.d/55-dm.rules: properly respond
+      to "add" events during boot.
+    - debian/control: add dmsetup-udeb to libdevmapper1.02.1-udeb recommends.
+    - lidevmapper-dev: move .so symlinks to /usr/lib where they belong
+  * Dropped changes:
+    - debian/tree/lvm2/lib/udev/rules.d/56-lvm.rules: include *_mlog in
+      devices to be ignored for filesystem symlinks (see reason for
+      dropping in Debian bug 569745).
+    - debian/{lvm2,dmsetup}.preinst: remove obsolete udev rules from Hardy.
+    - debian/lvm2.preinst: fix Hardy conf-file removal to check against the
+      correct binary package name.
+  * debian/patches/CVE-2010-2526.patch: removed, now included in
+    upstream-2.02.72.patch.
+  * debian/patches/rules-subdir.patch: removed as reordering will cause
+    build failure with dmeventd.
+  * debian/patches/libdm-event-static.patch: removed as other static libs
+    aren't being built anymore either.
+  * debian/rules: make sure dmsetup and lvm2 initramfs-tools scripts are
+    executable. When the Ubuntu-specific ones are added with a patch, they
+    may lose their executable bit.
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 07 Dec 2010 08:08:45 -0500
+
 lvm2 (2.02.66-4) unstable; urgency=low
 
   * Make libdevmapper break old lvm2, it missuses the udev sync
@@ -708,6 +2211,99 @@ lvm2 (2.02.62-1) unstable; urgency=low
 
  -- Bastian Blank <[e-mail]>  Sat, 20 Mar 2010 18:09:20 +0100
 
+lvm2 (2.02.54-1ubuntu6) maverick; urgency=low
+
+  * SECURITY UPDATE: unprivileged logical volume manipulation with clvmd
+    - debian/patches/CVE-2010-2526.patch: revert to using a pathname-based
+      socket in order to enforce correct permissions.
+    - CVE-2010-2526
+
+ -- Marc Deslauriers <[e-mail]>  Thu, 23 Sep 2010 14:09:51 -0400
+
+lvm2 (2.02.54-1ubuntu5) maverick; urgency=low
+
+  * Backport from Debian:
+    - Don't overwrite names of dm devices; use symlinks instead
+      (LP: #621951).
+
+ -- Colin Watson <[e-mail]>  Wed, 08 Sep 2010 22:50:26 +0100
+
+lvm2 (2.02.54-1ubuntu4) lucid; urgency=low
+
+  * Some idiot thought it'd be a good idea if device mapper didn't respond
+    to "add" events, like those during boot.  Take their change out back
+    and shoot it in the head.  LP: #561390.
+
+ -- Scott James Remnant <[e-mail]>  Sun, 25 Apr 2010 21:36:25 -0700
+
+lvm2 (2.02.54-1ubuntu3) lucid; urgency=low
+
+  * lidevmapper-dev: move .so symlinks to /usr/lib where they belong
+
+ -- Steve Langasek <[e-mail]>  Thu, 18 Feb 2010 04:38:10 -0800
+
+lvm2 (2.02.54-1ubuntu2) lucid; urgency=low
+
+  * debian/lvm2.preinst: fix Hardy conf-file removal to check against the
+    correct binary package name.
+
+ -- Kees Cook <[e-mail]>  Tue, 16 Feb 2010 16:08:43 -0800
+
+lvm2 (2.02.54-1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing.  Remaining changes:
+    - debian/control:
+      - add libtool for autoconf regeneration.
+    - debian/patches/avoid-dev-block.patch: Prefer any other device name over
+      names in /dev/block/ since lvm.conf won't handle this (Debian bug 569290).
+    - debian/rules:
+      - copy .po file to .pot file for Rosetta (Ubuntu specific).
+      - install initramfs and udev hooks in udebs (Debian bug 504341).
+    - auto-start VGs as their PVs are discovered (Ubuntu specific):
+      - add debian/tree/lvm2/lib/udev/rules.d/85-lvm2.rules: use watershed plus
+        the sledgehammer of vgscan/vgchange to turn on VGs as they come online.
+      - debian/tree/lvm2/usr/share/initramfs-tools/scripts/hooks/lvm2:
+        - add 85-lvm2.rules to the list of udev rules to copy.
+        - depend on udev.
+      - debian/control:
+        - add versioned Depend on watershed in lvm2 for udev rules.
+        - add versioned Depend/Breaks on udev in dmsetup for udev rules.
+        - add Depend on initramfs-tools in dmsetup so system is not potentially
+          rendered unbootable by out-of-order dpkg configuration.
+      - debian/rules:
+        - do not install local-top scripts since Ubuntu mounts root using udev.
+        - do not install init scripts for lvm2, since udev starts LVM.
+      - debian/lvm2.postinst: handle missing lvm2 init script.
+      - debian/tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules:
+        watch dm devices for changes with inotify.
+      - debian/patches/open-readonly.patch: do not open every device for
+        write, otherwise udev thinks they've all changed (see inotify above).
+    - add mountroot failure hooks to help fix bad boots (Debian bug 468115):
+      - debian/tree/lvm2/usr/share/initramfs-tools/scripts/init-premount/lvm2
+    - add packages for upstream event manager (Debian bug 514706):
+      - debian/control: define libdevmapper-event1.02.1 and dmeventd packages.
+      - debian/rules:
+        - enable dmeventd during configure.
+        - add build targets.
+        - fix shlibs invocation with a cleared DH_OPTIONS to get udeb shlibs.
+      - debian/patches/rules-subdir.patch: update to reorder build targets.
+      - debian/patches/libdm-event-static.patch: force static library build.
+      - debian/dmeventd.{install,8,manpages}: install dmeventd files.
+      - debian/libdevmapper-event*.{install,symbols}: install dmeventd files.
+      - debian/libdevmapper-dev.install: install libdevmapper-event files.
+      - debian/patches/monitoring-default-off.patch: by default, do not
+        expect to talk to dmeventd.  Monitoring can be done via "--monitor y".
+  * debian/rules: make dmsetup initramfs-tools scripts executable (Debian bug
+    569286).
+  * rename debian/clvm.defaults to debian/clvm.default so it is intalled
+    correctly (Debian bug 569292).
+  * debian/control: bump up to libreadline6-dev for build.
+  * debian/{lvm2,dmsetup}.preinst: remove obsolete udev rules from Hardy.
+  * debian/tree/lvm2/lib/udev/rules.d/56-lvm.rules: include *_mlog in
+    devices to be ignored for filesystem symlinks (Debian bug 569745).
+
+ -- Kees Cook <[e-mail]>  Tue, 16 Feb 2010 10:40:31 -0800
+
 lvm2 (2.02.54-1) unstable; urgency=low
 
   * New upstream version.
@@ -868,6 +2464,87 @@ lvm2 (2.02.39-1) unstable; urgency=low
 
  -- Bastian Blank <[e-mail]>  Tue, 15 Jul 2008 20:05:08 +0200
 
+lvm2 (2.02.39-0ubuntu11) karmic; urgency=low
+
+  * Copy /etc/lvm/lvm.conf into the initramfs (LP: #246324).
+
+ -- Colin Watson <[e-mail]>  Wed, 15 Jul 2009 13:52:21 +0100
+
+lvm2 (2.02.39-0ubuntu10) karmic; urgency=low
+
+  * debian/control: Increase dependencies for vol_id->blkid transition.
+
+ -- Scott James Remnant <[e-mail]>  Tue, 12 May 2009 10:19:09 +0100
+
+lvm2 (2.02.39-0ubuntu9) jaunty; urgency=low
+
+  * debian/patches/avoid-dev-block.patch: Prefer any other device name over
+    names in /dev/block/ (LP: #341928).
+
+ -- Colin Watson <[e-mail]>  Wed, 08 Apr 2009 14:19:32 +0100
+
+lvm2 (2.02.39-0ubuntu8) jaunty; urgency=low
+
+  * Revert quilt damage to two other patches.
+
+ -- Scott James Remnant <[e-mail]>  Tue, 24 Feb 2009 00:26:56 +0000
+
+lvm2 (2.02.39-0ubuntu7) jaunty; urgency=low
+
+  * debian/patches/open-readonly.patch:
+    - Generally we don't need to write to every single block device we open,
+      in fact if we do that when scanning we'll make udev think they all
+      changed, and it could run "lvm vgscan" again!  When the file descriptor
+      is needed for writing, it will be closed and opened again.  LP: #332270.
+
+ -- Scott James Remnant <[e-mail]>  Mon, 23 Feb 2009 21:44:51 +0000
+
+lvm2 (2.02.39-0ubuntu6) jaunty; urgency=low
+
+  * Bump build-dependency on debhelper to ensure we get the right one.
+
+ -- Scott James Remnant <[e-mail]>  Fri, 09 Jan 2009 14:09:31 +0000
+
+lvm2 (2.02.39-0ubuntu5) jaunty; urgency=low
+
+  * Update udev rules.d path to /lib/udev/rules.d, (LP #314879) and add
+    versioned dependency on udev accordingly.
+  * Add versioned breaks on udev to make sure we do the upgrade
+    in the correct order.
+  * Add versioned dependency on watershed version that installs
+    into initramfs.
+
+ -- Soren Hansen <[e-mail]>  Fri, 09 Jan 2009 13:46:10 +0100
+
+lvm2 (2.02.39-0ubuntu4) jaunty; urgency=low
+
+  * Change dependency on udev to one on watershed.
+
+ -- Scott James Remnant <[e-mail]>  Mon, 05 Jan 2009 16:54:00 +0000
+
+lvm2 (2.02.39-0ubuntu3) jaunty; urgency=low
+
+  * Rebuild for armel.
+
+ -- Matthias Klose <[e-mail]>  Thu, 20 Nov 2008 10:51:16 +0000
+
+lvm2 (2.02.39-0ubuntu2) intrepid; urgency=low
+
+  * Backport from Debian unstable (Bastian Blank):
+    - Disable readline support in udeb. (closes: #491203, LP: #263558)
+
+ -- Colin Watson <[e-mail]>  Mon, 01 Sep 2008 16:47:50 +0100
+
+lvm2 (2.02.39-0ubuntu1) intrepid; urgency=low
+
+  * New upstream release (LP: #239460).
+  * Merges 2.02.35-1 from Debian.
+  * Increase devmapper dependency to (>> 2:1.02.27) due to new API.
+  * Re-add quilt to Build-Depends.
+  * Add missing Build-Depends on autoconf and libtool.
+
+ -- James Westby <[e-mail]>  Tue, 01 Jul 2008 16:39:18 +0100
+
 lvm2 (2.02.38-1) unstable; urgency=low
 
   * New upstream version.
@@ -913,6 +2590,115 @@ lvm2 (2.02.29-1) unstable; urgency=low
 
  -- Bastian Blank <[e-mail]>  Thu, 10 Jan 2008 13:36:53 +0000
 
+lvm2 (2.02.26-1ubuntu11) intrepid; urgency=low
+
+  * debian/control: build-deps on newer libcman and libdlm to guarantee a
+    build against new libcman3 and libdlm3 soname.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Tue, 26 Aug 2008 14:18:13 +0200
+
+lvm2 (2.02.26-1ubuntu10) intrepid; urgency=low
+
+  * debian/initramfs-tools/scripts/init-premount/lvm2:
+    - use new named mountroot-fail hook ordering
+    - silently detect array failures
+  * lib/locking/cluster_locking.c, daemons/clvmd/{refresh_,}clvmd.c:
+    add include for sys/param.h to catch limits, where PIPE_BUF went to live.
+
+ -- Kees Cook <[e-mail]>  Mon, 28 Jul 2008 12:22:26 -0700
+
+lvm2 (2.02.26-1ubuntu9) hardy; urgency=low
+
+  * Include virtio block type in the filters. (LP: #218574)
+    This change is included upstream in 2.02.34.
+
+ -- James Westby <[e-mail]>  Fri, 18 Apr 2008 14:08:56 +0100
+
+lvm2 (2.02.26-1ubuntu8) hardy; urgency=low
+
+  * debian/initramfs-tools/scripts/init-premount/lvm2: Ensure we exit if
+    the script is called with mountfail.
+
+ -- Luke Yelavich <[e-mail]>  Mon, 18 Feb 2008 11:56:54 +1100
+
+lvm2 (2.02.26-1ubuntu7) hardy; urgency=low
+
+  * debian/initramfs-tools/scripts/init-premount/lvm2:
+    /sbin/mdadm -> /sbin/lvm (Thanks Kees.)
+
+ -- Luke Yelavich <[e-mail]>  Fri, 15 Feb 2008 12:28:14 +1100
+
+lvm2 (2.02.26-1ubuntu6) hardy; urgency=low
+
+  * Create init-premount hook script for the initramfs, to provide
+    information at boot, if the root device is not functional.
+  * Tighten initramfs-tools dependency.
+
+ -- Luke Yelavich <[e-mail]>  Tue, 05 Feb 2008 14:16:36 +1100
+
+lvm2 (2.02.26-1ubuntu5) hardy; urgency=low
+
+  * Changes from Debian audited, remaining changes:
+    - Recognise SUN's LDOM virtual block devices.
+      (forwarded upstream and to Debian #455975).
+    - Drop build-dependencies on libccs-dev and libgulm-dev since gulm
+      locking is obsolete.
+      (forwarded to Debian #455976).
+    - Separate clvm package.
+      (forwarded to Debian #455978).
+    - Use udev to activate new LVM physical volumes, and thus volume groups
+      and logical volumes.
+      (forwarded to Debian #455979).
+    - Copy lvm2.po to lvm2.pot for Rosetta.
+    - Migrate configuration files from earlier Ubuntu versions.
+
+  * Drop compilation without stack protector, no bugs are referenced as
+    justification for that change.
+  * Drop higher build requirements on libdlm-dev since we don't actually
+    seem to have any patch that necessitates it (it builds fine with either,
+    so just build with whatever we have).
+
+ -- Scott James Remnant <[e-mail]>  Wed, 12 Dec 2007 18:15:39 +0000
+
+lvm2 (2.02.26-1ubuntu4) gutsy; urgency=low
+
+  * Bump dmsetup Suggests: to a Depends:, since without it we do not get
+    /dev/disks/by-uuid/ and thus cannot mount anything. (LP: #126776)
+
+ -- Martin Pitt <[e-mail]>  Thu, 19 Jul 2007 16:55:25 +0200
+
+lvm2 (2.02.26-1ubuntu3) gutsy; urgency=low
+
+  * Max partitions for vdisk is 8 and not 16.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Thu, 19 Jul 2007 07:32:59 +0200
+
+lvm2 (2.02.26-1ubuntu2) gutsy; urgency=low
+
+  * Make lvm2 recognize SUN's LDOM virtual disks.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Tue, 17 Jul 2007 09:37:50 +0200
+
+lvm2 (2.02.26-1ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Drop libccs-dev/libgulm-dev Build-Dep
+    - Keep clvm around and all related bits (init, defaults, etc)
+    - scan and activate new volumes whenever udev detects a new block device
+      containing LVM metadata
+    - compile with -fno-stack-protector
+    - clvm depends on cman, rather than suggests, and don't support fence
+    - remove lvm2 init script, since it clashes with our udev rules
+    - make initramfs hook prereq on udev
+    - copy the lvm binary and udev rules across
+    - load the dm-mod, dm-snapshot and dm-mirror modules
+    - Depend on both udev and initramfs-tools
+    - Build-Deps on a newer devmapper
+    - Ubuntu maintainer foobar
+    - copy lvm2.po to lvm2.pot for Rosetta
+
+ -- Fabio M. Di Nitto <[e-mail]>  Tue, 03 Jul 2007 08:20:30 +0200
+
 lvm2 (2.02.26-1) unstable; urgency=low
 
   * New upstream release.
@@ -920,6 +2706,51 @@ lvm2 (2.02.26-1) unstable; urgency=low
 
  -- Bastian Blank <[e-mail]>  Fri, 22 Jun 2007 11:33:50 +0000
 
+lvm2 (2.02.24-6ubuntu3) gutsy; urgency=low
+
+  * Drop libccs-dev Build-Dep:
+    - it was only required for gulm locking (dead since edgy).
+    - HAVE_CCS has not been set for a while and ccs support never built since
+      it was useful only for gulm.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Mon, 11 Jun 2007 12:03:35 +0200
+
+lvm2 (2.02.24-6ubuntu2) gutsy; urgency=low
+
+  * Readd clvm init script.
+
+  * Fix clvm.init:
+    - not run if there is no cluster.conf
+    - not run if cman is not running.
+    - it's ok to fail on stop. (--oknodo)
+    - wait_for_nodes only if we can start.
+
+  (Closes LP: #61794, #115828, #108704, #108120)
+
+ -- Fabio M. Di Nitto <[e-mail]>  Fri, 08 Jun 2007 13:09:50 +0200
+
+lvm2 (2.02.24-6ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - tighter build-depends on libccs-dev, libcman-dev & libdlm-dev
+    - scan and activate new volumes whenever udev detects a new block device
+      containing LVM metadata.
+    - compile with -fno-stack-protector
+    - copy lvm2.po to lvm2.pot for Rosetta
+    - clvm depends on cman, rather than suggests, and don't support fence
+    - init script for clvm
+
+  * Turns out that doing merges dependency-first isn't necessarily the right
+    way; this package replaces lvm-common!  So merge changes I just made
+    there to here:
+    - remove the init script, since it clashes with our udev rules
+    - make initramfs hook prereq on udev
+    - copy the lvm binary and udev rules across
+    - load the dm-mod, dm-snapshot and dm-mirror modules
+  * Depend on both udev and initramfs-tools
+
+ -- Scott James Remnant <[e-mail]>  Tue, 22 May 2007 12:43:07 +0100
+
 lvm2 (2.02.24-6) unstable; urgency=low
 
   * Also replace lvm-common.
@@ -985,6 +2816,94 @@ lvm2 (2.02.06-3) unstable; urgency=low
 
  -- Bastian Blank <[e-mail]>  Sun, 15 Oct 2006 12:05:01 +0000
 
+lvm2 (2.02.06-2ubuntu9) feisty; urgency=low
+
+  * Remove the call to vgck on the creation of devmapper devices; this
+    would cause udev to block, and thus prevent LVM from creating snapshot
+    devices.  LP: #84672.
+    (This also needs a newer libdevmapper to complete the fix)
+
+  * Rename 70-lvm.rules to 85-lvm.rules so that it appears at the correct
+    point; remove the old file rather than transitioning since it was
+    broken anyway.
+
+ -- Scott James Remnant <[e-mail]>  Fri, 30 Mar 2007 17:29:09 +0100
+
+lvm2 (2.02.06-2ubuntu8) feisty; urgency=low
+
+  UdevLvm fix:
+  * Run vgscan and vgchange on block device change as well as add.
+
+ -- Ian Jackson <[e-mail]>  Tue,  6 Feb 2007 19:25:40 +0000
+
+lvm2 (2.02.06-2ubuntu7) feisty; urgency=low
+
+  UdevLvm:
+  * Force loading of dm_mod in initramfs (for some reason the lvm tools do
+    not do this themselves).
+  * Update the initramfs in the postinst.
+  * Update the 70-lvm.rules to
+    - run vgscan as needed;
+    - invoke things via /sbin/lvm rather than relying on the symlinks
+    - run vgck and not vgmknodes (since udev makes the nodes now)
+  * Declare Breaks against old lvm-common and old udev, since our new
+    node generation requires the new working machinery in lvm-common and
+    the corresponding support in udev.
+
+ -- Ian Jackson <[e-mail]>  Tue,  6 Feb 2007 16:35:04 +0000
+
+lvm2 (2.02.06-2ubuntu6) feisty; urgency=low
+
+  * Backport endian fix for dev_is_md from upstream.
+    After a deeper investigation we found out that md super block 0.90.0
+    are machine endian and super block 1 or higher are little endian.
+    On big endian machine (that are the only one affected) we need to compare
+    both values.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Sun, 28 Jan 2007 05:51:59 +0100
+
+lvm2 (2.02.06-2ubuntu5) feisty; urgency=low
+
+  [ Fabio M. Di Nitto ]
+  * Fix dev_is_md check on big endian machines.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Thu, 25 Jan 2007 16:55:37 +0100
+
+lvm2 (2.02.06-2ubuntu4) feisty; urgency=low
+
+  UdevLvm implementation:
+  * Provide udev rules to 1. run vgchange to activate lvs on new block
+    devices containing lvm volumes; 2. run vgmknodes when new dm devices
+    appear, to ensure that things which might depend on the lv symlinks
+    only run after vgchange has finished.
+  * Do symlink-to-..tmp-and-then-rename rather than unlink/symlink,
+    in vgchange, vgmknodes, etc., for /dev/vg/lv link.  (This fixes
+    an obscure race.  Reported with patch to Debian as #402132.)
+
+ -- Ian Jackson <[e-mail]>  Fri,  8 Dec 2006 15:22:20 +0000
+
+lvm2 (2.02.06-2ubuntu3) edgy; urgency=low
+
+  * Disable gcc stack protector to fix some weird segfaults/bus errors.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Wed, 13 Sep 2006 09:59:29 +0200
+
+lvm2 (2.02.06-2ubuntu2) edgy; urgency=low
+
+  * Drop B-D on libgulm-dev since gulm locking is obsoleted.
+
+  * Update Depends: to drop gulm and fence.
+
+  * Rebuild for libdlm2.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Thu, 27 Jul 2006 05:50:20 +0200
+
+lvm2 (2.02.06-2ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+
+ -- Michael Vogt <[e-mail]>  Fri, 30 Jun 2006 11:16:28 +0200
+
 lvm2 (2.02.06-2) unstable; urgency=low
 
   * Fix return value for unknown vg. (closes: #373644)
@@ -1017,6 +2936,14 @@ lvm2 (2.02.05-1) unstable; urgency=low
 
  -- Bastian Blank <[e-mail]>  Fri, 12 May 2006 18:20:01 +0000
 
+lvm2 (2.02.02-1ubuntu1) dapper; urgency=low
+
+  * merged with debian (required to fix ubuntu #38007)
+  * daemons/clvmd/Makefile.in:
+    * added -lpthreads to LDFLAGS to make it build
+
+ -- Michael Vogt <[e-mail]>  Mon,  8 May 2006 11:42:45 +0200
+
 lvm2 (2.02.02-1) unstable; urgency=low
 
   * New upstream version.
@@ -1050,6 +2977,66 @@ lvm2 (2.02.00-1) unstable; urgency=low
 
  -- Bastian Blank <[e-mail]>  Sat, 26 Nov 2005 10:26:42 +0100
 
+lvm2 (2.01.15-0ubuntu5) dapper; urgency=low
+
+  * debian/rules: Copy lvm2.po to lvm2.pot at build, remove it at clean.
+    Closes:
+
+ -- Martin Pitt <[e-mail]>  Thu,  4 May 2006 12:53:41 +0200
+
+lvm2 (2.01.15-0ubuntu4) dapper; urgency=low
+
+  * Call vgscan instead of pvscan in clvm init script.
+
+  * Fix while condition in clvm init script to catch only cluster errors.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Fri, 07 Apr 2006 06:53:52 +0200
+
+lvm2 (2.01.15-0ubuntu3) dapper; urgency=low
+
+  * Call pvscan in clvm init script after clvmd is running
+    to refresh the cache or vgchange might fail.
+
+  * Add wait_for_nodes loop to avoid a possible race condition
+    when starting up the entire cluster all together to clvm init script.
+
+  * Make clvm init script use /etc/default/clvm instead of /etc/default/clvmd.
+
+  * Ship a default clvm.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Thu, 06 Apr 2006 07:32:53 +0200
+
+lvm2 (2.01.15-0ubuntu2) dapper; urgency=low
+
+  * Add init script for clvmd.
+
+  * clvm now Depends: cman | gulm and fence.
+
+  * Build clvm with gulm support.
+
+  * Add Build-Deps: libccs-dev and libgulm-dev.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Wed, 05 Apr 2006 12:52:08 +0200
+
+lvm2 (2.01.15-0ubuntu1) dapper; urgency=low
+
+  * New upstream version.
+
+ -- Matthias Klose <[e-mail]>  Mon, 23 Jan 2006 09:58:28 +0100
+
+lvm2 (2.01.14-3ubuntu2) dapper; urgency=low
+
+  * Drop selinux support since it breaks lvm2-udeb.
+  * Make sure to build with a proper libdevmapper.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Tue, 29 Nov 2005 09:11:39 +0100
+
+lvm2 (2.01.14-3ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Fabio M. Di Nitto <[e-mail]>  Fri, 25 Nov 2005 12:51:58 +0100
+
 lvm2 (2.01.14-3) unstable; urgency=low
 
   * It is pronounced readline, not ncurses. Fix build-deps. (closes: #330715)
@@ -1090,6 +3077,12 @@ lvm2 (2.01.11-1) unstable; urgency=low
 
  -- Bastian Blank <[e-mail]>  Sun, 19 Jun 2005 13:17:48 +0200
 
+lvm2 (2.01.04-5ubuntu1) breezy; urgency=low
+
+  * Bump Build-Deps on libncruses5-dev and libdlm-dev (1.x)
+
+ -- Fabio M. Di Nitto <[e-mail]>  Mon, 30 May 2005 11:05:56 +0200
+
 lvm2 (2.01.04-5) unstable; urgency=low
 
   * Revert -4's rather widespread changes, except for the amd64 fix.
diff --git a/debian/control b/debian/control
index cd9f556..7ced620 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: lvm2
 Section: admin
 Priority: optional
-Maintainer: Debian LVM Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian LVM Team <[e-mail]>
 Uploaders: Bastian Blank <[e-mail]>
 Build-Depends:
  debhelper-compat (= 13),
@@ -11,6 +12,7 @@ Build-Depends:
  libblkid-dev,
  pkg-config,
  systemd-dev (>= 255~rc1-1),
+ thin-provisioning-tools
 Build-Depends-Arch:
  libcmap-dev,
  libcorosync-common-dev,
@@ -55,6 +57,7 @@ Description: Linux Logical Volume Manager
 
 Package: lvm2-udeb
 Package-Type: udeb
+Build-Profiles: <!noudeb>
 Section: debian-installer
 Architecture: linux-any
 Pre-Depends:
@@ -143,6 +146,7 @@ Pre-Depends:
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+Recommends:
  dmsetup (>= ${devmapper:Version}~),
 Multi-Arch: same
 Description: Linux Kernel Device Mapper userspace library
@@ -158,6 +162,7 @@ Description: Linux Kernel Device Mapper userspace library
 
 Package: libdevmapper1.02.1-udeb
 Package-Type: udeb
+Build-Profiles: <!noudeb>
 Section: debian-installer
 Architecture: linux-any
 Pre-Depends:
@@ -193,6 +198,7 @@ Description: Linux Kernel Device Mapper userspace library
 
 Package: dmsetup-udeb
 Package-Type: udeb
+Build-Profiles: <!noudeb>
 Section: debian-installer
 Architecture: linux-any
 Pre-Depends:
diff --git a/debian/initramfs-tools/lvm2/hooks/lvm2 b/debian/initramfs-tools/lvm2/hooks/lvm2
index b28901a..8cb3e46 100755
--- a/debian/initramfs-tools/lvm2/hooks/lvm2
+++ b/debian/initramfs-tools/lvm2/hooks/lvm2
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PREREQ=""
+PREREQ="udev"
 
 prereqs()
 {
diff --git a/debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2 b/debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2
 new file mode 100755
index 0000000..afb4e2e
--- /dev/null
+++ b/debian/initramfs-tools/lvm2/scripts/init-bottom/lvm2
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+PREREQS=""
+
+prereqs() { echo "$PREREQS"; }
+
+case "$1" in
+    prereqs)
+    prereqs
+    exit 0
+    ;;
+esac
+
+# we cannot properly synthesize LVM LV change events with udevadm trigger, so
+# if we use LVM, we need to let it finish; otherwise we get missing LV symlinks
+# (LP #1185394)
+if [ -x /sbin/vgchange ]; then
+    udevadm settle --timeout=121 || true
+fi
+
diff --git a/debian/patches/0014-no-lvm2-monitor-in-containers.patch b/debian/patches/0014-no-lvm2-monitor-in-containers.patch
 new file mode 100644
index 0000000..b3770dd
--- /dev/null
+++ b/debian/patches/0014-no-lvm2-monitor-in-containers.patch
@@ -0,0 +1,19 @@
+Description: Do not start lvmetad in containers
+Author: Balint Reczey <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lvm2/+bug/1576341
+Forwarded: no
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+Index: lvm2-2.03.07-1ubuntu1/scripts/lvm2_monitoring_systemd_red_hat.service.in
+===================================================================
+--- lvm2-2.03.07-1ubuntu1.orig/scripts/lvm2_monitoring_systemd_red_hat.service.in
++++ lvm2-2.03.07-1ubuntu1/scripts/lvm2_monitoring_systemd_red_hat.service.in
+@@ -6,6 +6,7 @@
+ Before=local-fs-pre.target shutdown.target
+ DefaultDependencies=no
+ Conflicts=shutdown.target
++ConditionVirtualization=!container
+ 
+ [Service]
+ Type=oneshot
diff --git a/debian/patches/enable-issue-discards.patch b/debian/patches/enable-issue-discards.patch
 new file mode 100644
index 0000000..8ee4877
--- /dev/null
+++ b/debian/patches/enable-issue-discards.patch
@@ -0,0 +1,18 @@
+Description: Enable "issue_discards" option by default
+ to trim SSDs when changing PVs. This option has no effect if the kernel or the
+ drive does not support trimming, so it's safe to enable by default.
+ See also https://blueprints.launchpad.net/ubuntu/+spec/core-1311-ssd-trimming
+Author: Martin Pitt <[e-mail]>
+Bug-Debian: http://bugs.debian.org/717313
+
+--- a/conf/example.conf.in
++++ b/conf/example.conf.in
+@@ -380,7 +380,7 @@ devices {
+ 	# generally do. If enabled, discards will only be issued if both the
+ 	# storage and kernel provide support.
+ 	# This configuration option has an automatic default value.
+-	# issue_discards = 0
++	issue_discards = 1
+ 
+ 	# Configuration option devices/allow_changes_with_duplicate_pvs.
+ 	# Allow VG modification while a PV appears on multiple devices.
diff --git a/debian/patches/fix-systemd-run-location.patch b/debian/patches/fix-systemd-run-location.patch
 new file mode 100644
index 0000000..87147ae
--- /dev/null
+++ b/debian/patches/fix-systemd-run-location.patch
@@ -0,0 +1,21 @@
+Description: Fix location of systemd-run
+ systemd-run is installed into /usr/bin, not BINDIR aka /bin.
+Author: Julian Andres Klode <[e-mail]>
+Origin: vendor
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lvm2/+bug/1830169
+Forwarded: no
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: lvm2-2.03.07-1ubuntu1/udev/69-dm-lvm-metad.rules.in
+===================================================================
+--- lvm2-2.03.07-1ubuntu1.orig/udev/69-dm-lvm-metad.rules.in
++++ lvm2-2.03.07-1ubuntu1/udev/69-dm-lvm-metad.rules.in
+@@ -113,7 +113,7 @@
+ #  MD    |          |      X      |       X*       |                   |
+ #  loop  |          |      X      |       X*       |                   |
+ #  other |    X     |      X      |       X        |                   |   X
+-ACTION!="remove", ENV{LVM_PV_GONE}=="1", RUN+="(BINDIR)/systemd-run (LVM_EXEC)/lvm pvscan --cache $major:$minor", GOTO="lvm_end"
++ACTION!="remove", ENV{LVM_PV_GONE}=="1", RUN+="/usr/bin/systemd-run (LVM_EXEC)/lvm pvscan --cache $major:$minor", GOTO="lvm_end"
+ ENV{SYSTEMD_ALIAS}="/dev/block/$major:$minor"
+ ENV{SYSTEMD_WANTS}+="lvm2-pvscan@$major:$minor.service"
+ GOTO="lvm_end"
diff --git a/debian/patches/series b/debian/patches/series
index 7bb8252..a4eda8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
 debian-changes
+enable-issue-discards.patch
+0014-no-lvm2-monitor-in-containers.patch
+fix-systemd-run-location.patch
diff --git a/debian/rules b/debian/rules
index cf48c79..3fa9486 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,7 +72,10 @@ endef
 
 BUILDS :=
 ifneq ($(filter lvm2,$(shell dh_listpackages)),)
-BUILDS += deb udeb
+BUILDS += deb
+endif
+ifneq ($(filter lvm2-udeb,$(shell dh_listpackages)),)
+BUILDS += udeb
 endif
 ifneq ($(filter lvm2-dbusd,$(shell dh_listpackages)),)
 BUILDS += deb_all
@@ -89,6 +92,7 @@ dh_auto_configure.%:
 	mkdir -p debian/build/build_$*
 	cp -al $(filter-out debian, $(wildcard * .[^.]*)) debian/build/build_$*/
 	dh_auto_configure --sourcedirectory=debian/build/build_$* -- $(strip $(CONFARGS.$*))
+	cp po/lvm2.po po/lvm2.pot
 
 dh_auto_build.%:
 	dh_auto_build --sourcedirectory=debian/build/build_$* -- \
@@ -105,6 +109,7 @@ dh_auto_install.%:
 
 override_dh_auto_clean:
 	rm -rf debian/build
+	rm -f po/lvm2.pot
 
 override_dh_gencontrol:
 	dh_gencontrol \
@@ -120,10 +125,12 @@ override_dh_gencontrol:
 		-- $(GENCONTROL_ARGS)
 
 override_dh_install:
+ifneq ($(filter lvm2-udeb,$(shell dh_listpackages)),)
 	dh_install --sourcedir=debian/build/install_udeb \
 		-pdmsetup-udeb \
 		-plibdevmapper$(DEVMAPPER_ABINAME)-udeb \
 		-plvm2-udeb
+endif
 	dh_install --sourcedir=debian/build/install_deb_all \
 		-plvm2-dbusd
 	dh_install --sourcedir=debian/build/install_deb \