buildsys: update make upload target for stretch

[lvm.git] / patchdir / jessie-remove-udebs.patch

Index: new/debian/control
===================================================================
--- new.orig/debian/control
+++ new/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Debian LVM Team <pkg-lvm-maintainers@lists.alioth.debian.org>
 Uploaders: Bastian Blank <waldi@debian.org>
-Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), dh-systemd, automake, libcman-dev (>> 2), libcorosync-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, openais-dev, pkg-config
+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), dh-systemd, automake, libcorosync-pve-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, pkg-config
 Standards-Version: 3.9.5
 Homepage: http://sources.redhat.com/lvm2/
 Vcs-Svn: svn://svn.debian.org/pkg-lvm/lvm2/trunk/
@@ -22,25 +22,11 @@ Description: Linux Logical Volume Manage
  volume groups can be allocated to logical volumes, which are accessed as
  regular block devices.
 
-Package: lvm2-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Linux Logical Volume Manager
- This is a udeb, or a microdeb, for the debian-installer.
- .
- This is LVM2, the rewrite of The Linux Logical Volume Manager.  LVM
- supports enterprise level volume management of disk and disk subsystems
- by grouping arbitrary disks into volume groups. The total capacity of
- volume groups can be allocated to logical volumes, which are accessed as
- regular block devices.
-
 Package: clvm
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, lvm2 (= ${binary:Version}), lsb-base
-Recommends: corosync | openais | cman
+Recommends: corosync-pve
 Multi-Arch: foreign
 Description: Cluster LVM Daemon for lvm2
  This package provides the clustering interface for lvm2, when used with
@@ -83,20 +69,6 @@ Description: Linux Kernel Device Mapper
  device-mapper; it allows usage of the device-mapper through a clean,
  consistent interface (as opposed to through kernel ioctls).
 
-Package: libdevmapper1.02.1-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Linux Kernel Device Mapper userspace library
- This is a udeb, or a microdeb, for the debian-installer.
- .
- The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management)
- Team's implementation of a minimalistic kernel-space driver that handles
- volume management, while keeping knowledge of the underlying device layout
- in user-space.  This makes it useful for not only LVM, but EVMS, software
- raid, and other drivers that create "virtual" block devices.
-
 Package: dmsetup
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>> 2.16)
@@ -105,20 +77,6 @@ Multi-Arch: foreign
 Description: Linux Kernel Device Mapper userspace library
  The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management)
  Team's implementation of a minimalistic kernel-space driver that handles
- volume management, while keeping knowledge of the underlying device layout
- in user-space.  This makes it useful for not only LVM, but EVMS, software
- raid, and other drivers that create "virtual" block devices.
- .
- This package contains a utility for modifying device mappings.
-
-Package: dmsetup-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Linux Kernel Device Mapper userspace library
- The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management)
- Team's implementation of a minimalistic kernel-space driver that handles
  volume management, while keeping knowledge of the underlying device layout
  in user-space.  This makes it useful for not only LVM, but EVMS, software
  raid, and other drivers that create "virtual" block devices.
Index: new/debian/rules
===================================================================
--- new.orig/debian/rules
+++ new/debian/rules
@@ -258,7 +258,7 @@ install_lvm2-udeb: $(STAMPS_DIR)/install
 	+$(MAKE_SELF) install-base
 
 binary-indep:
-binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-event libdevmapper-dev dmsetup dmsetup-udeb dmeventd liblvm2 lvm2 lvm2-udeb clvm)
+binary-arch: $(addprefix install_,libdevmapper libdevmapper-event libdevmapper-dev dmsetup dmeventd liblvm2 lvm2 clvm)
 
 binary: binary-indep binary-arch