[Pkg-ceph-commits] [ceph] 04/05: d/patches/*: Drop upstreamed patches.
James Downing Page
jamespage at moszumanska.debian.org
Tue Mar 18 18:34:06 UTC 2014
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch experimental
in repository ceph.
commit 47a306bc8558201f71c80a9746877dd5b7f6f578
Author: James Page <jamespage at debian.org>
Date: Tue Mar 18 18:17:22 2014 +0000
d/patches/*: Drop upstreamed patches.
---
debian/changelog | 6 ++--
debian/patches/make-clean | 17 ----------
debian/patches/modules | 81 -----------------------------------------------
debian/patches/series | 2 --
4 files changed, 4 insertions(+), 102 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c321a42..896efeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-ceph (0.72.2-3) UNRELEASED; urgency=medium
+ceph (0.77-1) UNRELEASED; urgency=medium
+ * New upstream release:
+ - d/patches/*: Drop upstreamed patches.
* d/ceph-test.install: Install test binaries to /usr/lib/ceph/bin; they
really don't need to be installed on the default path.
- -- James Page <james.page at ubuntu.com> Thu, 13 Mar 2014 14:12:47 +0000
+ -- James Page <james.page at ubuntu.com> Tue, 18 Mar 2014 18:08:23 +0000
ceph (0.72.2-2) unstable; urgency=medium
diff --git a/debian/patches/make-clean b/debian/patches/make-clean
deleted file mode 100644
index 2df0516..0000000
--- a/debian/patches/make-clean
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Add missing stuff to clean target
-Author: Bastian Blank <waldi at debian.org>
-Origin: vendor
-Forwarded: no
----
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -308,7 +308,8 @@ ceph: ceph.in ./ceph_ver.h Makefile
- # cleaning
-
- clean-local:
-- -rm *.so *.gcno *.gcda
-+ rm -f *.so *.gcno *.gcda
-+ rm -f ceph java/java/com/ceph/crush/Bucket.class
-
-
- # pybind
diff --git a/debian/patches/modules b/debian/patches/modules
deleted file mode 100644
index ae6efc8..0000000
--- a/debian/patches/modules
+++ /dev/null
@@ -1,81 +0,0 @@
-Description: Properly mark library modules
-Author: Bastian Blank <waldi at debian.org>
-Origin: vendor
-Forwarded: https://github.com/ceph/ceph/commit/909a733fe7119fc1bf123b3739e3acc6f2135b6a
-
----
---- a/src/cls/Makefile.am
-+++ b/src/cls/Makefile.am
-@@ -2,17 +2,17 @@
-
- libcls_hello_la_SOURCES = cls/hello/cls_hello.cc
- libcls_hello_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
--libcls_hello_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
-+libcls_hello_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- radoslib_LTLIBRARIES += libcls_hello.la
-
- libcls_rbd_la_SOURCES = cls/rbd/cls_rbd.cc
- libcls_rbd_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
--libcls_rbd_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
-+libcls_rbd_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- radoslib_LTLIBRARIES += libcls_rbd.la
-
- libcls_lock_la_SOURCES = cls/lock/cls_lock.cc
- libcls_lock_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
--libcls_lock_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
-+libcls_lock_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- radoslib_LTLIBRARIES += libcls_lock.la
-
- libcls_refcount_la_SOURCES = \
-@@ -20,27 +20,27 @@ libcls_refcount_la_SOURCES = \
- cls/refcount/cls_refcount_ops.cc \
- common/ceph_json.cc
- libcls_refcount_la_LIBADD = libjson_spirit.la $(PTHREAD_LIBS) $(EXTRALIBS)
--libcls_refcount_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
-+libcls_refcount_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- radoslib_LTLIBRARIES += libcls_refcount.la
-
- libcls_version_la_SOURCES = cls/version/cls_version.cc
- libcls_version_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
--libcls_version_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
-+libcls_version_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- radoslib_LTLIBRARIES += libcls_version.la
-
- libcls_log_la_SOURCES = cls/log/cls_log.cc
- libcls_log_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
--libcls_log_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
-+libcls_log_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- radoslib_LTLIBRARIES += libcls_log.la
-
- libcls_statelog_la_SOURCES = cls/statelog/cls_statelog.cc
- libcls_statelog_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
--libcls_statelog_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
-+libcls_statelog_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- radoslib_LTLIBRARIES += libcls_statelog.la
-
- libcls_replica_log_la_SOURCES = cls/replica_log/cls_replica_log.cc
- libcls_replica_log_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
--libcls_replica_log_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
-+libcls_replica_log_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- radoslib_LTLIBRARIES += libcls_replica_log.la
-
- libcls_rgw_la_SOURCES = \
-@@ -49,7 +49,7 @@ libcls_rgw_la_SOURCES = \
- cls/rgw/cls_rgw_types.cc \
- common/ceph_json.cc
- libcls_rgw_la_LIBADD = libjson_spirit.la $(PTHREAD_LIBS) $(EXTRALIBS)
--libcls_rgw_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
-+libcls_rgw_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- radoslib_LTLIBRARIES += libcls_rgw.la
-
- ## Rados object client classes
---- a/src/key_value_store/Makefile.am
-+++ b/src/key_value_store/Makefile.am
-@@ -1,6 +1,6 @@
- libcls_kvs_la_SOURCES = key_value_store/cls_kvs.cc
- libcls_kvs_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
--libcls_kvs_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__cls_.*'
-+libcls_kvs_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
- radoslib_LTLIBRARIES += libcls_kvs.la
-
- noinst_HEADERS += \
diff --git a/debian/patches/series b/debian/patches/series
index 2ea09cc..2ede999 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
virtualenv-never-download
-make-clean
-modules
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list