bump version to 12.2.1-pve1

diff --git a/Makefile b/Makefile
index 06b1e43bad5a41ce89eccf90495bbc4f5053d7bf..9ad762e527d0de59771bb3757166ab79aab42968 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=5.0
 
 PACKAGE=ceph
-VER=12.2.0
+VER=12.2.1
 DEBREL=pve1
 
 SRCDIR=ceph

diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch
index 968fdf6532c86e54ae9c6463e9d12811c1967882..377e39a123400a5f67c55eac6b3287407cf45b42 100644 (file)
--- a/patches/0001-update-changelog.patch
+++ b/patches/0001-update-changelog.patch
@@ -1,4 +1,4 @@
-From a035a93901ca31fb65c631058c204571237b2ac2 Mon Sep 17 00:00:00 2001
+From d2274dc3f5035a9d2bec3d99cd9ddaf7bd491671 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 | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 108 insertions(+)
+ debian/changelog | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 114 insertions(+)
 
 diff --git a/debian/changelog b/debian/changelog
-index 3fef34d2b7..2c92d9c4ab 100644
+index f052439176..ddc7b787d2 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,57 +1,165 @@
+@@ -1,63 +1,177 @@
++ceph (12.2.1-pve1) stable; urgency=medium
++
++  * rebase on latest upstream release
++
++ -- Proxmox Support Team <support@proxmox.com>  Fri, 29 Sep 2017 09:58:17 +0200
++
+ ceph (12.2.1-1) stable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Ceph Release Team <ceph-maintainers@ceph.com>  Tue, 26 Sep 2017 16:27:06 +0000
+ 
 +ceph (12.2.0-pve1) stable; urgency=medium
 +
 +  * rebase on latest upstream release
@@ -182,5 +194,5 @@ index 3fef34d2b7..2c92d9c4ab 100644
  
    * New upstream release
 -- 
-2.11.0
+2.14.1
 

diff --git a/patches/0002-cmake-disable-version-from-git.patch b/patches/0002-cmake-disable-version-from-git.patch
index f088a9de77b3a6cb9e5b6b41f2c1bdb4186ef92e..9bc2fa21edebe4bd16725c094ba27f1bfe1ae135 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 0b771a4d12392585eeaba96db4889ed79897cb22 Mon Sep 17 00:00:00 2001
+From 65811db5d26a76cd4f5eb62c0515d1a11d0b668c 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 915e10aa66..1ff1423a11 100644
+index 3cdcb95be4..747a090f96 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -206,15 +206,10 @@ set(GCOV_PREFIX_STRIP 4)
@@ -35,5 +35,5 @@ index 915e10aa66..1ff1423a11 100644
    string(SUBSTRING ${CEPH_GIT_NICE_VER} 1 -1 CEPH_GIT_NICE_VER)
  else(${ENABLE_GIT_VERSION})
 -- 
-2.11.0
+2.14.1
 

diff --git a/patches/0003-enable-systemd-targets-by-default.patch b/patches/0003-enable-systemd-targets-by-default.patch
index ef5e48ae28b38e2ba779bf1d5e5292cce2e0d29f..fef9d90ce0a8d06e14b806ee33db216da121b865 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 5efcf3ae8edf936208f9ee0b7b76615b2322cdda Mon Sep 17 00:00:00 2001
+From d582ef1c55087f9bb1be5d99f1238e865ac8be9e 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
@@ -26,5 +26,5 @@ index 92bc0b5877..782e4d4e87 100755
        # NOTE: execute systemd helpers so they pickup dh_install'ed units and targets
        dh_systemd_enable
 -- 
-2.11.0
+2.14.1