Bump librados soname to 2.

Update Debian packaging. For human-only mentions of librados,
use just "librados"

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>

Conflicts:

	debian/control
	src/Makefile.am

debian/.gitignore

@@ -16,9 +16,9 @@
 /libcrush1-dbg
 /libcrush1-dev
 /libcrush1
-/librados1-dbg
-/librados1-dev
-/librados1
+/librados2-dbg
+/librados2-dev
+/librados2
 /librbd1-dbg
 /librbd1-dev
 /librbd1

debian/control

@@ -12,7 +12,7 @@ Standards-Version: 3.9.1
 Package: ceph
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libedit2, hdparm, binutils
-Recommends: ceph-client-tools, ceph-fuse, libceph1, librados1, librbd1, libcrush1, btrfs-tools
+Recommends: ceph-client-tools, ceph-fuse, libceph1, librados2, librbd1, libcrush1, btrfs-tools
 Description: distributed storage and file system
  Ceph is a distributed storage and network file system designed to provide
  excellent performance, reliability, and scalability.
@@ -134,7 +134,7 @@ Description: CRUSH mapping algorithm (development files)
  This package contains development files needed for building applications that
  link against libcrush.
 
-Package: librados1
+Package: librados2
 Conflicts: librados
 Replaces: librados
 Architecture: any
@@ -145,23 +145,23 @@ Description: RADOS distributed object store client library
  shared library allowing applications to access the distributed object
  store using a simple file-like interface.
 
-Package: librados1-dbg
+Package: librados2-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: librados1 (= ${binary:Version}), ${misc:Depends}
-Description: debugging symbols for librados1
+Depends: librados2 (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for librados
  RADOS is a reliable, autonomic distributed object storage cluster
  developed as part of the Ceph distributed storage system.  This is a
  shared library allowing applications to access the distributed object
  store using a simple file-like interface.
  .
- This package contains debugging symbols for librados1.
+ This package contains debugging symbols for librados.
 
-Package: librados1-dev
+Package: librados2-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, librados1 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, librados2 (= ${binary:Version})
 Description: RADOS distributed object store client library (development files)
  RADOS is a reliable, autonomic distributed object storage cluster
  developed as part of the Ceph distributed storage system.  This is a
@@ -173,7 +173,7 @@ Description: RADOS distributed object store client library (development files)
 
 Package: librbd1
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, librados1
+Depends: ${shlibs:Depends}, ${misc:Depends}, librados2
 Description: RADOS block device client library
  RBD is a block device striped across multiple distributed objects
  in RADOS, a reliable, autonomic distributed object storage cluster
@@ -245,7 +245,7 @@ Description: Ceph distributed file system client library (development files)
 
 Package: radosgw
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libexpat1, librados1
+Depends: ${shlibs:Depends}, ${misc:Depends}, libexpat1, librados2
 Description: REST gateway for RADOS distributed object store
  RADOS is a distributed object store used by the Ceph distributed
  storage system.  This package provides a REST gateway to the

debian/rules

@@ -65,7 +65,7 @@ binary-arch: build install
 	dh_strip -pceph-fuse --dbg-package=ceph-fuse-dbg
 	dh_strip -pceph-client-tools --dbg-package=ceph-client-tools-dbg
 	dh_strip -plibcrush1 --dbg-package=libcrush1-dbg
-	dh_strip -plibrados1 --dbg-package=librados1-dbg
+	dh_strip -plibrados2 --dbg-package=librados2-dbg
 	dh_strip -plibrbd1 --dbg-package=librbd1-dbg
 	dh_strip -plibceph1 --dbg-package=libceph1-dbg
 	dh_strip -pradosgw --dbg-package=radosgw-dbg

src/Makefile.am

@@ -221,7 +221,7 @@ librados_la_SOURCES = ${librados_SOURCES}
 librados_la_CFLAGS = ${AM_CFLAGS}
 librados_la_CXXFLAGS = ${AM_CXXFLAGS}
 librados_la_LIBADD = libcrush.la -lpthread $(CRYPTOPP_LIBS)
-librados_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '^rados_.*'
+librados_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 -export-symbols-regex '^rados_.*'
 lib_LTLIBRARIES += librados.la
 
 librados_a_SOURCES = ${librados_SOURCES}