From 4fd77e0acfd0ce5561f55a1183b3615416c45ff1 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 22 Jun 2011 12:38:29 +0000 Subject: [PATCH] Drop virtual packages (unneeded), drop depends on python-xml and update changelog. From: Michael Prokop --- debian/changelog | 13 ++-- debian/control | 60 +------------------ .../{ldirectord.files => ldirectord-2.files} | 0 ...rectord.postinst => ldirectord-2.postinst} | 0 debian/rules | 2 +- 5 files changed, 12 insertions(+), 63 deletions(-) rename debian/{ldirectord.files => ldirectord-2.files} (100%) rename debian/{ldirectord.postinst => ldirectord-2.postinst} (100%) diff --git a/debian/changelog b/debian/changelog index 9093a08..a23b62f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,16 @@ heartbeat-2 (2.1.3-6lenny4~bpo60+1) squeeze-backports; urgency=low * Rebuild for squeeze-backports. + * Adjust file path (/usr/lib<->/usr/lib64) for building the Debian + package properly on 64bit systems. + * Rename package to heartbeat-2 (and other binary packages + accordingly as well) to avoid conflicts with versions in squeeze. * Replace build-depends on libsensors-dev with libsensors4-dev. - * Adjust file path (/usr/lib) in Debian package for 64bit - version (/usr/lib64). - * Rename package to heartbeat-2 to avoid conflicts with version - in squeeze. + * Drop python-xml from depends of hearbeat-2-gui (see #540475). + * Drop all virtual packages since we don't support anything + older than squeeze. - -- Michael Prokop Tue, 21 Jun 2011 23:21:44 +0200 + -- Michael Prokop Wed, 22 Jun 2011 14:06:06 +0200 heartbeat (2.1.3-6lenny4) stable-proposed-updates; urgency=low diff --git a/debian/control b/debian/control index 0f3866d..6ec0af5 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,12 @@ Source: heartbeat-2 Section: admin Priority: optional Maintainer: Simon Horman +Uploaders: Michael Prokop Build-Depends: debhelper (>= 5.0.37.2), libsnmp-dev, libglib2.0-dev, perl, net-tools, iputils-ping, python, psmisc, libnet1-dev, iproute, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, lynx, libbz2-dev, zlib1g-dev, uuid-dev, libsensors4-dev, libltdl3-dev, swig, openssh-client, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev Standards-Version: 3.7.3 XS-Python-Version: current -Package: ldirectord +Package: ldirectord-2 Section: admin Priority: extra Architecture: all @@ -62,63 +63,8 @@ Package: heartbeat-2-gui Section: admin Priority: optional Architecture: any -Depends: ${python:Depends}, python-gtk2, python-glade2, uuid-runtime, python-xml +Depends: ${python:Depends}, python-gtk2, python-glade2, uuid-runtime Suggests: heartbeat-2 (= ${binary:Version}) XB-Python-Version: ${python:Versions} Description: Provides a gui interface to manage heartbeat clusters GUI client for heartbeat clusters - -Package: ldirectord-2 -Section: admin -Priority: optional -Architecture: all -Depends: ldirectord (= ${source:Version}) -Description: Monitors virtual services provided by LVS - This is a transitional dummy package. If nothing depends on it, this - package can be safely removed. - -Package: stonith -Section: libs -Priority: optional -Architecture: any -Depends: heartbeat-2 (= ${binary:Version}) -Description: Interface for remotely powering down a node in the cluster - This is a transitional dummy package. If nothing depends on it, this - package can be safely removed. - -Package: libstonith0 -Section: libs -Priority: optional -Architecture: any -Depends: heartbeat-2 (= ${binary:Version}) -Description: Interface for remotely powering down a node in the cluster - This is a transitional dummy package. If nothing depends on it, this - package can be safely removed. - -Package: libstonith-dev -Section: admin -Priority: optional -Architecture: all -Depends: heartbeat-2-dev (>= ${source:Version}) -Description: Interface for remotely powering down a node in the cluster - This is a transitional dummy package. If nothing depends on it, this - package can be safely removed. - -Package: libpils0 -Section: libs -Priority: optional -Architecture: any -Depends: heartbeat-2 (= ${binary:Version}) -Description: Plugin and Interface Loading System - This is a transitional dummy package. If nothing depends on it, this - package can be safely removed. - -Package: libpils-dev -Section: admin -Priority: optional -Architecture: all -Depends: heartbeat-2-dev (>= ${source:Version}) -Description: Plugin and Interface Loading System - development files - This is a transitional dummy package. If nothing depends on it, this - package can be safely removed. - diff --git a/debian/ldirectord.files b/debian/ldirectord-2.files similarity index 100% rename from debian/ldirectord.files rename to debian/ldirectord-2.files diff --git a/debian/ldirectord.postinst b/debian/ldirectord-2.postinst similarity index 100% rename from debian/ldirectord.postinst rename to debian/ldirectord-2.postinst diff --git a/debian/rules b/debian/rules index d64a965..e75a755 100755 --- a/debian/rules +++ b/debian/rules @@ -109,7 +109,7 @@ install-stamp: $(DTMP)/etc/default/ldirectord cd $(DTMP)/etc/ && ln -s ha.d heartbeat # debug: - find $(DTMP) + #find $(DTMP) dh_movefiles --source=debian/tmp binary-indep: build install