debian: fix libceph1 -> libcephfs1 rename

Signed-off-by: Laszlo Boszormenyi <gcs@debian.hu>

diff --git a/debian/control b/debian/control
index 966f98bbe99185b1dbbf3bba3f2e40ad1b58b5a6..6de1580ba85b71cc347ba2425f9844237eda073a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -88,6 +88,8 @@ Description: debugging symbols for ceph-fuse
 Package: ceph-common
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, librbd1 (= ${binary:Version})
+Conflicts: ceph-client-tools
+Replaces: ceph-client-tools
 Suggests: ceph
 Description: common utilities to mount and interact with a ceph filesystem
  Ceph is a distributed network file system designed to provide
@@ -98,6 +100,8 @@ Description: common utilities to mount and interact with a ceph filesystem
 Package: ceph-common-dbg
 Architecture: linux-any
 Depends: ceph-common (= ${binary:Version}), ${misc:Depends}
+Conflicts: ceph-client-tools-dbg
+Replaces: ceph-client-tools-dbg
 Section: debug
 Priority: extra
 Description: debugging symbols for ceph-common
@@ -189,8 +193,8 @@ Description: RADOS block device client library (development files)
  link against librbd1.
 
 Package: libcephfs1
-Conflicts: libcephfs
-Replaces: libcephfs
+Conflicts: libcephfs, libceph, libceph1
+Replaces: libcephfs, libceph, libceph1
 Architecture: linux-any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -205,6 +209,8 @@ Architecture: linux-any
 Section: debug
 Priority: extra
 Depends: libcephfs1 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libceph1-dbg
+Replaces: libceph1-dbg
 Description: debugging symbols for libcephfs1
  Ceph is a distributed network file system designed to provide
  excellent performance, reliability, and scalability.  This is a
@@ -217,8 +223,8 @@ Package: libcephfs-dev
 Architecture: linux-any
 Section: libdevel
 Depends: ${misc:Depends}, libcephfs1 (= ${binary:Version})
-Conflicts: libcephfs1-dev
-Replaces: libcephfs1-dev
+Conflicts: libcephfs1-dev, libceph1-dev, libceph-dev
+Replaces: libcephfs1-dev, libceph1-dev, libceph-dev
 Description: Ceph distributed file system client library (development files)
  Ceph is a distributed network file system designed to provide
  excellent performance, reliability, and scalability.  This is a

diff --git a/debian/libceph-dev.install b/debian/libceph-dev.install
deleted file mode 100644 (file)
index 902fb95..0000000
--- a/debian/libceph-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libcephfs.so
-usr/lib/libcephfs.a
-usr/lib/libcephfs.la
-usr/include/cephfs/libcephfs.h

diff --git a/debian/libceph1.install b/debian/libceph1.install
deleted file mode 100644 (file)
index a5266df..0000000
--- a/debian/libceph1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libcephfs.so.*
-

diff --git a/debian/libceph1.postinst b/debian/libceph1.postinst
deleted file mode 100644 (file)
index df6b9fc..0000000
--- a/debian/libceph1.postinst
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure)
-       ldconfig
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

diff --git a/debian/libceph1.postrm b/debian/libceph1.postrm
deleted file mode 100644 (file)
index 598f48b..0000000
--- a/debian/libceph1.postrm
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-# postrm script for ceph
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove)
-       ldconfig
-    ;;
-
-    purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

diff --git a/debian/libcephfs-dev.install b/debian/libcephfs-dev.install
new file mode 100644 (file)
index 0000000..902fb95
--- /dev/null
+++ b/debian/libcephfs-dev.install
@@ -0,0 +1,4 @@
+usr/lib/libcephfs.so
+usr/lib/libcephfs.a
+usr/lib/libcephfs.la
+usr/include/cephfs/libcephfs.h

diff --git a/debian/libcephfs1.install b/debian/libcephfs1.install
new file mode 100644 (file)
index 0000000..a5266df
--- /dev/null
+++ b/debian/libcephfs1.install
@@ -0,0 +1,2 @@
+usr/lib/libcephfs.so.*
+

diff --git a/debian/libcephfs1.postinst b/debian/libcephfs1.postinst
new file mode 100644 (file)
index 0000000..df6b9fc
--- /dev/null
+++ b/debian/libcephfs1.postinst
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+       ldconfig
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

diff --git a/debian/libcephfs1.postrm b/debian/libcephfs1.postrm
new file mode 100644 (file)
index 0000000..598f48b
--- /dev/null
+++ b/debian/libcephfs1.postrm
@@ -0,0 +1,43 @@
+#!/bin/sh
+# postrm script for ceph
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove)
+       ldconfig
+    ;;
+
+    purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+