sync Ceph 0.37 with Debian

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi all,

There are some mistakes and difference with Debian packages and your
work.
Please add debian/watch (attached).
libceph packages are renamed to libcephfs , but the related packager
files are not. The following should fix this:
git mv debian/libceph1.install debian/libcephfs1.install
git mv debian/libceph1.postinst debian/libcephfs1.postinst
git mv debian/libceph1.postrm debian/libcephfs1.postrm
git mv debian/libceph-dev.install debian/libcephfs-dev.install

Still on the renames, some conflicts-replaces are needed (attached).

As I see, the primary VCS location changed to github, state this in
debian/control as well (attached).

Either add the logrotate_missingok.patch (attached) or add missingok
to src/logrotate.conf [1].

Per policy and multiarch support, Debian packages have to empty their
dependency_libs in *.la files (attached).

Thanks,
Laszlo/GCS
[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=645651

Attachment: watch
Description: application/fluid

diff --git a/debian/control b/debian/control
index 966f98b..1b5e08d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: ceph
 Section: admin
 Priority: optional
 Homepage: http://ceph.newdream.net/
-Vcs-Git: git://ceph.newdream.net/git/ceph.git
-Vcs-Browser: http://ceph.newdream.net/git/?p=ceph.git;a=summary
+Vcs-Git: git://github.com/NewDreamNetwork/ceph.git
+Vcs-Browser: https://github.com/NewDreamNetwork/ceph
 Maintainer: Laszlo Boszormenyi (GCS) <gcs@xxxxxxxxx>
 Uploaders: Sage Weil <sage@xxxxxxxxxxxx>
 Build-Depends: debhelper (>= 6.0.7~), autotools-dev, autoconf, automake, libfuse-dev, libboost-dev (>= 1.34), libedit-dev, libcrypto++-dev, libtool, libexpat1-dev, libfcgi-dev, libatomic-ops-dev, libgoogle-perftools-dev [i386 amd64], pkg-config, libgtkmm-2.4-dev, python, python-support, libcurl4-gnutls-dev, libkeyutils-dev
Description: add missingok to logrotate
 When ceph is not running, it has no logs. Thus logrotate has nothing to
 rotate. The missingok directive handles this situation.
Author: Laszlo Boszormenyi (GCS) <gcs@xxxxxxxxx>

---
Origin: Laszlo Boszormenyi (GCS)
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=645651
Last-Update: <2011-10-31>

--- ceph-0.37.orig/src/logrotate.conf
+++ ceph-0.37/src/logrotate.conf
@@ -6,4 +6,5 @@
     postrotate
         invoke-rc.d ceph reload >/dev/null || service ceph reload >/dev/null
     endscript
+    missingok
 }
diff --git a/debian/rules b/debian/rules
index 408049b..a20258d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,6 +81,7 @@ install: build
 	dh_installdirs
 
 	$(MAKE) DESTDIR=$(DESTDIR) install
+	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
 	install -D -m 644 udev/50-rbd.rules $(DESTDIR)/lib/udev/rules.d/50-rbd.rules
 
 # Add here commands to install the package into debian/testpack.
diff --git a/debian/control b/debian/control
index 966f98b..6de1580 100644
--- 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

Attachment: signature.asc
Description: This is a digitally signed message part


[Index of Archives]     [CEPH Users]     [Ceph Large]     [Information on CEPH]     [Linux BTRFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux