~ubuntu-branches/ubuntu/oneiric/cluster-glue/oneiric

Viewing all changes in revision 13.

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2011-06-04 04:32:03 UTC
  • mfrom: (5.2.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110604043203-u0eu8zir4w2n4bly
Tags: 1.0.7-3.2ubuntu1
* 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

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: