Fix Debian librados1 -> librados2 package renames

The librados2{,-dbg,-dev} packages should conflict with and replace their
librados1{,-dbg,-dev} counterpart.

diff --git a/debian/changelog b/debian/changelog
index 71f023e7aa8be253ecfc44d51268cae16a90f22d..a434deada11bccb133fa8bc1405dcb8f2263b9ed 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ ceph (0.26~rc-1) experimental; urgency=low
   * Make Ceph cross buildable (closes: #618939), thanks to Hector Oron.
   * Disable libatomic-ops on ARMv4t (armel) archs to prevent FTBFS
     (closes: #615235), thanks go to Hector Oron again.
+  * Rename librados1{,-dbg,-dev} packages to librados2{,-dbg,-dev} ones;
+    conflict with and replace the former ones.
 
- -- Laszlo Boszormenyi (GCS) <gcs@debian.hu>  Mon, 21 Mar 2011 11:34:02 -0800
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.hu>  Fri, 25 Mar 2011 19:42:11 +0100
 
 ceph (0.25.1-1) experimental; urgency=low
 

diff --git a/debian/control b/debian/control
index b6f0cf78b334c6fed170aaec214d63992800ecd6..38503e973dd5891c24a44cd228c9ffcb101da8bd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -138,8 +138,8 @@ Description: CRUSH mapping algorithm (development files)
  link against libcrush.
 
 Package: librados2
-Conflicts: librados
-Replaces: librados
+Conflicts: librados, librados1
+Replaces: librados, librados1
 Architecture: linux-any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}, libcrush1
@@ -150,6 +150,8 @@ Description: RADOS distributed object store client library
  store using a simple file-like interface.
 
 Package: librados2-dbg
+Conflicts: librados1-dbg
+Replaces: librados1-dbg
 Architecture: linux-any
 Section: debug
 Priority: extra