diff -ruN pacemaker-1.1.6/debian/changelog ubuntu-orig/pacemaker-1.1.5/debian/changelog --- pacemaker-1.1.6/debian/changelog 2011-10-20 13:46:07.000000000 +0000 +++ ubuntu-orig/pacemaker-1.1.5/debian/changelog 2011-06-24 22:31:28.000000000 +0000 @@ -1,83 +1,54 @@ -pacemaker (1.1.6-2) unstable; urgency=low +pacemaker (1.1.5-0ubuntu1) oneiric; urgency=low - * Adopted numerous changes from the Ubuntu packages, implemented by Andres - Rodriguez to make co-maintaining these packages in Ubuntu and Debian a - bit easier. - - -- Martin Loschwitz Thu, 20 Oct 2011 13:45:56 +0000 - -pacemaker (1.1.6-1) unstable; urgency=low - - * New upstream version 1.1.6 - - -- Martin Loschwitz Wed, 19 Oct 2011 16:26:24 +0000 - -pacemaker (1.1.5-3) unstable; urgency=low - - * debian/control: Really fix the issue with conflicting files this time, - esp. for libstonithd1-dev vs. libstonithd0-dev (Closes: #639272) - - -- Martin Loschwitz Fri, 26 Aug 2011 13:09:40 +0000 - -pacemaker (1.1.5-2) unstable; urgency=low - - * debian/control: Fix the Replaces: and Conflicts: for libpe-status3-dev - to make sure there are no conflicting files with libpe-status2-dev - (Closes: #639270) - - -- Martin Loschwitz Fri, 26 Aug 2011 07:05:47 +0000 - -pacemaker (1.1.5-1) unstable; urgency=low - - [ Martin G. Loschwitz ] - * New upstream release. Packaging is based largely on the Ubuntu package - created by Andres Rodriguez. Thank you for the cool work! - * Changing Ubuntu specific entries so that they become compatible with the - Debian System - * Bump Standards-Version -- no changes were necessary in the package - * Fix magic for repairing dependency_libs problem - [ Andres Rodriguez ] - * debian/patches: - - debian/patches/raexecupstart.patch: Refreshed. - * debian/control: - - Build-Depends on xsltproc, docbook-xsl, resource-agents-dev. - - Bump libpe-status2 to libpe-status3 - - Bump libstonithd0 to libstonithd1 - - Depends on resource-agents. - * debian/libpe-status2{-dev}.install: Rename to libpe-status3{-dev}.install - * debian/libstonithd0{-dev}.install: Rename to libstonithd1{-dev}.install - * debian/clean: Do not clean nvset.rng and rule.rng. - * debian/pacemaker.install: - - Add missing binaries, manpages and files. - - Drop files no longer needed. - - Change nvset-1.0.rng to nvset.rng and rule-1.0.rng to rule.rng. - * debian/pacemaker.manpages: No longer needed. - * debian/libstonithd1-dev.install: Remove files that no longer exist - * debian/libcrmcluster1-dev.install: Add missing header. - * debian/libpe-status3.install: Update version in file. - * debian/libstonithd1.install: Update version in file. - * debian/pacemaker-dev.install: Do not install *.pyc or *.pyo files - * debian/rules: Change from --fail-missing to --list-missing to not fail - when *.pyc or *.pyo files are not installed. - * Switch from dh_pycentral to dh_python2. - * debian/pacemaker.postinst: Remove pycentral pkginstall rule. - - -- Martin Loschwitz Thu, 24 Aug 2011 12:10:00 +0000 - -pacemaker (1.0.11-1.2) unstable; urgency=low - - * Non-maintainer upload. - * Don't install python bytecode so the upload gets accepted to the archive - - -- Luk Claes Sun, 05 Jun 2011 22:21:18 +0200 - -pacemaker (1.0.11-1.1) unstable; urgency=low - - * Non-maintainer upload. - * Remove references to other libraries from dependency_libs field - (Closes: #619552). + * New upstream release + * debian/patches: + - lib_license_headers_update.patch: Dropped. + - other_license_headers_update.patch: Dropped. + - fix_ftbfs_linker_as_needed.patch: Dropped. + - remove_debian-dir_from_autotools_handling.patch: Dropped. + - debian/patches/fix_return_o2cb_ra.patch: Dropped. + - debian/patches/raexecupstart.patch: Refreshed. + * debian/control: + - Build-Depends on xsltproc, docbook-xsl, resource-agents-dev. + - Bump libpe-status2 to libpe-status3 + - Bump libstonithd0 to libstonithd1 + - Depends on resource-agents. + * debian/libpe-status2{-dev}.install: Rename to libpe-status3{-dev}.install + * debian/libstonithd0{-dev}.install: Rename to libstonithd1{-dev}.install + * debian/clean: Do not clean nvset.rng and rule.rng. + * debian/pacemaker.install: + - Add missing binaries, manpages and files. + - Drop files no longer needed. + - Change nvset-1.0.rng to nvset.rng and rule-1.0.rng to rule.rng. + * debian/pacemaker.manpages: No longer needed. + * debian/libstonithd1-dev.install: Remove files that no longer exist + * debian/libcrmcluster1-dev.install: Add missing header. + * debian/libpe-status3.install: Update version in file. + * debian/libstonithd1.install: Update version in file. + * debian/pacemaker-dev.install: Do not install *.pyc or *.pyo files + * debian/rules: Change from --fail-missing to --list-missing to not fail + when *.pyc or *.pyo files are not installed. + * Switch from dh_pycentral to dh_python2. + * debian/pacemaker.postinst: Remove pycentral pkginstall rule. + + -- Andres Rodriguez Fri, 24 Jun 2011 18:31:14 -0400 + +pacemaker (1.0.11-1ubuntu1) oneiric; urgency=low + + * Merge from debian unstable (LP: #784855). Remaining changes: + - debian/patches: + + lib_license_headers_update.patch: Update the License Headers to + correctly reflect the use of LGPL-2.1+. + + other_license_headers_update.patch: Update the License Headers of + files that show GPL version 2.1, to correctly show version 2+. + + raexecupstart.patch: Utilize new upstart LRM plugin. + + fix_ftbfs_linker_as_needed.patch: Prevent FTBFS due to linker changes. + + fix_return_o2cb_ra.patch: Fix a return variale error in the o2cb RA. + - debian/pacemaker.postinst: Fix permissions on /var/lib/pengine. + - debian/control: Bump cluster-glue dependencies to Ubuntu specific. + * debian/patches: Refresh all patches. - -- Luk Claes Tue, 31 May 2011 19:44:53 +0200 + -- Andres Rodriguez Wed, 25 May 2011 21:28:53 +0100 pacemaker (1.0.11-1) unstable; urgency=low @@ -115,6 +86,40 @@ -- Simon Horman Mon, 17 Jan 2011 08:10:29 +0900 +pacemaker (1.0.10-4ubuntu3) natty; urgency=low + + * debian/rules: clean the dependency_libs out of .la files at build + time, per Policy 10.2 + + -- Steve Langasek Thu, 24 Mar 2011 15:51:12 -0700 + +pacemaker (1.0.10-4ubuntu2) natty; urgency=low + + * debian/patches/fix_return_o2cb_ra.patch: Updated and add fix to change + to killall instead of killproc as it doesn't exist in Ubuntu (LP: #727422) + + -- Andres Rodriguez Tue, 01 Mar 2011 17:14:39 -0500 + +pacemaker (1.0.10-4ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #701233). Remaining changes: + - debian/patches: + + lib_license_headers_update.patch: Update the License Headers to + correctly reflect the use of LGPL-2.1+. + + other_license_headers_update.patch: Update the License Headers of + files that show GPL version 2.1, to correctly show version 2+. + + raexecupstart.patch: Utilize new upstart LRM plugin. + + fix_ftbfs_linker_as_needed.patch: Prevent FTBFS due to linker changes. + + fix_return_o2cb_ra.patch: Fix a return variale error in the o2cb RA. + - debian/pacemaker.postinst: Fix permissions on /var/lib/pengine. + * debian/control: + - Bump cluster-glue dependencies to Ubuntu specific. + - pacemaker-dev binary: Update dependencies to correct ones: + (libpe-status2-dev,libpe-rules2-dev) + - libcrmcommon2-dev: Drop Depends on cluster-glue-dev. + + -- Andres Rodriguez Wed, 12 Jan 2011 10:12:46 -0600 + pacemaker (1.0.10-4) unstable; urgency=low * Add dependency on cluster-glue-dev to libcrmcommon2-dev @@ -154,6 +159,46 @@ -- Simon Horman Thu, 16 Dec 2010 21:50:06 +0900 +pacemaker (1.0.9.1+hg15626-2ubuntu3) natty; urgency=low + + * debian/patches: + - lib_license_headers_update.patch: Update the License Headers to + correctly reflect the use of LGPL-2.1+. + - other_license_headers_update.patch: Update the License Headers of files + that show GPL version 2.1, to correctly show version 2+. + + -- Andres Rodriguez Mon, 13 Dec 2010 13:00:46 -0500 + +pacemaker (1.0.9.1+hg15626-2ubuntu2) natty; urgency=low + + * Rebuild with python 2.7 as the python default. + + -- Matthias Klose Wed, 08 Dec 2010 15:08:00 +0000 + +pacemaker (1.0.9.1+hg15626-2ubuntu1) natty; urgency=low + + * Resync from Debian experimental. + * debian/patches: + - raexecupstart.patch: Utilize new upstart LRM plugin. + - fix_ftbfs_linker_as_needed.patch: Prevent FTBFS due to linker changes. + - fix_return_o2cb_ra.patch: Fix a return variale error in the o2cb RA. + * debian/pacemaker.postinst: Fix permissions on /var/lib/pengine. + * debian/control: + - Build Dependencies: Bump cluster-glue-dev; remove python-dev + - library -dev packages: Drop ${python:Depends}, ${shlibs:Dends}. Add + dependency to its corresponding binary packages. + - library packages: Drop depends on ${python:Depends}; Add missing + Sections. + - Tighten Conflicts/Replaces to Ubuntu related ones. + - pacemaker-dev: Change from ${source:Version} to ${binary:Version}. + - Rename libpe-{status,rules}-2 to libpe-{status,rules}2 respectively. + * debian/libpe-{status,rules}-2{-dev}.install: + - Rename to libpe-{status,rules}2{-dev}. + * debian/rules: dh_pycentral only for pacemaker and pacemaker-dev. + * debian/pacemaker.lintian-override: Removed. + + -- Andres Rodriguez Wed, 17 Nov 2010 16:40:23 -0500 + pacemaker (1.0.9.1+hg15626-2) experimental; urgency=low * Package split to better comply with Debian Policy (c. 8.1.) @@ -280,6 +325,13 @@ -- Martin Loschwitz Wed, 27 Jan 2010 13:58:00 +0200 +pacemaker (1.0.6+hg20100105-0ubuntu0ppa1) lucid; urgency=low + + * New upstream snapshot + * Fix version dep on heartbeat + + -- Ante Karamatic Wed, 06 Jan 2010 19:31:31 +0000 + pacemaker (1.0.6+hg20091102-4~bpo50+1) lenny-backports; urgency=low * Rebuild for lenny-backports. diff -ruN pacemaker-1.1.6/debian/control ubuntu-orig/pacemaker-1.1.5/debian/control --- pacemaker-1.1.6/debian/control 2011-10-20 13:34:43.000000000 +0000 +++ ubuntu-orig/pacemaker-1.1.5/debian/control 2011-06-22 17:07:16.000000000 +0000 @@ -1,10 +1,11 @@ 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), 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.1), libheartbeat2-dev (>= 3.0), libxslt1-dev, libesmtp-dev, cluster-glue-dev (>= 1.0.7+hg2618), liblrm2-dev, libpils2-dev, libplumb2-dev, libplumbgpl2-dev, libstonith1-dev, help2man, libxml2-utils, xsltproc, docbook-xsl, resource-agents-dev -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 7), 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.1.2), libheartbeat2-dev (>= 3.0), libxslt1-dev, libesmtp-dev, cluster-glue-dev (>= 1.0.7-3ubuntu1), liblrm2-dev, libpils2-dev, libplumb2-dev, libplumbgpl2-dev, libstonith1-dev, help2man, libxml2-utils, xsltproc, docbook-xsl, resource-agents-dev +Standards-Version: 3.9.1 Homepage: http://clusterlabs.org/ Vcs-Hg: http://hg.debian.org/hg/debian-ha/pacemaker Vcs-Browser: 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.1) | heartbeat (>= 3.0) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, resource-agents, python, adduser, corosync (>= 1.1.2) | heartbeat (>= 3.0) Conflicts: pacemaker-heartbeat, pacemaker-openais Replaces: pacemaker-heartbeat, pacemaker-openais Description: HA cluster resource manager @@ -30,7 +31,7 @@ Architecture: any Replaces: pacemaker-heartbeat-dev, pacemaker-openais-dev Conflicts: pacemaker-heartbeat-dev, pacemaker-openais-dev -Depends: ${shlibs:Depends}, ${misc:Depends}, pacemaker (>= ${binary:Version}), python, libcorosync-dev (>= 1.4.1), libheartbeat2-dev (>= 3.0) , libglib2.0-dev, libxml2-dev, libcluster-glue-dev (>= 1.0.7+hg2618), libcib1-dev (>= ${binary:Version}), libcrmcluster1-dev (>= ${binary:Version}), libcrmcommon2-dev (>= ${binary:Version}), libpe-rules2-dev (>= ${binary:Version}), libpe-status3-dev (>= ${binary:Version}), libpengine3-dev (>= ${binary:Version}), libstonithd1-dev (>= ${binary:Version}), libtransitioner1-dev (>= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, pacemaker (>= ${binary:Version}), python, libcorosync-dev (>= 1.1.2+svn20091102), libheartbeat2-dev (>= 3.0) , libglib2.0-dev, libxml2-dev, libcluster-glue-dev (>= 1.0.7-3ubuntu1), libcib1-dev (>= ${binary:Version}), libcrmcluster1-dev (>= ${binary:Version}), libcrmcommon2-dev (>= ${binary:Version}), libpe-rules2-dev (>= ${binary:Version}), libpe-status3-dev (>= ${binary:Version}), libpengine3-dev (>= ${binary:Version}), libstonithd1-dev (>= ${binary:Version}), libtransitioner1-dev (>= ${binary:Version}) Description: HA cluster resource manager (development files) High-Availability cluster resource manager for Heartbeat. . @@ -57,7 +58,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: pacemaker (<= 1.0.9.1+hg15626-2) Conflicts: pacemaker (<= 1.0.9.1+hg15626-2) -Description: Pacemaker libraries - CIB +Description: The Pacemaker libraries - CIB This package contains some of the libraries provided by and needed for the pacemaker cluster manager. You need to install them if you intend to run pacemaker. Specifically, this package contains the @@ -80,7 +81,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: pacemaker (<= 1.0.9.1+hg15626-2) Conflicts: pacemaker (<= 1.0.9.1+hg15626-2) -Description: Pacemaker libraries - CRM +Description: The Pacemaker libraries - CRM This package contains some of the libraries provided by and needed for the pacemaker cluster manager. You need to install them if you intend to run pacemaker. Specifically, this package contains the @@ -91,7 +92,7 @@ Section: libdevel Depends: ${misc:Depends}, libcrmcommon2 (= ${binary:Version}), - cluster-glue-dev (>= 1.0.7+hg2618) + cluster-glue-dev (>= 1.0.7-1) Replaces: pacemaker-dev (<= 1.0.9.1+hg15626-2) Conflicts: pacemaker-dev (<= 1.0.9.1+hg15626-2) Description: Development file for pacemaker's common library @@ -105,7 +106,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: pacemaker (<= 1.0.9.1+hg15626-2) Conflicts: pacemaker (<= 1.0.9.1+hg15626-2) -Description: Pacemaker libraries - common CRM +Description: The Pacemaker libraries - common CRM This package contains some of the libraries provided by and needed for the pacemaker cluster manager. You need to install them if you intend to run pacemaker. Specifically, this package contains the @@ -128,7 +129,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: pacemaker (<= 1.0.9.1+hg15626-2), libpe-rules-2 (<= 1.0.10-1) Conflicts: pacemaker (<= 1.0.9.1+hg15626-2), libpe-rules-2 (<= 1.0.10-1) -Description: Pacemaker libraries - rules for P-Engine +Description: The Pacemaker libraries - rules for P-Engine This package contains some of the libraries provided by and needed for the pacemaker cluster manager. You need to install them if you intend to run pacemaker. Specifically, this package contains the @@ -138,8 +139,8 @@ Architecture: any Section: libdevel Depends: ${misc:Depends}, libpe-status3 (= ${binary:Version}) -Replaces: pacemaker-dev (<= 1.0.9.1+hg15626-2), libpe-status-2-dev (<= 1.0.10-1), libpe-status2-dev -Conflicts: pacemaker-dev (<= 1.0.9.1+hg15626-2), libpe-status-2-dev (<= 1.0.10-1), libpe-status2-dev +Replaces: pacemaker-dev (<= 1.0.9.1+hg15626-2), libpe-status-2-dev (<= 1.0.10-1) +Conflicts: pacemaker-dev (<= 1.0.9.1+hg15626-2), libpe-status-2-dev (<= 1.0.10-1) Description: Development file for pacemaker's status library This package contains static libraries, symbol files as well as headers provided by the pacemaker cluster manager (pengine status). @@ -151,7 +152,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: pacemaker (<= 1.0.9.1+hg15626-2), libpe-status-2 (<= 1.0.10-1) Conflicts: pacemaker (<= 1.0.9.1+hg15626-2), libpe-status-2 (<= 1.0.10-1) -Description: Pacemaker libraries - status for P-Engine +Description: The Pacemaker libraries - status for P-Engine This package contains some of the libraries provided by and needed for the pacemaker cluster manager. You need to install them if you intend to run pacemaker. Specifically, this package contains the @@ -174,7 +175,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: pacemaker (<= 1.0.9.1+hg15626-2) Conflicts: pacemaker (<= 1.0.9.1+hg15626-2) -Description: Pacemaker libraries - P-Engine +Description: The Pacemaker libraries - P-Engine This package contains some of the libraries provided by and needed for the pacemaker cluster manager. You need to install them if you intend to run pacemaker. Specifically, this package contains the @@ -184,8 +185,8 @@ Architecture: any Section: libdevel Depends: ${misc:Depends}, libstonithd1 (= ${binary:Version}) -Replaces: pacemaker-dev (<= 1.0.9.1+hg15626-2), libstonithd0-dev -Conflicts: pacemaker-dev (<= 1.0.9.1+hg15626-2), libstonithd0-dev +Replaces: pacemaker-dev (<= 1.0.9.1+hg15626-2) +Conflicts: pacemaker-dev (<= 1.0.9.1+hg15626-2) Description: Development file for pacemaker's stonith library This package contains static libraries, symbol files as well as headers provided by the pacemaker cluster manager (stonith). @@ -195,9 +196,9 @@ Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: pacemaker (<= 1.0.9.1+hg15626-2), libstonithd0 -Conflicts: pacemaker (<= 1.0.9.1+hg15626-2), libstonithd0 -Description: Pacemaker libraries - stonith +Replaces: pacemaker (<= 1.0.9.1+hg15626-2) +Conflicts: pacemaker (<= 1.0.9.1+hg15626-2) +Description: The Pacemaker libraries - stonith This package contains some of the libraries provided by and needed for the pacemaker cluster manager. You need to install them if you intend to run pacemaker. Specifically, this package contains the @@ -220,7 +221,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: pacemaker (<= 1.0.9.1+hg15626-2) Conflicts: pacemaker (<= 1.0.9.1+hg15626-2) -Description: Pacemaker libraries - transitioner +Description: The Pacemaker libraries - transitioner This package contains some of the libraries provided by and needed for the pacemaker cluster manager. You need to install them if you intend to run pacemaker. Specifically, this package contains the diff -ruN pacemaker-1.1.6/debian/pacemaker-dev.install ubuntu-orig/pacemaker-1.1.5/debian/pacemaker-dev.install --- pacemaker-1.1.6/debian/pacemaker-dev.install 2011-10-20 13:53:17.000000000 +0000 +++ ubuntu-orig/pacemaker-1.1.5/debian/pacemaker-dev.install 2011-06-02 18:06:11.000000000 +0000 @@ -1,4 +1 @@ usr/share/pacemaker/tests/* -usr/lib/pkgconfig/pcmk-pe.pc -usr/lib/pkgconfig/pcmk-cib.pc -usr/lib/pkgconfig/pcmk.pc diff -ruN pacemaker-1.1.6/debian/pacemaker.install ubuntu-orig/pacemaker-1.1.5/debian/pacemaker.install --- pacemaker-1.1.6/debian/pacemaker.install 2011-10-20 13:48:19.000000000 +0000 +++ ubuntu-orig/pacemaker-1.1.5/debian/pacemaker.install 2011-06-02 17:00:34.000000000 +0000 @@ -80,6 +80,7 @@ usr/lib/ocf/resource.d/pacemaker/HealthCPU usr/share/pacemaker/templates/gfs2 usr/share/pacemaker/templates/gfs2-base +usr/share/pacemaker/crm_cli.txt usr/lib/python*/*-packages/*/*.py usr/share/man/man8/crm_resource.8 usr/share/man/man8/crmadmin.8 @@ -96,12 +97,17 @@ usr/share/man/man8/ptest.8 usr/share/man/man8/crm_diff.8 usr/share/man/man8/fence_legacy.8 +usr/share/man/man8/crm.8 usr/share/man/man8/iso8601.8 usr/share/man/man8/crm_uuid.8 usr/share/man/man8/crm_node.8 usr/share/man/man8/pacemakerd.8 usr/share/man/man8/stonith_admin.8 +usr/share/man/man8/cibpipe.8 usr/share/man/man8/cibadmin.8 +usr/share/man/man8/crmd.8 +usr/share/man/man8/stonithd.8 +usr/share/man/man8/pengine.8 usr/share/man/man7/ocf_pacemaker_Stateful.7 usr/share/man/man7/ocf_pacemaker_ping.7 usr/share/man/man7/ocf_pacemaker_pingd.7 @@ -114,9 +120,3 @@ usr/share/man/man7/ocf_pacemaker_ClusterMon.7 usr/share/man/man7/ocf_pacemaker_o2cb.7 etc/init.d/pacemaker -usr/share/man/man7/crmd.7 -usr/share/man/man7/pengine.7 -usr/share/man/man7/stonithd.7 -usr/share/man/man8/crm_ticket.8 -usr/share/pacemaker/crm.8.txt -usr/sbin/crm_ticket diff -ruN pacemaker-1.1.6/debian/rules ubuntu-orig/pacemaker-1.1.5/debian/rules --- pacemaker-1.1.6/debian/rules 2011-10-20 13:41:40.000000000 +0000 +++ ubuntu-orig/pacemaker-1.1.5/debian/rules 2011-06-24 22:30:45.000000000 +0000 @@ -60,8 +60,7 @@ unpatch: override_version=$(RELEASE) sh debian/apply $(UPSTREAM) -build-arch: build -build-indep: build + build: build-stamp build-stamp: dh_testdir @@ -99,7 +98,7 @@ dh_testroot dh_installdirs $(MAKE) install DESTDIR=`pwd`/debian/tmp docdir=/usr/share/doc/pacemaker - for file in `find debian/tmp -name '*.la'`; do \ + for file in debian/tmp/usr/lib/*.la; do \ sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \ done @@ -128,7 +127,7 @@ -chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/score.rng -chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/crm.dtd -chmod -x `pwd`/debian/pacemaker/usr/share/pacemaker/rule-1.0.rng - + # delete redundant COPYING files rm -rf debian/pacemaker/usr/share/doc/pacemaker/COPYING.LGPL rm -rf debian/pacemaker/usr/share/doc/pacemaker/COPYING.LIB @@ -153,9 +152,6 @@ dh_compress -a dh_fixperms -a - - chmod -x $(CURDIR)/debian/pacemaker/usr/share/pacemaker/*.rng - dh_makeshlibs -a -V dh_perl -a dh_python2 -ppacemaker -ppacemaker-dev