[Debian-ha-commits] [cluster-glue] 48/73: Removed duplicate depends on source package; libtool,psmisc
Richard Winters
devrik-guest at moszumanska.debian.org
Mon Apr 20 01:41:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
devrik-guest pushed a commit to branch master
in repository cluster-glue.
commit 6f8f37d1d4a509a22cd00a471f135847dc78d242
Author: Richard B Winters <rik at mmogp.com>
Date: Thu Apr 16 05:51:46 2015 -0400
Removed duplicate depends on source package; libtool,psmisc
Change-Id: Ia12ce9294f4dd13aabb517d120085b90624fea89
Signed-off-by: Richard B Winters <rik at mmogp.com>
---
debian/control | 71 +++++++++++++++++++++++++++++++---------------------------
1 file changed, 38 insertions(+), 33 deletions(-)
diff --git a/debian/control b/debian/control
index 7d25cc4..b1831dc 100644
--- a/debian/control
+++ b/debian/control
@@ -11,50 +11,55 @@ Uploaders: Martin Loschwitz <madkiss at debian.org>,
Simon Horman <horms at debian.org>,
Frederik Schüler <fs at debian.org>
Build-Depends: debhelper (>= 7),
- libsnmp-dev,
- libglib2.0-dev,
- perl,
- net-tools,
- iputils-ping,
- python (>= 2.6.6-3~),
- 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 | libsensors-dev,
- libltdl3-dev,
- swig,
- openssh-client,
- python-dev (>= 2.6.6-3~),
- libpam0g-dev,
- libncurses5-dev,
- psmisc,
- libopenhpi-dev,
- libopenipmi-dev,
+ asciidoc,
autoconf,
automake,
- libtool,
- xsltproc,
+ bison,
+ chrpath,
docbook-xsl,
- chrpath,
- docbook-xml,
+ docbook-xml,
+ flex,
+ help2man,
+ hardening-wrapper,
+ iproute,
+ iputils-ping,
+ libaio-dev,
+ libbz2-dev,
+ libcurl4-openssl-dev | libcurl3-openssl-dev,
libdbus-glib-1-dev,
libdbus-1-dev,
+<<<<<<< Upstream, based on debianhistory
help2man,
libaio-dev,
hardening-wrapper,
asciidoc,
libxml2-utils
>>>>>>> 56527a7 Updated fields for folding
+=======
+ libglib2.0-dev,
+ libltdl3-dev,
+ libnet1-dev,
+ libncurses5-dev,
+ libopenhpi-dev,
+ libopenipmi-dev,
+ libpam0g-dev,
+ libsensors4-dev | libsensors-dev,
+ libtool,
+ libsnmp-dev,
+ libxml2-dev,
+ libxml2-utils,
+ lynx,
+ net-tools,
+ openssh-client,
+ perl,
+ psmisc,
+ python-dev (>= 2.6.6-3~),
+ python (>= 2.6.6-3~),
+ swig,
+ uuid-dev,
+ xsltproc,
+ zlib1g-dev,
+>>>>>>> f822afd Removed duplicate depends on source package; libtool,psmisc
Standards-Version: 3.9.5
Homepage: http://hg.linux-ha.org/glue/
Vcs-Hg: http://hg.debian.org/hg/debian-ha/cluster-glue
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/cluster-glue.git
More information about the Debian-HA-Commits
mailing list