← Back to branch summary

~ubuntu-branches/ubuntu/natty/pacemaker/natty

« back to all changes in this revision

Viewing changes to debian/patches/fix_return_o2cb_ra.patch

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2011-01-12 10:12:46 UTC
  • mfrom: (1.1.6 upstream) (2.1.10 sid)
  • Revision ID: james.westby@ubuntu.com-20110112101246-d7cvgr509qjqd73q
Tags: 1.0.10-4ubuntu1
https://launchpad.net/bugs/701233
* 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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix_return_o2cb_ra.patch
1
 
Description: Fix to actually return the contents of the variable.
2
 
Origin: ubuntu
3
 
Reviewed-By: Andres Rodriguez <andreserl@ubuntu.com>
4
 
Last-Update: <2010-10-17>
5
 
 
6
 
Index: pacemaker-1.0.9.1+hg15626/extra/resources/o2cb
 
1
Index: pacemaker-1.0.10/extra/resources/o2cb
7
2
===================================================================
8
 
--- pacemaker-1.0.9.1+hg15626.orig/extra/resources/o2cb 2010-11-17 15:17:21.437146001 -0500
9
 
+++ pacemaker-1.0.9.1+hg15626/extra/resources/o2cb      2010-11-17 15:17:41.667146002 -0500
 
3
--- pacemaker-1.0.10.orig/extra/resources/o2cb  2011-01-10 12:59:11.952005002 -0600
 
4
+++ pacemaker-1.0.10/extra/resources/o2cb       2011-01-10 12:59:50.122005003 -0600
10
5
@@ -162,7 +162,7 @@
11
6
 {
12
7
     status_daemon; rc=$?