~ubuntu-branches/ubuntu/quantal/ceph/quantal

Viewing all changes in revision 17.

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2012-07-16 09:56:24 UTC
  • mfrom: (1.1.10) (0.1.15 sid)
  • Revision ID: package-import@ubuntu.com-20120716095624-dkm080wyuo7tcj6m
Tags: 0.48-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - Work with in-tree dependencies until MIR review completes:
    + d/patches/intree_leveldb.patch: temporary patch which inserts leveldb
      into the ceph src tree.
    + d/control,d/rules,d/p/series Don't use system leveldb and associated
      ceph patches; its not in main yet.
    + d/control,d/rules: Don't use system libs3; its not in main yet and
      is only required for rest-bench (which Ubuntu don't ship - see below).
    + d/patches/add-powerpc-support.patch: temporary patch to in-tree
      leveldb to fix FTBFS on powerpc.
    + d/rules: Disable hardening until intree leveldb is dropped.
  - d/rules,d/control: Drop radosgw and rest-bench since libfcgi is
    not in main yet.
  - d/rules,d/control: Drop tcmalloc use since google-perftools is not
    in main yet.
  - d/rules,d/control: Drop ceph-fuse entirely per MIR review recommendation.
  - d/control,d/ceph-fs-common.install,d/ceph-mds.install: Split out
    filesystem specific bits so they can be kept in universe.
  - d/control: Drop recommends on btrfs-tools.
  - d/control: Drop BD on python-support; its not required as the package
    uses dh_python2.
  - d/*.symbols: Drop for the time being; they are not correct and break
    builds other than amd64.
* Dropped changes, now in Debian:
  - d/control: Switch from libcryptopp to libnss as libcryptopp.
  - d/rules: Move from python-support to dh_python2.
  - d/control: python-ceph - Dropped librgw1/added librbd1.
* d/watch,d/orig-tar.sh: Updated watch to repack orig.tar.gz -> orig.tar.bz2
  and strip the upstream debian directory.
* d/debian/ceph.lintian-overrides: Drop override for rgw library which is no
  longer shipped by upstream.
* d/rules: Strip librados-dev package as it now contains a binary.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: