[Debian-ha-commits] [cluster-glue] 45/73: Imported Debian patch 1.0.12~rc1+hg2777-1.2

Richard Winters devrik-guest at moszumanska.debian.org
Sat Apr 18 20:24:36 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 7444a483e28b8e45b23ccea80e249187615bb3fe
Author: Matthias Klose <doko at debian.org>
Date:   Mon Oct 13 20:55:43 2014 +0200

    Imported Debian patch 1.0.12~rc1+hg2777-1.2
---
 debian/changelog                      | 18 +++++++++++
 debian/control                        | 47 +++++++++++++++++++++++++++++
 debian/patches/libtoolize_check.patch | 56 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  4 +++
 4 files changed, 125 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index af56b22..f783462 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+<<<<<<< Upstream, based on debianhistory
+=======
+cluster-glue (1.0.12~rc1+hg2777-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Johannes Schauer ]
+  * Check for libtoolize rather than libtool. Closes: #761737
+
+  [ Andreas Metzler ]
+  * Drop unused build-dependency on libgnutls-dev. Closes: #764093
+
+  [ Matthias Klose ]
+  * Fix typo in package description. Closes: #712998.
+
+ -- Matthias Klose <doko at debian.org>  Mon, 13 Oct 2014 20:55:43 +0200
+
+>>>>>>> 479d35b Imported Debian patch 1.0.12~rc1+hg2777-1.2
 cluster-glue (1.0.12~rc1+hg2777-1) unstable; urgency=medium
 
   * New upstream release, upload to unstable
diff --git a/debian/control b/debian/control
index 7ec7bcb..1abfe4b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Debian HA Maintainers <debian-ha-maintainers at lists.alioth.debian.org>
 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 [...]
 Standards-Version: 3.9.5
 Homepage: http://hg.linux-ha.org/glue/
@@ -47,6 +48,52 @@ Replaces: libcluster-glue (<= 1.0.6-1)
 Conflicts: libcluster-glue (<= 1.0.6-1)
 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 [...]
+Standards-Version: 3.9.5
+Homepage: http://hg.linux-ha.org/glue/
+Vcs-Hg: http://hg.debian.org/hg/debian-ha/cluster-glue
+Vcs-Browser: http://hg.debian.org/hg/debian-ha/cluster-glue
+
+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})
+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
+ package without any content, depending on all the single library
+ packages that now exist.
+
+Package: liblrm2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libcluster-glue (<= 1.0.6-1)
+Conflicts: libcluster-glue (<= 1.0.6-1)
+Description: Reusable cluster libraries -- liblrm2
+ This package contains the lrm helper library from cluster-glue,
+ the reusable cluster components package. Install it if you want 
+ to use the pacemaker cluster manager.
+
+Package: libpils2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libcluster-glue (<= 1.0.6-1)
+Conflicts: libcluster-glue (<= 1.0.6-1)
+Description: Reusable cluster libraries -- libpils2
+ This package contains the pils library from cluster-glue, the 
+ reusable cluster components package. Install it if you want to 
+ use the pacemaker cluster manager.
+ 
+Package: libplumb2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libcluster-glue (<= 1.0.6-1)
+Conflicts: libcluster-glue (<= 1.0.6-1)
+Description: Reusable cluster libraries -- libplumb2
+ This package contains the plumber library from cluster-glue, the 
+>>>>>>> 479d35b Imported Debian patch 1.0.12~rc1+hg2777-1.2
  reusable cluster components package. Install it if you want to 
  use the pacemaker cluster manager.
 
diff --git a/debian/patches/libtoolize_check.patch b/debian/patches/libtoolize_check.patch
new file mode 100644
index 0000000..b2eb71b
--- /dev/null
+++ b/debian/patches/libtoolize_check.patch
@@ -0,0 +1,56 @@
+Description: check for libtoolize rather than libtool
+Author: Johannes Schauer <j.schauer at email.de>
+Forwarded: no
+
+--- cluster-glue-1.0.12~rc1+hg2777.orig/autogen.sh
++++ cluster-glue-1.0.12~rc1+hg2777/autogen.sh
+@@ -91,16 +91,11 @@ do
+   fi
+ done
+ 
+-for command in libtool14 libtool15 libtool glibtool 
+-do
+-  URL=$gnu/$pkg/
+-  if
+-    testProgram $command
+-  then
+-    libtool=$command
+-    libtoolize=`echo  "$libtool" | sed -e 's/libtool/libtoolize/'`
+-  fi
+-done
++if
++  testProgram libtoolize
++then
++  libtoolize=libtoolize
++fi
+ 
+ if [ -z $autoconf ]; then 
+     echo You must have autoconf installed to compile the cluster-glue package.
+@@ -114,7 +109,7 @@ elif [ -z $automake ]; then
+     echo or get the source tarball at: $gnu/automake/
+     exit 1
+ 
+-elif [ -z $libtool ]; then 
++elif [ -z $libtoolize ]; then 
+     echo You must have libtool installed to compile the cluster-glue package.
+     echo Download the appropriate package for your system,
+     echo or get the source tarball at: $gnu/libtool/
+@@ -125,7 +120,7 @@ oneline() {
+   read x; echo "$x"
+ }
+ 
+-LT_version=`$libtool --version | oneline | sed -e 's%^[^0-9]*%%' -e s'% .*%%'`
++LT_version=`$libtoolize --version | oneline | sed -e 's%^[^0-9]*%%' -e s'% .*%%'`
+ LT_majvers=`echo "$LT_version" | sed -e 's%\..*%%'`
+ LT_minvers=`echo "$LT_version" | sed -e 's%^[^.]*\.%%' `
+ LT_minnum=`echo  "$LT_minvers" | sed -e 's%[^0-9].*%%'`
+@@ -138,8 +133,7 @@ then
+ fi
+ 
+ # Create local copies so that the incremental updates will work.
+-rm -f ./autoconf ./automake ./autoheader ./libtool
+-ln -s `which $libtool` ./libtool
++rm -f ./autoconf ./automake ./autoheader
+ ln -s `which $autoconf` ./autoconf
+ ln -s `which $automake` ./automake
+ ln -s `which $autoheader` ./autoheader
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..14391dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+<<<<<<< Upstream, based on debianhistory
+=======
+libtoolize_check.patch
+>>>>>>> 479d35b Imported Debian patch 1.0.12~rc1+hg2777-1.2

-- 
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