bump version to 12.1.4-pve1

diff --git a/Makefile b/Makefile
index 71007fec9054c6c98aeabb5403e207666532c8da..fb19819dd5c1272fe46f7f3301a2cb095db3209d 100644 (file)
--- 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 942cad68b316b1782d95dc722decbff497b614d4..4755cf2aae36605185ff988c726833e43084c1c0 100644 (file)
--- 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?= <f.gruenbichler@proxmox.com>
 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 <f.gruenbichler@proxmox.com>
 ---
- 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 <support@proxmox.com>  Wed, 16 Aug 2017 08:02:47 +0200
++
+ ceph (12.1.4-1) stable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Ceph Release Team <ceph-maintainers@ceph.com>  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 b0b0eaf89ce1a70a1670c411c3ec7e645ddc5e05..e920fa69105c665a7c3b1414987b30c6a10dda7c 100644 (file)
--- 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?= <f.gruenbichler@proxmox.com>
 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 265527133a82ad0c2e948fdea3be496749925bfd..c39d1478cabaf6459b4ac7a96b3007edef1ca98d 100644 (file)
--- 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?= <f.gruenbichler@proxmox.com>
 Date: Wed, 22 Mar 2017 09:00:34 +0100
 Subject: [PATCH 3/3] enable systemd targets by default