bump version to 12.1.2-pve1

diff --git a/Makefile b/Makefile
index 6d7902289891af175df551e69bfd8572206853ba..655a5f91f3b0ab44f198c1cd80dd2fad3dfca520 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=5.0
 
 PACKAGE=ceph
-VER=12.1.1
+VER=12.1.2
 DEBREL=pve1
 
 SRCDIR=ceph

diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch
index 02e471a9b478f40c785662b500d512e28b43d382..6247509f394532962dedf50db8dcef4e1025a21b 100644 (file)
--- a/patches/0001-update-changelog.patch
+++ b/patches/0001-update-changelog.patch
@@ -1,4 +1,4 @@
-From 22c6c7657b2767dcd9cbe3b0c42b363f3c979a3c Mon Sep 17 00:00:00 2001
+From 24a448f97ae389d300159b43d4becf8f841e867f 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 | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 84 insertions(+)
+ debian/changelog | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 90 insertions(+)
 
 diff --git a/debian/changelog b/debian/changelog
-index 0da87edd48..9a029b1afe 100644
+index 25b6f5830b..35c5b08555 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,33 +1,117 @@
+@@ -1,39 +1,129 @@
++ceph (12.1.2-pve1) unstable; urgency=medium
++
++  * rebase on latest upstream Release Candidate
++
++ -- Proxmox Support Team <support@proxmox.com>  Thu, 3 Aug 2017 11:57:13 +0200
++
+ ceph (12.1.2-1) stable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Ceph Release Team <ceph-maintainers@ceph.com>  Tue, 01 Aug 2017 17:55:37 +0000
+ 
 +ceph (12.1.1-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 261618b241b70f4f2f24ab3a52a974dcdd8e4163..aca86c4f987ae4ef56859b0510a108cffb0afb98 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 280abe4006f9ec451185f5c5da09d2cbe38cd31f Mon Sep 17 00:00:00 2001
+From c6af60a05ac7da38ad71d5f7a2093bde318b976d 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
@@ -15,7 +15,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  1 file changed, 5 deletions(-)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a764c490e4..ac7447fe21 100644
+index 5060b41bc2..5d57712a44 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -206,15 +206,10 @@ set(GCOV_PREFIX_STRIP 4)

diff --git a/patches/0003-enable-systemd-targets-by-default.patch b/patches/0003-enable-systemd-targets-by-default.patch
index 9bac4acffa3b8ae92b38d30775308cee8c4718da..24f85378cb512499ca304b891cc5cc1706c2ee8d 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 653efebdc16c1263d5835c5ae972f95a8ecf97f4 Mon Sep 17 00:00:00 2001
+From 57b17764b8c368efe32f1df5e3a5be7db86ae626 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