[Pkg-ceph-commits] [ceph] 01/04: Import Debian changes 0.94.10-0ubuntu0.15.10.1~cloud1
James Downing Page
jamespage at moszumanska.debian.org
Thu Feb 1 15:28:21 UTC 2018
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to annotated tag debian/0.94.10-0ubuntu0.15.10.1.cloud2
in repository ceph.
commit 90361c502d6ac1f42fe7ab27d2ad061cb30ddfdb
Author: Chuck Short <zulcss at ubuntu.com>
Date: Thu Mar 2 13:14:06 2017 -0500
Import Debian changes 0.94.10-0ubuntu0.15.10.1~cloud1
ceph (0.94.10-0ubuntu0.15.10.1~cloud1) trusty-liberty; urgency=medium
* New upstream release (LP: #1666878).
---
debian/ceph.dirs | 10 +++----
debian/changelog | 69 ++++++++++++++++++++++++++-----------------
debian/gbp.conf | 2 +-
debian/patches/fixup-tests.sh | 34 ---------------------
debian/radosgw.dirs | 2 +-
debian/rules | 30 +++++++++----------
debian/watch | 2 +-
7 files changed, 65 insertions(+), 84 deletions(-)
diff --git a/debian/ceph.dirs b/debian/ceph.dirs
index ca7a880..c8999fd 100644
--- a/debian/ceph.dirs
+++ b/debian/ceph.dirs
@@ -1,8 +1,8 @@
etc/ceph
-var/log/ceph
-var/lib/ceph/tmp
+var/lib/ceph/bootstrap-mds
+var/lib/ceph/bootstrap-osd
+var/lib/ceph/mds
var/lib/ceph/mon
var/lib/ceph/osd
-var/lib/ceph/mds
-var/lib/ceph/bootstrap-osd
-var/lib/ceph/bootstrap-mds
+var/lib/ceph/tmp
+var/log/ceph
diff --git a/debian/changelog b/debian/changelog
index 1103c72..b4cfb6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,38 +1,32 @@
-ceph (0.94.10-0ubuntu0.15.04.1~cloud0) trusty-kilo; urgency=medium
+ceph (0.94.10-0ubuntu0.15.10.1~cloud1) trusty-liberty; urgency=medium
- * New upstream release. (LP: #1666878)
+ * New upstream release (LP: #1666878).
- -- Chuck Short <zulcss at ubuntu.com> Fri, 03 Mar 2017 10:12:52 -0500
+ -- Chuck Short <zulcss at ubuntu.com> Thu, 02 Mar 2017 13:14:06 -0500
-ceph (0.94.8-0ubuntu0.15.04.1~cloud0) trusty-kilo; urgency=medium
+ceph (0.94.8-0ubuntu0.15.10.1~cloud0) trusty-liberty; urgency=medium
- * New upstream release (LP: #1618379).
- - d/control: Add libboost-random-dev to BD's.
+ * New upstream release (LP: #1618379):
+ - d/control: Add libboost-random-dev to BDs.
- -- James Page <james.page at ubuntu.com> Wed, 31 Aug 2016 10:51:00 +0100
+ -- James Page <james.page at ubuntu.com> Tue, 30 Aug 2016 10:33:15 +0100
-ceph (0.94.7-0ubuntu0.15.04.1~cloud0) trusty-kilo; urgency=medium
+ceph (0.94.7-0ubuntu0.15.10.1) wily; urgency=medium
* New upstream version (LP: #1582189).
* d/copyright,gbp.conf: Exclude debian folder using uscan.
- -- James Page <james.page at ubuntu.com> Mon, 16 May 2016 12:26:07 +0100
+ -- James Page <james.page at ubuntu.com> Mon, 16 May 2016 15:11:26 +0100
-ceph (0.94.6-0ubuntu0.15.04.1~cloud0) trusty-kilo; urgency=medium
+ceph (0.94.6-0ubuntu0.15.10.1) wily; urgency=medium
* New upstream release (LP: #1549778):
- - d/p/rbdmap3-lazyumount.patch: Rebase.
- * d/watch: Update to scan for .gz files.
+ - d/p/rbdmap3-lazyumount.patch: Refresh.
+ * d/watch: Tweak to scan for *.gz files.
- -- James Page <james.page at ubuntu.com> Mon, 29 Feb 2016 10:43:26 +0000
+ -- James Page <james.page at ubuntu.com> Mon, 29 Feb 2016 17:27:46 +0000
-ceph (0.94.5-0ubuntu0.15.04.1~cloud0) trusty-kilo; urgency=medium
-
- * New update for the Ubuntu Cloud Archive.
-
- -- Openstack Ubuntu Testing Bot <openstack-testing-bot at ubuntu.com> Fri, 13 Nov 2015 06:56:35 +0000
-
-ceph (0.94.5-0ubuntu0.15.04.1) vivid; urgency=medium
+ceph (0.94.5-0ubuntu0.15.10.1) wily; urgency=medium
* New upstream release (LP: #1512292):
- d/p/ceph-radosgw-init.patch: Dropped, included upstream.
@@ -44,28 +38,49 @@ ceph (0.94.5-0ubuntu0.15.04.1) vivid; urgency=medium
- d/rules: Ensure that any remaining versioned so symlinks are dropped
from the packaging - this is all test code.
- -- James Page <james.page at ubuntu.com> Mon, 09 Nov 2015 10:38:26 +0000
+ -- James Page <james.page at ubuntu.com> Wed, 04 Nov 2015 09:43:19 +0000
-ceph (0.94.3-0ubuntu0.15.04.1) vivid; urgency=medium
+ceph (0.94.3-0ubuntu2) wily; urgency=medium
- [ James Page ]
- * New upstream point release (LP: #1492227).
* d/ceph.install: Drop ceph-deploy manpage from packaging, provided
by ceph-deploy itself (LP: #1475910).
+ -- James Page <james.page at ubuntu.com> Mon, 07 Sep 2015 14:42:03 +0100
+
+ceph (0.94.3-0ubuntu1) wily; urgency=medium
+
+ [ James Page ]
+ * New upstream point release (LP: #1492227):
+ - d/p/remove-unused-variable-ceph-bug-11576.patch:
+ Dropped, included upstream.
+ - d/p*: Refreshed.
+
[ Liam Young ]
* d/p/ceph-radosgw-init.patch: Cherry pick patch from upstream VCS to
ensure that restarts of the radosgw wait an appropriate amount of time
for the existing daemon to shutdown (LP: #1477225).
- -- James Page <james.page at ubuntu.com> Mon, 07 Sep 2015 16:01:46 +0100
+ -- James Page <james.page at ubuntu.com> Mon, 07 Sep 2015 12:23:50 +0100
+
+ceph (0.94.2-0ubuntu3) wily; urgency=medium
+
+ * Fix compile failure with boost 1.58 (LP: #1483403):
+ - src/mon/OSDMonitor.cc: remove unused variable (Ceph issue #11576)
+
+ -- Tiago Stürmer Daitx <tiago.daitx at canonical.com> Mon, 10 Aug 2015 18:36:48 -0300
+
+ceph (0.94.2-0ubuntu2) wily; urgency=medium
+
+ * No change rebuild for boost1.58/libstdc++6.
+
+ -- Dimitri John Ledkov <dimitri.j.ledkov at linux.intel.com> Sun, 02 Aug 2015 13:25:26 +0100
-ceph (0.94.2-0ubuntu0.15.04.1) vivid; urgency=medium
+ceph (0.94.2-0ubuntu1) wily; urgency=medium
* New upstream point release (LP: #1465553):
- d/p/*: Refreshed.
- -- James Page <james.page at ubuntu.com> Tue, 16 Jun 2015 14:32:05 +0100
+ -- James Page <james.page at ubuntu.com> Tue, 16 Jun 2015 09:53:23 +0100
ceph (0.94.1-0ubuntu1) vivid; urgency=high
diff --git a/debian/gbp.conf b/debian/gbp.conf
index afb6c6a..b91a427 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,3 @@
[DEFAULT]
-debian-branch = ubuntu/vivid
+debian-branch = trusty/liberty
pristine-tar = True
diff --git a/debian/patches/fixup-tests.sh b/debian/patches/fixup-tests.sh
deleted file mode 100644
index 4f651d6..0000000
--- a/debian/patches/fixup-tests.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1be39b85504e6d3c892a31313de3763a55e18dcd Mon Sep 17 00:00:00 2001
-From: Loic Dachary <ldachary at redhat.com>
-Date: Mon, 15 Dec 2014 12:29:51 +0100
-Subject: [PATCH] tests: fail if gf_methods is not found
-
----
- Examples/test_all_gfs.sh | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/Examples/test_all_gfs.sh b/Examples/test_all_gfs.sh
-index a03ee9c..b78dd6b 100755
---- a/Examples/test_all_gfs.sh
-+++ b/Examples/test_all_gfs.sh
-@@ -1,4 +1,4 @@
--#
-+#!/bin/bash
- #
- # Copyright (c) 2013, James S. Plank and Kevin Greenan
- # All rights reserved.
-@@ -42,6 +42,11 @@ k=12
- m=3
- seed=1370
-
-+if ! test -x ${GF_METHODS} ; then
-+ ${GF_METHODS}
-+ exit 1
-+fi
-+
- # Test all w=8
- ${GF_METHODS} 8 -B -L | awk -F: '{ if ($1 == "w=8") print $2; }' |
- while read method; do
---
-libgit2 0.21.2
-
diff --git a/debian/radosgw.dirs b/debian/radosgw.dirs
index f54add5..b99cc97 100644
--- a/debian/radosgw.dirs
+++ b/debian/radosgw.dirs
@@ -1,3 +1,3 @@
+var/lib/ceph/radosgw
var/log/ceph
var/log/radosgw
-var/lib/ceph/radosgw
diff --git a/debian/rules b/debian/rules
index ea7150a..953b38d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ export DEB_LDFLAGS_MAINT_APPEND= -Wl,--as-needed
# Enable hardening
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
export JAVA_HOME=/usr/lib/jvm/default-java
## Set JAVAC to prevent FTBFS due to incorrect use of 'gcj' if found (see "m4/ac_prog_javac.m4").
@@ -65,7 +65,7 @@ override_dh_auto_clean:
override_dh_auto_install:
dh_auto_install --destdir=$(CURDIR)/debian/tmp
# NOTE: ensure that any versioned erasure coding test code is dropped
- # from the package install - package ships unversioned modules.
+ # from the package install - package ships unversioned modules.
rm -f $(CURDIR)/debian/tmp/usr/lib/*/ceph/erasure-code/libec_*.so.*
find $(CURDIR)/debian/tmp/usr/lib/*/ceph/erasure-code -type l -delete || :
@@ -74,21 +74,21 @@ override_dh_installinit:
dh_installinit -pceph --no-start --name=rbdmap
# Install upstart configurations using dh_installinit
for conf in `ls -1 src/upstart/ceph*.conf | grep -v mds`; do \
- name=`basename $$conf | cut -d . -f 1`; \
- cp -v $$conf debian/ceph.$$name.upstart; \
- dh_installinit -pceph --no-start --name=$$name; \
- done
+ name=`basename $$conf | cut -d . -f 1`; \
+ cp -v $$conf debian/ceph.$$name.upstart; \
+ dh_installinit -pceph --no-start --name=$$name; \
+ done
for conf in `ls -1 src/upstart/ceph-mds*.conf`; do \
- name=`basename $$conf | cut -d . -f 1`; \
- cp -v $$conf debian/ceph-mds.$$name.upstart; \
- dh_installinit -pceph-mds --no-start --name=$$name; \
- done
+ name=`basename $$conf | cut -d . -f 1`; \
+ cp -v $$conf debian/ceph-mds.$$name.upstart; \
+ dh_installinit -pceph-mds --no-start --name=$$name; \
+ done
for conf in `ls -1 src/upstart/radosgw*.conf`; do \
- name=`basename $$conf | cut -d . -f 1`; \
- [ $$name = "radosgw" ] && name="radosgw-instance";\
- cp -v $$conf debian/radosgw.$$name.upstart; \
- dh_installinit -pradosgw --no-start --name=$$name; \
- done
+ name=`basename $$conf | cut -d . -f 1`; \
+ [ $$name = "radosgw" ] && name="radosgw-instance";\
+ cp -v $$conf debian/radosgw.$$name.upstart; \
+ dh_installinit -pradosgw --no-start --name=$$name; \
+ done
override_dh_systemd_enable:
## Do not enable services to match `dh_installinit --no-start`
diff --git a/debian/watch b/debian/watch
index 3f9763e..ca94884 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
opts="uversionmangle=s/-/~/" \
- http://ceph.com/download/ceph-(\d.*)\.tar\.gz
+ http://download.ceph.com/tarballs/ceph-(\d.*)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list