bump version to 12.1.3-pve1

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

diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch
index 6247509f394532962dedf50db8dcef4e1025a21b..942cad68b316b1782d95dc722decbff497b614d4 100644 (file)
--- a/patches/0001-update-changelog.patch
+++ b/patches/0001-update-changelog.patch
@@ -1,4 +1,4 @@
-From 24a448f97ae389d300159b43d4becf8f841e867f Mon Sep 17 00:00:00 2001
+From cb0ebf8735b92bc5303ebce3ed416c325f53ff9d 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 | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 90 insertions(+)
+ debian/changelog | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 96 insertions(+)
 
 diff --git a/debian/changelog b/debian/changelog
-index 25b6f5830b..35c5b08555 100644
+index 481ec56e4c..ee6db377e5 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,39 +1,129 @@
+@@ -1,45 +1,141 @@
++ceph (12.1.3-pve1) unstable; urgency=medium
++
++  * rebase on latest upstream Release Candidate
++
++ -- Proxmox Support Team <support@proxmox.com>  Mon, 14 Aug 2017 08:44:52 +0200
++
+ ceph (12.1.3-1) stable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Ceph Release Team <ceph-maintainers@ceph.com>  Thu, 10 Aug 2017 19:22:38 +0000
+ 
 +ceph (12.1.2-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 aca86c4f987ae4ef56859b0510a108cffb0afb98..b0b0eaf89ce1a70a1670c411c3ec7e645ddc5e05 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 c6af60a05ac7da38ad71d5f7a2093bde318b976d Mon Sep 17 00:00:00 2001
+From e0d06d15807235f999720b4e8ce0498ddaec4952 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 5060b41bc2..5d57712a44 100644
+index 915e10aa66..1ff1423a11 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 24f85378cb512499ca304b891cc5cc1706c2ee8d..265527133a82ad0c2e948fdea3be496749925bfd 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 57b17764b8c368efe32f1df5e3a5be7db86ae626 Mon Sep 17 00:00:00 2001
+From 93c5cd1df7d2c5eb7e0da3bda861a7c811f5a129 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
@@ -12,10 +12,10 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/debian/rules b/debian/rules
-index 2e4ec9d22a..64278d79d1 100755
+index 92bc0b5877..782e4d4e87 100755
 --- a/debian/rules
 +++ b/debian/rules
-@@ -130,6 +130,9 @@ override_dh_installinit:
+@@ -132,6 +132,9 @@ override_dh_installinit:
  
        dh_installinit -p ceph-base --name ceph --no-start
        dh_installinit -p radosgw --no-start