From: Jeff Layton <jlayton@redhat.com>
Date: Mon, 24 Oct 2016 14:03:01 +0000 (-0400)
Subject: dpkg: libcephfs1 -> libcephfs2 package rename
X-Git-Tag: v11.1.0~383^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c078dc0daa9c50621f7252559a97bfb191244ca1;p=ceph.git

dpkg: libcephfs1 -> libcephfs2 package rename

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---

diff --git a/debian/.gitignore b/debian/.gitignore
index 35789301f40c..32ca866d7536 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -21,9 +21,9 @@
 /*.debhelper
 /ceph
 /files
-/libcephfs1-dbg
+/libcephfs2-dbg
 /libcephfs-dev
-/libcephfs1
+/libcephfs2
 /librados2-dbg
 /librados-dev
 /librados2
diff --git a/debian/control b/debian/control
index 822606ef7fe0..1296bb41d897 100644
--- a/debian/control
+++ b/debian/control
@@ -121,7 +121,7 @@ Depends: ceph-base (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: ceph-fuse (= ${binary:Version}),
-            libcephfs1 (= ${binary:Version})
+            libcephfs2 (= ${binary:Version})
 Replaces: ceph (<< 0.93-417)
 Breaks: ceph (<< 0.93-417)
 Description: metadata server for the ceph distributed file system
@@ -517,7 +517,7 @@ Description: RADOS block device client library (development files)
  This package contains development files needed for building applications that
  link against librbd1.
 
-Package: libcephfs1
+Package: libcephfs2
 Conflicts: libceph, libceph1, libcephfs
 Replaces: libceph, libceph1, libcephfs
 Architecture: linux-any
@@ -530,28 +530,28 @@ Description: Ceph distributed file system client library
  shared library allowing applications to access a Ceph distributed
  file system via a POSIX-like interface.
 
-Package: libcephfs1-dbg
+Package: libcephfs2-dbg
 Architecture: linux-any
 Section: debug
 Priority: extra
-Depends: libcephfs1 (= ${binary:Version}), ${misc:Depends}
+Depends: libcephfs2 (= ${binary:Version}), ${misc:Depends}
 Conflicts: libceph1-dbg
 Replaces: libceph1-dbg
-Description: debugging symbols for libcephfs1
+Description: debugging symbols for libcephfs2
  Ceph is a massively scalable, open-source, distributed
  storage system that runs on commodity hardware and delivers object,
  block and file system storage.  This is a
  shared library allowing applications to access a Ceph distributed
  file system via a POSIX-like interface.
  .
- This package contains debugging symbols for libcephfs1.
+ This package contains debugging symbols for libcephfs2.
 
 Package: libcephfs-dev
 Architecture: linux-any
 Section: libdevel
-Depends: libcephfs1 (= ${binary:Version}), ${misc:Depends}
-Conflicts: libceph-dev, libceph1-dev, libcephfs1-dev
-Replaces: libceph-dev, libceph1-dev, libcephfs1-dev
+Depends: libcephfs2 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libceph-dev, libceph1-dev, libcephfs2-dev
+Replaces: libceph-dev, libceph1-dev, libcephfs2-dev
 Description: Ceph distributed file system client library (development files)
  Ceph is a massively scalable, open-source, distributed
  storage system that runs on commodity hardware and delivers object,
@@ -727,7 +727,7 @@ Description: Python 3 libraries for the Ceph librbd library
 Package: python-cephfs
 Architecture: linux-any
 Section: python
-Depends: libcephfs1 (= ${binary:Version}),
+Depends: libcephfs2 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          ${python:Depends}
@@ -744,7 +744,7 @@ Description: Python 2 libraries for the Ceph libcephfs library
 Package: python3-cephfs
 Architecture: linux-any
 Section: python
-Depends: libcephfs1 (= ${binary:Version}),
+Depends: libcephfs2 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          ${python3:Depends}
@@ -777,6 +777,6 @@ Description: Java libraries for the Ceph File System
 Package: libcephfs-jni
 Architecture: linux-any
 Section: java
-Depends: libcephfs1 (= ${binary:Version}), ${java:Depends},
+Depends: libcephfs2 (= ${binary:Version}), ${java:Depends},
          ${misc:Depends}, ${shlibs:Depends}
 Description: Java Native Interface library for CephFS Java bindings
diff --git a/debian/libcephfs1.install b/debian/libcephfs1.install
deleted file mode 100644
index f1b4adf056b5..000000000000
--- a/debian/libcephfs1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-
-usr/lib/libcephfs.so.*
diff --git a/debian/libcephfs2.install b/debian/libcephfs2.install
new file mode 100644
index 000000000000..f1b4adf056b5
--- /dev/null
+++ b/debian/libcephfs2.install
@@ -0,0 +1,2 @@
+
+usr/lib/libcephfs.so.*
diff --git a/debian/rules b/debian/rules
index 1fa764ed82d0..95598057b741 100755
--- a/debian/rules
+++ b/debian/rules
@@ -133,7 +133,7 @@ override_dh_strip:
 	dh_strip -plibrados2 --dbg-package=librados2-dbg
 	dh_strip -plibradosstriper1 --dbg-package=libradosstriper1-dbg
 	dh_strip -plibrbd1 --dbg-package=librbd1-dbg
-	dh_strip -plibcephfs1 --dbg-package=libcephfs1-dbg
+	dh_strip -plibcephfs2 --dbg-package=libcephfs2-dbg
 	dh_strip -plibrgw2 --dbg-package=librgw2-dbg
 	dh_strip -pradosgw --dbg-package=radosgw-dbg
 	dh_strip -pceph-test --dbg-package=ceph-test-dbg
diff --git a/qa/qa_scripts/cephscrub.sh b/qa/qa_scripts/cephscrub.sh
index 216d655f1cf2..331d5ce32d81 100755
--- a/qa/qa_scripts/cephscrub.sh
+++ b/qa/qa_scripts/cephscrub.sh
@@ -19,8 +19,8 @@ sudo apt-get -y  purge librados-dev
 sudo apt-get -y  purge librbd1
 sudo apt-get -y  purge librbd1-dbg
 sudo apt-get -y  purge librbd-dev
-sudo apt-get -y  purge libcephfs1
-sudo apt-get -y  purge libcephfs1-dbg
+sudo apt-get -y  purge libcephfs2
+sudo apt-get -y  purge libcephfs2-dbg
 sudo apt-get -y  purge libcephfs-dev
 sudo apt-get -y  purge radosgw
 sudo apt-get -y  purge radosgw-dbg