[Debian-ha-commits] [cluster-glue] 47/73: Updated fields for folding
Richard Winters
devrik-guest at moszumanska.debian.org
Sat Apr 18 20:24:37 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 1d5aa11a37c7c93c9dd351ee516b65465599ec5f
Author: Richard B Winters <rik at mmogp.com>
Date: Thu Apr 16 05:37:04 2015 -0400
Updated fields for folding
Change-Id: I183003c2215df0d35de13ec0c210154c10b506b9
Signed-off-by: Richard B Winters <rik at mmogp.com>
---
debian/control | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 102 insertions(+), 14 deletions(-)
diff --git a/debian/control b/debian/control
index 1abfe4b..661626a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: cluster-glue
Section: admin
Priority: optional
Maintainer: Debian HA Maintainers <debian-ha-maintainers at lists.alioth.debian.org>
+<<<<<<< Upstream, based on debianhistory
Uploaders: Martin Loschwitz <madkiss at debian.org>, Anibal Monsalve Salazar <anibal at debian.org>, Simon Horman <horms at debian.org>, Frederik Schüler <fs at debian.org>
<<<<<<< Upstream, based on debianhistory
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, libgnutls-dev, python-dev (>= 2.6.6-3~), libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev, libopenipmi-dev, autoconf, automake, libtool, xsltp [...]
@@ -50,6 +51,56 @@ Description: Reusable cluster libraries -- libplumb2
This package contains the plumber ibrary from cluster-glue, the
=======
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, autoconf, automake, libtool, xsltproc, docbook-xs [...]
+=======
+Uploaders: Martin Loschwitz <madkiss at debian.org>,
+ Anibal Monsalve Salazar <anibal 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,
+ autoconf,
+ automake,
+ libtool,
+ xsltproc,
+ docbook-xsl,
+ chrpath,
+ docbook-xml,
+ libdbus-glib-1-dev,
+ libdbus-1-dev,
+ help2man,
+ libaio-dev,
+ hardening-wrapper,
+ asciidoc,
+ libxml2-utils
+>>>>>>> 56527a7 Updated fields for folding
Standards-Version: 3.9.5
Homepage: http://hg.linux-ha.org/glue/
Vcs-Hg: http://hg.debian.org/hg/debian-ha/cluster-glue
@@ -59,7 +110,12 @@ Package: libcluster-glue
Architecture: all
Section: oldlibs
Priority: extra
-Depends: ${misc:Depends}, liblrm2 (>= ${binary:Version}), libpils2 (>= ${binary:Version}), libplumb2 (>= ${binary:Version}), libplumbgpl2 (>= ${binary:Version}), libstonith1 (>= ${binary:Version})
+Depends: ${misc:Depends},
+ liblrm2 (>= ${binary:Version}),
+ libpils2 (>= ${binary:Version}),
+ libplumb2 (>= ${binary:Version}),
+ libplumbgpl2 (>= ${binary:Version}),
+ libstonith1 (>= ${binary:Version})
Description: Reusable cluster libraries (transitional package)
This package used to contain all the libraries from cluster-glue,
the reusable cluster components package. It's now a transitional
@@ -68,7 +124,8 @@ Description: Reusable cluster libraries (transitional package)
Package: liblrm2
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Replaces: libcluster-glue (<= 1.0.6-1)
Conflicts: libcluster-glue (<= 1.0.6-1)
Description: Reusable cluster libraries -- liblrm2
@@ -78,7 +135,8 @@ Description: Reusable cluster libraries -- liblrm2
Package: libpils2
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Replaces: libcluster-glue (<= 1.0.6-1)
Conflicts: libcluster-glue (<= 1.0.6-1)
Description: Reusable cluster libraries -- libpils2
@@ -88,7 +146,8 @@ Description: Reusable cluster libraries -- libpils2
Package: libplumb2
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Replaces: libcluster-glue (<= 1.0.6-1)
Conflicts: libcluster-glue (<= 1.0.6-1)
Description: Reusable cluster libraries -- libplumb2
@@ -99,7 +158,8 @@ Description: Reusable cluster libraries -- libplumb2
Package: libplumbgpl2
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Replaces: libcluster-glue (<= 1.0.6-1)
Conflicts: libcluster-glue (<= 1.0.6-1)
Description: Reusable cluster libraries -- libplumbgpl2
@@ -109,7 +169,8 @@ Description: Reusable cluster libraries -- libplumbgpl2
Package: libstonith1
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Replaces: libcluster-glue (<= 1.0.6-1), libstonith0
Conflicts: libcluster-glue (<= 1.0.6-1), libstonith0
Description: Reusable cluster libraries -- libstonith1
@@ -120,7 +181,8 @@ Description: Reusable cluster libraries -- libstonith1
Package: liblrm2-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, liblrm2 (= ${binary:Version})
+Depends: ${misc:Depends},
+ liblrm2 (= ${binary:Version})
Replaces: libcluster-glue-dev (<= 1.0.6-1)
Conflicts: libcluster-glue-dev (<= 1.0.6-1)
Description: Reusable cluster development files -- liblrm
@@ -131,7 +193,9 @@ Description: Reusable cluster development files -- liblrm
Package: libpils2-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libpils2 (= ${binary:Version}), libltdl-dev
+Depends: ${misc:Depends},
+ libpils2 (= ${binary:Version}),
+ libltdl-dev
Replaces: libcluster-glue-dev (<= 1.0.6-1)
Conflicts: libcluster-glue-dev (<= 1.0.6-1)
Description: Reusable cluster development files -- libpils2
@@ -142,7 +206,8 @@ Description: Reusable cluster development files -- libpils2
Package: libplumb2-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libplumb2 (= ${binary:Version})
+Depends: ${misc:Depends},
+ libplumb2 (= ${binary:Version})
Replaces: libcluster-glue-dev (<= 1.0.6-1)
Conflicts: libcluster-glue-dev (<= 1.0.6-1)
Description: Reusable cluster development files -- libplumb2
@@ -153,7 +218,8 @@ Description: Reusable cluster development files -- libplumb2
Package: libplumbgpl2-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libplumbgpl2 (= ${binary:Version})
+Depends: ${misc:Depends},
+ libplumbgpl2 (= ${binary:Version})
Replaces: libcluster-glue-dev (<= 1.0.6-1)
Conflicts: libcluster-glue-dev (<= 1.0.6-1)
Description: Reusable cluster development files -- libplumbgpl2
@@ -164,7 +230,8 @@ Description: Reusable cluster development files -- libplumbgpl2
Package: libstonith1-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libstonith1 (= ${binary:Version})
+Depends: ${misc:Depends},
+ libstonith1 (= ${binary:Version})
Replaces: libcluster-glue-dev (<= 1.0.6-1), libstonith0-dev
Conflicts: libcluster-glue-dev (<= 1.0.6-1), libstonith0-dev
Description: Reusable cluster development files -- libstonith1
@@ -176,7 +243,12 @@ Package: libcluster-glue-dev
Architecture: all
Section: oldlibs
Priority: extra
-Depends: ${misc:Depends}, liblrm2-dev (>= ${binary:Version}), libpils2-dev (>= ${binary:Version}), libplumb2-dev (>= ${binary:Version}), libplumbgpl2-dev (>= ${binary:Version}), libstonith1-dev (>= ${binary:Version})
+Depends: ${misc:Depends},
+ liblrm2-dev (>= ${binary:Version}),
+ libpils2-dev (>= ${binary:Version}),
+ libplumb2-dev (>= ${binary:Version}),
+ libplumbgpl2-dev (>= ${binary:Version}),
+ libstonith1-dev (>= ${binary:Version})
Description: Reusable cluster components for Linux HA (transitional package)
This package used to contain all the development files for the
libraries from cluster-glue, the reusable cluster components
@@ -186,7 +258,16 @@ Description: Reusable cluster components for Linux HA (transitional package)
Package: cluster-glue
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}, libtimedate-perl, liblrm2 (= ${binary:Version}), libpils2 (= ${binary:Version}), libplumb2 (= ${binary:Version}), libplumbgpl2 (= ${binary:Version}), libstonith1 (= ${binary:Version})
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${perl:Depends},
+ ${python:Depends},
+ libtimedate-perl,
+ liblrm2 (= ${binary:Version}),
+ libpils2 (= ${binary:Version}),
+ libplumb2 (= ${binary:Version}),
+ libplumbgpl2 (= ${binary:Version}),
+ libstonith1 (= ${binary:Version})
Replaces: heartbeat (<= 2.99.2+sles11r9-5), heartbeat-common (<= 2.99.2+sles11r9-5), libheartbeat2 (<= 2.99.2+sles11r9-5)
Conflicts: heartbeat (<= 2.99.2+sles11r9-5), heartbeat-common (<= 2.99.2+sles11r9-5), libheartbeat2 (<= 2.99.2+sles11r9-5)
Description: Reusable cluster components for Linux HA
@@ -196,7 +277,14 @@ Description: Reusable cluster components for Linux HA
Package: cluster-glue-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, liblrm2-dev (= ${binary:Version}), libpils2-dev (= ${binary:Version}), libplumb2-dev (= ${binary:Version}), libplumbgpl2-dev (= ${binary:Version}), libstonith1-dev (= ${binary:Version})
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${perl:Depends},
+ liblrm2-dev (= ${binary:Version}),
+ libpils2-dev (= ${binary:Version}),
+ libplumb2-dev (= ${binary:Version}),
+ libplumbgpl2-dev (= ${binary:Version}),
+ libstonith1-dev (= ${binary:Version})
Replaces: libcluster-glue-dev (<= 1.0.6-1)
Conflicts: libcluster-glue-dev (<= 1.0.6-1)
Description: Development files for the cluster glue components
--
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