From 913cc16a67d4a352a20bb5ce6dd6b8259eeeb5d5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 16 Aug 2017 09:19:21 +0200 Subject: [PATCH] bump version to 12.1.4-pve1 --- Makefile | 2 +- patches/0001-update-changelog.patch | 22 ++++++++++++++----- .../0002-cmake-disable-version-from-git.patch | 2 +- ...03-enable-systemd-targets-by-default.patch | 2 +- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 71007fec9..fb19819dd 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ RELEASE=5.0 PACKAGE=ceph -VER=12.1.3 +VER=12.1.4 DEBREL=pve1 SRCDIR=ceph diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch index 942cad68b..4755cf2aa 100644 --- a/patches/0001-update-changelog.patch +++ b/patches/0001-update-changelog.patch @@ -1,4 +1,4 @@ -From cb0ebf8735b92bc5303ebce3ed416c325f53ff9d Mon Sep 17 00:00:00 2001 +From 0eb1f67a1c6237fe83a16d7bc53f663a0870beed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 20 Mar 2017 09:12:50 +0100 Subject: [PATCH 1/3] update changelog @@ -8,14 +8,26 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- - debian/changelog | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 96 insertions(+) + debian/changelog | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 102 insertions(+) diff --git a/debian/changelog b/debian/changelog -index 481ec56e4c..ee6db377e5 100644 +index f6ac9bf929..071296d922 100644 --- a/debian/changelog +++ b/debian/changelog -@@ -1,45 +1,141 @@ +@@ -1,51 +1,153 @@ ++ceph (12.1.4-pve1) unstable; urgency=medium ++ ++ * rebase on latest upstream Release Candidate ++ ++ -- Proxmox Support Team Wed, 16 Aug 2017 08:02:47 +0200 ++ + ceph (12.1.4-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Tue, 15 Aug 2017 13:45:08 +0000 + +ceph (12.1.3-pve1) unstable; urgency=medium + + * rebase on latest upstream Release Candidate diff --git a/patches/0002-cmake-disable-version-from-git.patch b/patches/0002-cmake-disable-version-from-git.patch index b0b0eaf89..e920fa691 100644 --- a/patches/0002-cmake-disable-version-from-git.patch +++ b/patches/0002-cmake-disable-version-from-git.patch @@ -1,4 +1,4 @@ -From e0d06d15807235f999720b4e8ce0498ddaec4952 Mon Sep 17 00:00:00 2001 +From 994bd9f26c3eade13f6395175499876c434d3bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 31 May 2017 14:33:09 +0200 Subject: [PATCH 2/3] cmake: disable version from git diff --git a/patches/0003-enable-systemd-targets-by-default.patch b/patches/0003-enable-systemd-targets-by-default.patch index 265527133..c39d1478c 100644 --- a/patches/0003-enable-systemd-targets-by-default.patch +++ b/patches/0003-enable-systemd-targets-by-default.patch @@ -1,4 +1,4 @@ -From 93c5cd1df7d2c5eb7e0da3bda861a7c811f5a129 Mon Sep 17 00:00:00 2001 +From 966b844b880d38bc16a9c5dade0834077cc70afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 22 Mar 2017 09:00:34 +0100 Subject: [PATCH 3/3] enable systemd targets by default -- 2.39.2