r918 - lvm2/trunk/debian
Bastian Blank
waldi at alioth.debian.org
Sun May 27 16:49:38 UTC 2012
Author: waldi
Date: Sun May 27 16:49:38 2012
New Revision: 918
Log:
* debian/control: Fix dependencies.
* debian/rules: Fix install dependencies.
Modified:
lvm2/trunk/debian/control
lvm2/trunk/debian/rules
Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control Sun May 27 16:34:13 2012 (r917)
+++ lvm2/trunk/debian/control Sun May 27 16:49:38 2012 (r918)
@@ -50,7 +50,7 @@
Package: libdevmapper-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libdevmapper1.02.1 (= ${binary:Version}), libdevmapper-events1.02.1 (= ${binary:Version}), libselinux1-dev
+Depends: ${misc:Depends}, libdevmapper1.02.1 (= ${binary:Version}), libdevmapper-event1.02.1 (= ${binary:Version}), libselinux1-dev
Description: Linux Kernel Device Mapper header files
The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management)
Team's implementation of a minimalistic kernel-space driver that handles
@@ -128,7 +128,7 @@
Section: libs
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Linux Kernel Device Mapper event support library
The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management)
Team's implementation of a minimalistic kernel-space driver that handles
@@ -141,7 +141,7 @@
Package: dmeventd
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
# No Multi-Arch: foreign, plugins depend on the current architecture
Description: Linux Kernel Device Mapper event daemon
The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management)
Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules Sun May 27 16:34:13 2012 (r917)
+++ lvm2/trunk/debian/rules Sun May 27 16:49:38 2012 (r918)
@@ -176,7 +176,7 @@
install_dmsetup: export DH_OPTIONS = -pdmsetup
install_dmsetup: DIR = $(BUILD_DIR)/install_deb
-install_dmsetup: $(STAMPS_DIR)/install_deb
+install_dmsetup: $(STAMPS_DIR)/install_deb install_libdevmapper
+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
+$(MAKE_SELF) install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
@@ -184,7 +184,7 @@
install_dmsetup-udeb: export DH_OPTIONS = -p$(PACKAGE_NAME)
install_dmsetup-udeb: PACKAGE_FILE = $(PACKAGE_NAME)_$(DEVMAPPER_VERSION_FILE)_$(DEB_HOST_ARCH).udeb
install_dmsetup-udeb: DIR = $(BUILD_DIR)/install_udeb
-install_dmsetup-udeb: $(STAMPS_DIR)/install_udeb
+install_dmsetup-udeb: $(STAMPS_DIR)/install_udeb install_libdevmapper
+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
+$(MAKE_SELF) install-base \
BUILDDEB_ARGS="--filename=$(PACKAGE_FILE)" \
@@ -227,7 +227,7 @@
install_liblvm2: export DH_OPTIONS = -pliblvm2app$(LVM2APP_ABINAME) -pliblvm2cmd$(LVM2CMD_ABINAME) -pliblvm2-dev
install_liblvm2: DIR = $(BUILD_DIR)/install_deb
-install_liblvm2: $(STAMPS_DIR)/install_deb
+install_liblvm2: $(STAMPS_DIR)/install_deb install_libdevmapper
+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
dh_makeshlibs -V -- -c2
+$(MAKE_SELF) install-base
More information about the pkg-lvm-commits
mailing list