diff -Nru pacemaker-1.1.10+git20130802/debian/changelog pacemaker-1.1.10+git20130802/debian/changelog --- pacemaker-1.1.10+git20130802/debian/changelog 2013-08-06 12:03:32.000000000 +0100 +++ pacemaker-1.1.10+git20130802/debian/changelog 2014-08-01 14:07:59.000000000 +0100 @@ -1,3 +1,15 @@ +pacemaker (1.1.10+git20130802-4ubuntu1) utopic; urgency=low + + [ Liam Young ] + LP: #1351307 + * Merge from Debian unstable. Remaining changes: + - debian/control: Build-Depends on libcfg-dev; Depends on libheartbeat2. + * Corosync's pacemaker plugin is disabled, hence not built: + - debian/licrmcluster4-dev.install: Do not install plugin.h. + - debian/pacemaker.install: Do not install pacemaker.lcrso. + + -- Liam Young Fri, 01 Aug 2014 13:45:08 +0100 + pacemaker (1.1.10+git20130802-4) unstable; urgency=low * debian/patches/fix_crm_mon_host_list.patch: Patch by Andrew Beekhof to @@ -20,6 +32,22 @@ -- Martin Loschwitz Mon, 05 Aug 2013 12:55:31 +0000 +pacemaker (1.1.10+git20130802-1ubuntu2) trusty; urgency=medium + + * Rebuild to drop files installed into /usr/share/pyshared. + + -- Matthias Klose Sun, 23 Feb 2014 13:49:43 +0000 + +pacemaker (1.1.10+git20130802-1ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control: Build-Depends on libqb-dev; Depends on libheartbeat2. + * Corosync's pacemaker plugin is disabled, hence not built: + - debian/licrmcluster4-dev.install: Do not install plugin.h. + - debian/pacemaker.install: Do not install pacemaker.lcrso. + + -- Andres Rodriguez Thu, 15 Aug 2013 11:27:07 -0400 + pacemaker (1.1.10+git20130802-1) unstable; urgency=low * Update to latest Git HEAD for M/S fix @@ -42,6 +70,28 @@ -- Martin Loschwitz Thu, 01 Aug 2013 10:51:50 +0000 +pacemaker (1.1.9+git20130321-1ubuntu3) saucy; urgency=low + + * debian/control: Depend on libheartbeat2 + + -- Andres Rodriguez Tue, 30 Jul 2013 17:48:11 -0400 + +pacemaker (1.1.9+git20130321-1ubuntu2) saucy; urgency=low + + * debian/control: Remove revision for corosync related Deps. + + -- Andres Rodriguez Tue, 23 Jul 2013 18:32:30 -0400 + +pacemaker (1.1.9+git20130321-1ubuntu1) saucy; urgency=low + + * Resync from debian expiremental. + * debian/control: + - Use lower version for Build-Depends on libcorosync-dev + and libqb-dev. + - Build-Depends on libcfg-dev. + + -- Andres Rodriguez Tue, 16 Jul 2013 16:40:24 -0400 + pacemaker (1.1.9+git20130321-1) experimental; urgency=low * New upstream version @@ -1051,3 +1101,4 @@ Local variables: mode: debian-changelog End: + diff -Nru pacemaker-1.1.10+git20130802/debian/control pacemaker-1.1.10+git20130802/debian/control --- pacemaker-1.1.10+git20130802/debian/control 2013-08-02 08:26:33.000000000 +0100 +++ pacemaker-1.1.10+git20130802/debian/control 2014-08-01 13:53:44.000000000 +0100 @@ -1,9 +1,10 @@ Source: pacemaker Section: admin Priority: optional -Maintainer: Debian HA Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian HA Maintainers Uploaders: Martin Loschwitz , Anibal Monsalve Salazar , Simon Horman , Frederik Schüler -Build-Depends: debhelper (>= 7.0.50), automake, autoconf, chrpath, libsnmp-dev, libglib2.0-dev, perl, net-tools, python (>= 2.6.6-3~), libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, libbz2-dev, zlib1g-dev, libltdl3-dev, openssh-client, libgnutls-dev, libpam0g-dev, libncurses5-dev, libcorosync-dev (>= 1.4.4-1), libheartbeat2-dev (>= 3.0), libxslt1-dev, libesmtp-dev, cluster-glue-dev (>= 1.0.11+hg2754), liblrm2-dev, libpils2-dev, libplumb2-dev, libplumbgpl2-dev, libstonith1-dev, help2man, libxml2-utils, xsltproc, docbook-xsl, resource-agents-dev, libqb-dev (>= 0.16.0.real-1), hardening-wrapper +Build-Depends: debhelper (>= 7.0.50), automake, autoconf, chrpath, libsnmp-dev, libglib2.0-dev, perl, net-tools, python (>= 2.6.6-3~), libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, libbz2-dev, zlib1g-dev, libltdl3-dev, openssh-client, libgnutls-dev, libpam0g-dev, libncurses5-dev, libcorosync-dev (>= 1.4.4-1), libheartbeat2-dev (>= 3.0), libxslt1-dev, libesmtp-dev, cluster-glue-dev (>= 1.0.11+hg2754), liblrm2-dev, libpils2-dev, libplumb2-dev, libplumbgpl2-dev, libstonith1-dev, help2man, libxml2-utils, xsltproc, docbook-xsl, resource-agents-dev, libqb-dev (>= 0.16.0.real-1), hardening-wrapper, libcfg-dev Standards-Version: 3.9.3 Homepage: http://clusterlabs.org/ Vcs-Hg: http://hg.debian.org/hg/debian-ha/pacemaker @@ -12,7 +13,7 @@ Package: pacemaker Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, resource-agents, python, adduser, corosync (>= 1.4.4-1) | heartbeat (>= 3.0), crmsh, pacemaker-cli-utils +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libheartbeat2, resource-agents, python, adduser, corosync (>= 1.4.4-1) | heartbeat (>= 3.0), crmsh, pacemaker-cli-utils Conflicts: pacemaker-heartbeat, pacemaker-openais Replaces: pacemaker-heartbeat, pacemaker-openais Description: HA cluster resource manager diff -Nru pacemaker-1.1.10+git20130802/debian/libcrmcluster4-dev.install pacemaker-1.1.10+git20130802/debian/libcrmcluster4-dev.install --- pacemaker-1.1.10+git20130802/debian/libcrmcluster4-dev.install 2013-08-02 07:28:06.000000000 +0100 +++ pacemaker-1.1.10+git20130802/debian/libcrmcluster4-dev.install 2014-02-23 17:10:26.000000000 +0000 @@ -11,5 +11,5 @@ usr/include/pacemaker/crm/error.h usr/include/pacemaker/crm/services.h usr/include/pacemaker/crm/cluster.h -usr/include/pacemaker/crm/cluster/plugin.h +#usr/include/pacemaker/crm/cluster/plugin.h usr/lib/pkgconfig/pacemaker-cluster.pc diff -Nru pacemaker-1.1.10+git20130802/debian/pacemaker.install pacemaker-1.1.10+git20130802/debian/pacemaker.install --- pacemaker-1.1.10+git20130802/debian/pacemaker.install 2013-08-02 07:27:39.000000000 +0100 +++ pacemaker-1.1.10+git20130802/debian/pacemaker.install 2014-02-23 17:10:26.000000000 +0000 @@ -73,4 +73,4 @@ usr/share/pacemaker/upgrade06.xsl usr/share/pacemaker/versions.rng usr/share/snmp/mibs/PCMK-MIB.txt -usr/lib/lcrso/pacemaker.lcrso +#usr/lib/lcrso/pacemaker.lcrso