bump version to 12.0.2-pve1

diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch
index fbc0d691a08ba07d9b6c143b8a58989b0563fb05..42fa3ac98313ac21a9a23747baa2ff410866b6a4 100644 (file)
--- a/patches/0001-update-changelog.patch
+++ b/patches/0001-update-changelog.patch
@@ -1,4 +1,4 @@
-From f12b07be40d9cb909ef7b03c9168a274bfd13086 Mon Sep 17 00:00:00 2001
+From a3a706cfe86d02c1c6f7564d2ddd9c155bd9ff80 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/6] update changelog
@@ -8,14 +8,25 @@ Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
- debian/changelog | 32 ++++++++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
+ debian/changelog | 40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
 
 diff --git a/debian/changelog b/debian/changelog
-index adf0b98..b366685 100644
+index adf0b98..5956db2 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -4,12 +4,44 @@ ceph (12.0.2-1) stable; urgency=medium
+@@ -1,15 +1,55 @@
++ceph (12.0.2-pve1) stable; urgency=medium
++
++  * rebase on top of v12.0.2
++
++  * cherry-pick monitor upgrade fix for upgrades from <= v12.0.2
++
++ -- Proxmox Support Team <support@proxmox.com>  Wed, 26 Apr 2017 10:20:20 +0200
++
+ ceph (12.0.2-1) stable; urgency=medium
+ 
+   * New upstream release
  
   -- Ceph Release Team <ceph-maintainers@ceph.com>  Thu, 20 Apr 2017 19:59:57 +0000
  

diff --git a/patches/0002-build-with-system-boost.patch b/patches/0002-build-with-system-boost.patch
index 384bd74f8623a5c3c9c9d8b8228e4f31dff0d0df..205814a0fe90e5cf07b48b53294783c13ef03316 100644 (file)
--- a/patches/0002-build-with-system-boost.patch
+++ b/patches/0002-build-with-system-boost.patch
@@ -1,4 +1,4 @@
-From b56cf191f690b1ce3f1f0723fc09c634be6c81d8 Mon Sep 17 00:00:00 2001
+From 22302166a96657850a29aed838a44774e7de13ec 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:16:06 +0100
 Subject: [PATCH 2/6] build with system boost

diff --git a/patches/0003-ceph-detect-init-support-Debian-Stretch.patch b/patches/0003-ceph-detect-init-support-Debian-Stretch.patch
index 9b6324962cdf569c80d536fef78198ea6104fb5d..8f2bc8f5b5218180cf790c7ad1a5af1412a72a73 100644 (file)
--- a/patches/0003-ceph-detect-init-support-Debian-Stretch.patch
+++ b/patches/0003-ceph-detect-init-support-Debian-Stretch.patch
@@ -1,4 +1,4 @@
-From 927fa850b146575bcb31c85c00fc75df321c5a7c Mon Sep 17 00:00:00 2001
+From 70c45191ce08042685c958995f08da33daf5b252 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Tue, 21 Mar 2017 07:47:08 +0100
 Subject: [PATCH 3/6] ceph-detect-init: support Debian Stretch

diff --git a/patches/0004-enable-systemd-targets-by-default.patch b/patches/0004-enable-systemd-targets-by-default.patch
index 1db33acbd0f801e5a9f1090ac64333184fcc185f..c2fc1e5b74a365c1e0b7310898524af66986d7a5 100644 (file)
--- a/patches/0004-enable-systemd-targets-by-default.patch
+++ b/patches/0004-enable-systemd-targets-by-default.patch
@@ -1,4 +1,4 @@
-From cf2641af1f3e3c86e7a6cfdadd8967b837b88893 Mon Sep 17 00:00:00 2001
+From 6932e11c9ef71f6182bee690a7d985e12c9cb678 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 4/6] enable systemd targets by default

diff --git a/patches/0005-Revert-debian-drop-boost-build-dependencies.patch b/patches/0005-Revert-debian-drop-boost-build-dependencies.patch
index 72403b20898733c885e2ad64d4a809e8b6b63b32..54bbc4b4a62f29c46556cdf276b45ce86a71842a 100644 (file)
--- a/patches/0005-Revert-debian-drop-boost-build-dependencies.patch
+++ b/patches/0005-Revert-debian-drop-boost-build-dependencies.patch
@@ -1,4 +1,4 @@
-From ead28414be9eca9c6c09b702bbda27a4c2fbe65b Mon Sep 17 00:00:00 2001
+From 088b229bb647c406170b0214b29c32a617f99bdc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 29 Mar 2017 09:10:54 +0200
 Subject: [PATCH 5/6] Revert "debian: drop boost build dependencies"