From cd02c36e91995b6c9c7a88d874362ae3c280e775 Mon Sep 17 00:00:00 2001 From: xq2005 Date: Wed, 20 Feb 2013 08:41:38 +0000 Subject: [PATCH] resolve the conflict between ipmitool and ipmitool-xcat Former-commit-id: 5cfc8afad85ded92a5c32211089b1222039c11b2 --- ipmitool/debian/control | 2 -- ipmitool/debian/dirs | 5 +---- ipmitool/debian/rules | 2 ++ 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ipmitool/debian/control b/ipmitool/debian/control index eddfc48..436ce07 100644 --- a/ipmitool/debian/control +++ b/ipmitool/debian/control @@ -10,8 +10,6 @@ Package: ipmitool-xcat Architecture: i386 amd64 ia64 Depends: ${shlibs:Depends}, lsb-base Suggests: openipmi -Conflicts: ipmitool -Replaces: ipmitool Description: utility for IPMI control with kernel driver or LAN interface A utility for managing and configuring devices that support the Intelligent Platform Management Interface. IPMI is an open standard diff --git a/ipmitool/debian/dirs b/ipmitool/debian/dirs index 58600cc..4576483 100644 --- a/ipmitool/debian/dirs +++ b/ipmitool/debian/dirs @@ -1,4 +1 @@ -usr/bin -usr/sbin -usr/share/ipmitool -usr/share/doc/ipmitool +/opt/xcat/bin/ diff --git a/ipmitool/debian/rules b/ipmitool/debian/rules index ab9cf6e..6d9fa64 100755 --- a/ipmitool/debian/rules +++ b/ipmitool/debian/rules @@ -73,6 +73,7 @@ install-arch: # debian/tmp. $(MAKE) install DESTDIR=$(CURDIR)/debian/ipmitool-xcat + cp $(CURDIR)/debian/ipmitool-xcat/usr/bin/ipmitool $(CURDIR)/debian/ipmitool-xcat/opt/xcat/bin/ipmitool-xcat # No need to have two copies of the license text in the package. $(RM) $(CURDIR)/debian/ipmitool-xcat/usr/share/doc/ipmitool/COPYING @@ -96,6 +97,7 @@ binary-common: dh_installinit --name ipmievd dh_link dh_strip + rm -rf $(CURDIR)/debian/ipmitool-xcat/usr dh_compress dh_fixperms dh_makeshlibs