[Debian-ha-commits] [cluster-glue] 15/73: Imported Debian patch 1.0.6+hg2461-1

Richard Winters devrik-guest at moszumanska.debian.org
Sat Apr 18 20:24:30 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 064eaa1ea77ef7bf6d35e18d34bb73ea5d4257c4
Merge: df30764 75104c6
Author: Martin Loschwitz <madkiss at debian.org>
Date:   Tue Oct 19 11:50:00 2010 +0200

    Imported Debian patch 1.0.6+hg2461-1

 .hg_archival.txt                                   |   2 +-
 .hgtags                                            |   1 +
 configure.ac                                       |  24 +-
 debian/changelog                                   |  11 +
 debian/cluster-glue-dev.install                    |   1 +
 debian/control                                     | 144 ++++++--
 debian/libcluster-glue-dev.install                 |   8 -
 debian/libcluster-glue.install                     |   5 -
 debian/libcluster-glue.lintian-overrides           |   1 -
 debian/liblrm2-dev.install                         |   4 +
 debian/liblrm2.install                             |   2 +
 debian/libpils2-dev.install                        |   4 +
 debian/libpils2.install                            |   2 +
 debian/libplumb2-dev.install                       |   4 +
 debian/libplumb2.install                           |   2 +
 debian/libplumbgpl2-dev.install                    |   3 +
 debian/libplumbgpl2.install                        |   2 +
 debian/libstonith1-dev.install                     |   4 +
 debian/libstonith1.install                         |   2 +
 debian/patches/series                              |   1 -
 debian/patches/spelling-fixes.patch                |  91 -----
 debian/rules                                       |   1 +
 include/clplumbing/.cvsignore                      |   6 -
 include/clplumbing/cl_random.h                     |  38 +-
 include/clplumbing/ipc.h                           |   1 -
 include/lha_internal.h                             |   9 +
 include/lrm/.cvsignore                             |   6 -
 include/pils/.cvsignore                            |   6 -
 include/stonith/.cvsignore                         |  10 -
 lib/clplumbing/.cvsignore                          |  14 -
 lib/clplumbing/GSource.c                           |  12 +-
 lib/clplumbing/cl_log.c                            |  44 ++-
 lib/clplumbing/cl_msg.c                            |   4 +-
 lib/clplumbing/cl_msg_types.c                      |  11 +-
 lib/clplumbing/ipcsocket.c                         |  39 +-
 lib/clplumbing/ipctransientclient.c                |   4 +-
 lib/lrm/.cvsignore                                 |  10 -
 lib/lrm/clientlib.c                                |   6 +-
 lib/lrm/racommon.c                                 |   8 +-
 lib/pils/.cvsignore                                |  11 -
 lib/plugins/lrm/.cvsignore                         |  11 -
 lib/plugins/lrm/Makefile.am                        |  17 +
 lib/plugins/lrm/dbus/Makefile.am                   |  16 +
 .../lrm/dbus/com.ubuntu.Upstart.Instance.xml       |  45 +++
 lib/plugins/lrm/dbus/com.ubuntu.Upstart.Job.xml    |  71 ++++
 lib/plugins/lrm/dbus/com.ubuntu.Upstart.xml        |  57 +++
 lib/plugins/lrm/raexeclsb.c                        |   2 +-
 lib/plugins/lrm/raexecupstart.c                    | 222 ++++++++++++
 lib/plugins/lrm/upstart-dbus.c                     | 403 +++++++++++++++++++++
 lib/plugins/lrm/upstart-dbus.h                     |  36 ++
 lib/plugins/stonith/.cvsignore                     |  11 -
 lib/plugins/stonith/cyclades.c                     |  17 +
 lib/plugins/stonith/external.c                     |  26 +-
 lib/plugins/stonith/external/.cvsignore            |   5 -
 lib/plugins/stonith/external/Makefile.am           |   4 +-
 lib/plugins/stonith/external/ipmi                  |  37 +-
 lib/plugins/stonith/external/nut                   | 302 +++++++++++++++
 lib/plugins/stonith/external/riloe                 |  52 ++-
 lib/stonith/.cvsignore                             |  13 -
 lib/stonith/main.c                                 | 101 +++---
 lib/stonith/sbd.c                                  |  64 +++-
 lib/stonith/sbd.h                                  |   1 +
 logd/.cvsignore                                    |   7 -
 lrm/.cvsignore                                     |  10 -
 lrm/admin/.cvsignore                               |  11 -
 lrm/admin/lrmadmin.c                               |   2 +-
 lrm/admin/lrmadmin.txt                             |   6 +-
 lrm/lrmd/.cvsignore                                |  11 -
 lrm/lrmd/lrmd.c                                    |  35 +-
 lrm/test/.cvsignore                                |  19 -
 lrm/test/testcases/.cvsignore                      |  10 -
 71 files changed, 1764 insertions(+), 418 deletions(-)

diff --cc debian/changelog
index 716b88e,0000000..833cc21
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,138 -1,0 +1,149 @@@
++cluster-glue (1.0.6+hg2461-1) experimental; urgency=low
++
++  * Upload to experimental
++  * New upstream checkout (2010-10-19) 
++  * Major change: Library split into multiple packages to comply with
++    Debian policy better (as per c. 8.1)
++  * Removed the "spelling-fixes"-patch as it was applied by upstream
++  * Bumped Standards-Version to 3.9.1
++
++ -- Martin Loschwitz <madkiss at debian.org>  Tue, 19 Oct 2010 11:50:00 +0200
++
 +cluster-glue (1.0.6-1) unstable; urgency=low
 +
 +  * New upstream (closes: #588938)
 +    - Cleans CFLAGS in a dash-friendly way (closes: #582875)
 +
 + -- Simon Horman <horms at debian.org>  Wed, 14 Jul 2010 09:53:50 +0900
 +
 +cluster-glue (1.0.5-2) unstable; urgency=low
 +
 +  * Add build dependency on docbook-xml.
 +
 + -- Frederik Schüler <fs at debian.org>  Mon, 03 May 2010 20:05:32 +0200
 +
 +cluster-glue (1.0.5-1) unstable; urgency=low
 +
 +  * New upstream version 1.0.5 
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Fri, 16 Apr 2010 06:25:09 +0000
 +
 +cluster-glue (1.0.3+hg2366-4) unstable; urgency=low
 +
 +  * Disable fatal warnings to make cluster-glue compile on numerous 
 +  architectures other than x86(_64) 
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Tue, 06 Apr 2010 13:08:01 +0000
 +
 +cluster-glue (1.0.3+hg2366-3) unstable; urgency=low
 +
 +  * Added files to cluster-glue.install that were added upstream 
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Tue, 30 Mar 2010 11:03:34 +0000
 +
 +cluster-glue (1.0.3+hg2366-2) unstable; urgency=low
 +
 +  * Include patch by Simon Hormann to Replaces/Conflicts 
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Tue, 30 Mar 2010 07:04:53 +0000
 +
 +cluster-glue (1.0.3+hg2366-1) unstable; urgency=low
 +
 +  * New upstream checkout.
 +  * Updated debian/copyright to reflect the current situation
 +  * Remove useless STYLESHEET_PREFIX patch from debian/patches
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Tue, 30 Mar 2010 06:28:50 +0000
 +
 +cluster-glue (1.0.3+hg2365-1) unstable; urgency=low
 +
 +  * New upstream checkout.
 +  * Move lintian overides from cluster-glue to libcluster-glue.
 +
 + -- Frederik Schüler <fs at debian.org>  Fri, 12 Mar 2010 12:36:56 +0100
 +
 +cluster-glue (1.0.3+hg2337-2) unstable; urgency=low
 +
 +  * Add libcluster-glue{-dev}.install files, and actually install libraries.
 +
 + -- Frederik Schüler <fs at debian.org>  Tue, 09 Mar 2010 13:12:04 +0100
 +
 +cluster-glue (1.0.3+hg2337-1) unstable; urgency=low
 +
 +  [ Martin G. Loschwitz ] 
 +  * Replaced the copyright-file with the one updated by Ante Karamatic
 +  * Split cluster-glue into libcluster-glue{-dev} and cluster-glue{-dev}
 + 
 + -- Martin Loschwitz <madkiss at debian.org>  Wed, 02 Mar 2010 13:02:00 +0100
 +
 +cluster-glue (1.0.3-2) UNRELEASED; urgency=low
 +
 +  [ Simon Horman ]
 +  * Do not do a binary-indep build as there is nothing to do.
 +  * Build-Depend on libsensors4-dev | libsensors-dev.
 +
 +  [ Frederik Schüler ]
 +  * Bump standards to version 3.8.4, no changes needed.
 +  * Switch to source version 3.0 "quilt".
 +  * Switch to debian compatibility level 7.
 +  * Drop dpatch.
 +  * Add misc-depends to cluster-glue-dev.
 +  * Add linian overrides.
 +  * Remove rpath from ipmilan.so.
 +
 + -- Frederik Schüler <fs at debian.org>  Fri, 26 Feb 2010 19:39:13 +0100
 +
 +cluster-glue (1.0.3-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Wed, 03 Feb 2010 08:05:00 +0100
 +
 +cluster-glue (1.0.2~rc2b+hg20100127-0test1) unstable; urgency=low
 +
 +  * New build of the Debian version of this package, incorporating many
 +    changes done by Ante Karamatic (thank you very much!)
 +  * New upstream checkout
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Wed, 26 Jan 2010 12:58:00 +0200
 +
 +cluster-glue (1.0.2~rc2a-0ubuntu0ppa2) lucid; urgency=low
 +
 +  * Addes docbook-xsl to build-depends
 +  * debian/patches/01_stylesheet_path.dpatch:
 +    - use local docbook
 +
 + -- Ante Karamatic <ivoks at ubuntu.com>  Mon, 04 Jan 2010 15:18:40 +0000
 +
 +cluster-glue (1.0.2~rc2a-0ubuntu0ppa1) lucid; urgency=low
 +
 +  * New upstream checkout
 +  * Added xsltproc to build-depends; needed for rebuilding of man pages
 +  * Modified paths in cluster-glue.install and cluster-glue-dev.install
 +
 + -- Ante Karamatic <ivoks at ubuntu.com>  Sun, 03 Jan 2010 09:38:25 +0000
 +
 +cluster-glue (1.0+hg20091102-1~bpo50+1) lenny-backports; urgency=low
 +
 +  * Rebuild for lenny-backports.
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Mon, 02 Nov 2009 15:02:29 +0000
 +
 +cluster-glue (1.0+hg20091102-1) unstable; urgency=low
 +
 +  * New upstream checkout
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Mon, 02 Nov 2009 00:00:00 +0100
 +
 +cluster-glue (1.0+hg20091012-1) unstable; urgency=low
 +
 +  * New upstream checkout
 +  * Adopting numerous changes from HG
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Mon, 12 Oct 2009 16:14:00 +0200
 +
 +cluster-glue (1.0+hg20090915-1) unstable; urgency=low
 +
 +  * Initial release of packages for the cluster-glue-framework
 +
 + -- Martin Loschwitz <madkiss at debian.org>  Tue, 15 Sep 2009 09:56:16 +0000
diff --cc debian/cluster-glue-dev.install
index 08bac2e,0000000..0cd2626
mode 100644,000000..100644
--- a/debian/cluster-glue-dev.install
+++ b/debian/cluster-glue-dev.install
@@@ -1,8 -1,0 +1,9 @@@
 +usr/lib/heartbeat/plugins/InterfaceMgr/*.la
 +usr/lib/heartbeat/plugins/InterfaceMgr/*.a
 +usr/lib/heartbeat/plugins/RAExec/*.la
 +usr/lib/heartbeat/plugins/RAExec/*.a
 +usr/lib/heartbeat/plugins/test/*.la
 +usr/lib/heartbeat/plugins/test/*.a
 +usr/lib/stonith/plugins/stonith2/*.la
 +usr/lib/stonith/plugins/stonith2/*.a
++usr/include/heartbeat/*.h
diff --cc debian/control
index 431d427,0000000..5ad1e6e
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,53 -1,0 +1,155 @@@
 +Source: cluster-glue
 +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>
 +Build-Depends: debhelper (>= 7), 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 | libsensors-dev, libltdl3-dev, swig, openssh-client, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev, libopenipmi-dev, autoconf, automake, libtool, xsltpro [...]
- Standards-Version: 3.9.0
++Standards-Version: 3.9.1
 +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
 +XS-Python-Version: current
 +
 +Package: libcluster-glue
++Architecture: all
++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: cluster-glue (<= 1.0.3-2), heartbeat (<= 2.99.2+sles11r9-5)
- Conflicts: cluster-glue (<= 1.0.3-2), heartbeat (<= 2.99.2+sles11r9-5)
- Description: The reusable cluster components for Linux HA (libraries)
-  This package contains the libraries provided by the cluster
-  glue component by the Linux-HA project; it offers various
-  re-usable cluster stack libraries. If you plan to run the
-  Linux-HA cluster stack, you will need this package.
++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: libcluster-glue-dev
++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 ibrary from cluster-glue, the 
++ reusable cluster components package. Install it if you want to 
++ use the pacemaker cluster manager.
++
++Package: libplumbgpl2
++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 -- libplumbgpl2
++ This package contains the plumber library from cluster-glue,
++ the reusable cluster components package, in the GPL version. 
++ Install it if you want to use the pacemaker cluster manager.
++
++Package: libstonith1
++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 -- libstonith1
++ This package contains the stonith library from cluster-glue, the 
++ reusable cluster components package. Install it if you want to 
++ use the pacemaker cluster manager.
++
++Package: liblrm2-dev
++Section: libdevel
 +Architecture: any
++Depends: ${shlibs: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
++ This package contains the development files of the lrm helper 
++ library from cluster-glue, the reusable cluster components 
++ package. 
++
++Package: libpils2-dev
++Section: libdevel
++Architecture: any
++Depends: ${shlibs:Depends}, ${misc:Depends}, libpils2 (= ${binary:Version})
++Replaces: libcluster-glue-dev (<= 1.0.6-1)
++Conflicts: libcluster-glue-dev (<= 1.0.6-1)
++Description: Reusable cluster development files -- libpils2
++ This package contains the development files of the pils 
++ library from cluster-glue, the reusable cluster components 
++ package. 
++
++Package: libplumb2-dev
++Section: libdevel
++Architecture: any
++Depends: ${shlibs: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
++ This package contains the development files of the plumber 
++ library from cluster-glue, the reusable cluster components 
++ package. 
++
++Package: libplumbgpl2-dev
++Section: libdevel
++Architecture: any
++Depends: ${shlibs: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
++ This package contains the development files of the plumber 
++ library from cluster-glue, the reusable cluster components 
++ package, in the GPL version. 
++
++Package: libstonith1-dev
++Section: libdevel
++Architecture: any
++Depends: ${shlibs:Depends}, ${misc:Depends}, libstonith1 (= ${binary:Version})
++Replaces: libcluster-glue-dev (<= 1.0.6-1)
++Conflicts: libcluster-glue-dev (<= 1.0.6-1)
++Description: Reusable cluster development files -- libstonith1
++ This package contains the development files of the stonith 
++ library from cluster-glue, the reusable cluster components 
++ package. 
++
++Package: libcluster-glue-dev
++Architecture: all
 +Section: libdevel
- Depends: ${shlibs:Depends}, ${misc:Depends}, libcluster-glue (= ${binary:Version})
- Replaces: cluster-glue-dev (<= 1.0.3-2)
- Conflicts: cluster-glue-dev (<= 1.0.3-2)
- Description: The reusable cluster components for Linux HA (library dev files)
-  This package contains the headers for the libraries provided 
-  by the cluster glue component by the Linux-HA project; it 
-  offers various re-usable cluster stack libraries. If you plan 
-  to run the Linux-HA cluster stack, you will need this package.
++Depends: ${misc:Depends}, liblrm2-dev (>= ${binary:Version}), libpils2-dev (>= ${binary:Version}), libplumb2-dev (>= ${binary:Version}), libplumbgpl2-dev (>= ${binary:Version}), libstonith1-dev (>= ${binary:Version})
++Description: The 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 
++ package. It's now a transitional package without any content, 
++ depending on all the single library development packages that 
++ now exist.
 +
 +Package: cluster-glue
 +Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, python, libtimedate-perl
++Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, python, 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: The reusable cluster components for Linux HA
 + This package contains node fencing plugins, an error reporting
 + utility, and other reusable cluster components from
 + the Linux HA project.
 +
 +Package: cluster-glue-dev
 +Architecture: any
- Depends: cluster-glue (= ${binary:Version}), ${misc:Depends}
- Replaces: libheartbeat2-dev (<= 2.99.2+sles11r9-5), heartbeat-dev (<= 2.99.2+sles11r9-5)
- Conflicts: libheartbeat2-dev (<= 2.99.2+sles11r9-5), heartbeat-dev (<= 2.99.2+sles11r9-5)
++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
 + This package includes headers and static libraries for the glue
 + cluster components.
diff --cc debian/liblrm2-dev.install
index 0000000,0000000..5dfe7f6
new file mode 100644
--- /dev/null
+++ b/debian/liblrm2-dev.install
@@@ -1,0 -1,0 +1,4 @@@
++usr/lib/liblrm.so
++usr/lib/liblrm.a
++usr/lib/liblrm.la
++usr/include/heartbeat/lrm/*.h
diff --cc debian/liblrm2.install
index 0000000,0000000..ab3ceb1
new file mode 100644
--- /dev/null
+++ b/debian/liblrm2.install
@@@ -1,0 -1,0 +1,2 @@@
++usr/lib/liblrm.so.2.0.0
++usr/lib/liblrm.so.2
diff --cc debian/libpils2-dev.install
index 0000000,0000000..7401d2b
new file mode 100644
--- /dev/null
+++ b/debian/libpils2-dev.install
@@@ -1,0 -1,0 +1,4 @@@
++usr/lib/libpils.so
++usr/lib/libpils.a
++usr/lib/libpils.la
++usr/include/pils/*.h
diff --cc debian/libpils2.install
index 0000000,0000000..f36befc
new file mode 100644
--- /dev/null
+++ b/debian/libpils2.install
@@@ -1,0 -1,0 +1,2 @@@
++usr/lib/libpils.so.2.0.0
++usr/lib/libpils.so.2
diff --cc debian/libplumb2-dev.install
index 0000000,0000000..8a9ddad
new file mode 100644
--- /dev/null
+++ b/debian/libplumb2-dev.install
@@@ -1,0 -1,0 +1,4 @@@
++usr/lib/libplumb.so
++usr/lib/libplumb.a
++usr/lib/libplumb.la
++usr/include/clplumbing/*.h
diff --cc debian/libplumb2.install
index 0000000,0000000..574594c
new file mode 100644
--- /dev/null
+++ b/debian/libplumb2.install
@@@ -1,0 -1,0 +1,2 @@@
++usr/lib/libplumb.so.2.1.0
++usr/lib/libplumb.so.2
diff --cc debian/libplumbgpl2-dev.install
index 0000000,0000000..1d42930
new file mode 100644
--- /dev/null
+++ b/debian/libplumbgpl2-dev.install
@@@ -1,0 -1,0 +1,3 @@@
++usr/lib/libplumbgpl.so
++usr/lib/libplumbgpl.a
++usr/lib/libplumbgpl.la
diff --cc debian/libplumbgpl2.install
index 0000000,0000000..fab8102
new file mode 100644
--- /dev/null
+++ b/debian/libplumbgpl2.install
@@@ -1,0 -1,0 +1,2 @@@
++usr/lib/libplumbgpl.so.2.0.0
++usr/lib/libplumbgpl.so.2
diff --cc debian/libstonith1-dev.install
index 0000000,0000000..f38d809
new file mode 100644
--- /dev/null
+++ b/debian/libstonith1-dev.install
@@@ -1,0 -1,0 +1,4 @@@
++usr/lib/libstonith.so
++usr/lib/libstonith.a
++usr/lib/libstonith.la
++usr/include/stonith/*.h
diff --cc debian/libstonith1.install
index 0000000,0000000..6dda1c7
new file mode 100644
--- /dev/null
+++ b/debian/libstonith1.install
@@@ -1,0 -1,0 +1,2 @@@
++usr/lib/libstonith.so.1.0.0
++usr/lib/libstonith.so.1
diff --cc debian/rules
index 02156f6,0000000..7f41ec3
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,100 -1,0 +1,101 @@@
 +#!/usr/bin/make -f
 +
 +# Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
 +# This has to be exported to make some magic below work.
 +export DH_OPTIONS
 +
 +DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 +DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 +
 +
 +CFLAGS = -Wall -g
 +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 +       CFLAGS += -O0
 +else
 +       CFLAGS += -O2
 +endif
 +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 +       INSTALL_PROGRAM += -s
 +endif
 +
 +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 +  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 +  MAKEFLAGS += -j$(NUMJOBS)
 +endif
 +
 +
 +DTMP:=$(CURDIR)/debian/tmp
 +RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
 +UPSTREAM := $(shell echo "$(RELEASE)" | sed 's/:\?\([0-9\.]\+\)-[0-9].*/\1/')
 +
 +
 +configure: configure-stamp
 +configure-stamp: 
 +	dh_testdir
 +	test -x ./configure || ./autogen.sh
 +	./configure --with-ocf-root=/usr/lib/ocf --with-initdir=/etc/init.d \
 +		    --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 +  		    --mandir=/usr/share/man --libdir=/usr/lib \
 +		    --disable-fatal-warnings
 +	touch configure-stamp
 +
 +build: build-arch build-indep
 +
 +build-arch: build-arch-stamp
 +build-arch-stamp: configure-stamp  
 +	$(MAKE)
 +	touch $@
 +
 +build-indep: build-indep-stamp
 +build-indep-stamp: configure-stamp  
 +	touch $@
 +
 +clean: 
 +	dh_testdir
 +	dh_testroot
 +	[ ! -f Makefile ] || $(MAKE) clean
 +	[ ! -f Makefile ] || $(MAKE) distclean
 +	dh_clean 
 +
 +install: install-indep install-arch
 +install-indep:
 +
 +install-arch:
 +	dh_testdir
 +	dh_testroot
 +	dh_prep -s
 +	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 +	chrpath -r "" debian/tmp/usr/lib/stonith/plugins/stonith2/ipmilan.so
 +	dh_install --sourcedir=$(CURDIR)/debian/tmp --list-missing
 +
 +binary-common:
 +	dh_testdir
 +	dh_testroot
 +	dh_installchangelogs ChangeLog
 +	dh_installdocs
 +	dh_installman
 +	dh_lintian
 +	dh_installinit --name=logd -pcluster-glue -u 'defaults 20 32'
 +	dh_strip
 +	dh_compress
 +	dh_fixperms
 +	dh_perl
 +	dh_makeshlibs
 +	dh_installdeb
 +	dh_shlibdeps
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +# Build architecture independant packages using the common target.
 +binary-indep: build-indep install-indep
++	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 +
 +# Build architecture dependant packages using the common target.
 +binary-arch: build-arch install-arch
 +	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
 +
 +binary: binary-arch binary-indep
 +.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure

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