lp:~ubuntu-branches/ubuntu/precise/cluster-glue/precise-201110200622

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/precise/cluster-glue

Ubuntu branches: Pending requested 2011-10-20

Diff: 4000 lines (+3989/-0) (has conflicts)

1 file modified

.pc/raexecupstart.patch/lrm/lrmd/lrmd.c (+3989/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

15. By Steve Langasek on 2011-10-18

releasing version 1.0.7+hg2618-2ubuntu1

14. By Steve Langasek on 2011-10-18

Merge release 1.0.7+hg2618-2 from Debian testing

13. By Steve Langasek on 2011-06-04

* Merge from Debian unstable. Remaining changes:
  - debian/rules: Add -V argument to dh_makeshlibs.
  - Enable Upstart RA:
    + debian/cluster-glue.install: Install upstart RA.
    + debian/control: Build-depends on libdbus-glib-1-dev and libdbus-1-dev.
    + debian/patches/raexecupstart.patch: Fix deadlock
* Dropped changes, included in Debian:
  - debian/rules: clean the dependency_libs out of .la files at build
    time, per Policy 10.2

12. By Steve Langasek on 2011-05-21

* Merge from Debian unstable. Remaining changes:
  - debian/rules: Add -V argument to dh_makeshlibs.
  - Enable Upstart RA:
    + debian/cluster-glue.install: Install upstart RA.
    + debian/control: Build-depends on libdbus-glib-1-dev and libdbus-1-dev.
    + debian/patches/raexecupstart.patch: Fix deadlock
  - debian/rules: clean the dependency_libs out of .la files at build
    time, per Policy 10.2
* Dropped changes:
  - debian/control: Tighten Replaces/Conflicts to Ubuntu version - no
    reason to not use the same version number here.

11. By Steve Langasek on 2011-03-24

debian/rules: clean the dependency_libs out of .la files at build
time, per Policy 10.2

10. By Andres Rodriguez on 2011-01-07

* Merge from debian unstable (LP: #700161). Remaining changes:
  - debian/control: Tighten Replaces/Conflicts to Ubuntu version.
  - debian/rules: Add -V argument to dh_makeshlibs.
  - Enable Upstart RA:
    + debian/cluster-glue.install: Install upstart RA.
    + debian/control: Build-depends on libdbus-glib-1-dev and libdbus-1-dev.
    + debian/patches/raexecupstart.patch: Fix deadlock

9. By Andres Rodriguez on 2010-12-06

* Resync from debian experimental.
* debian/control:
  - Remove ${shlibs:depends} from some library -dev packages.
  - Add missing Section for library packages.
  - Tighten Replaces/Conflicts to Ubuntu version.
* debian/rules: Add -V argument to dh_makeshlibs.
* Enable Upstart RA:
  - debian/cluster-glue.install: Install upstart RA.
  - debian/control: Build-depends on libdbus-glib-1-dev and libdbus-1-dev.
  - debian/patches/raexecupstart.patch: Fix deadlock

8. By Andres Rodriguez on 2010-11-17

* Split libraries into their own binary packages. (Taken from debian ha
  mercurial repository. Done by Martin Loschwitz)
* debian/control:
  - Remove ${shlibs:depends} from some library -dev packages.
  - Add missing Section for library packages.
  - Tighten Replaces/Conflicts to Ubuntu version.

7. By Andres Rodriguez on 2010-10-12

SRU: Really install Upstart Resource Agent (LP: #659510)

6. By Ante Karamatić on 2010-09-07

* debian/patches/raexecupstart.patch
  - add upstart LRM plugin
* debian/control:
  - add libdbus-glib-1-dev and libdbus-1-dev to build deps