rebase patches on v12.0.1

diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch
index fcb99e0b9355b47407435c5f50ff82392bc4bc83..59281507055af757d7510b7d49b214bf27d5c13c 100644 (file)
--- a/patches/0001-update-changelog.patch
+++ b/patches/0001-update-changelog.patch
@@ -12,10 +12,13 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  1 file changed, 24 insertions(+)
 
 diff --git a/debian/changelog b/debian/changelog
-index a726c2d..4f1436b 100644
+index e7ab154..52ec3a9 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,3 +1,27 @@
+@@ -4,6 +4,30 @@ ceph (12.0.1-1) stable; urgency=medium
+ 
+  -- Ceph Release Team <ceph-maintainers@ceph.com>  Fri, 24 Mar 2017 15:47:57 +0000
+ 
 +ceph (12.0.0-pve3) stable; urgency=medium
 +
 +  * make ceph version output even more explicit

diff --git a/patches/0003-ceph-detect-init-support-Debian-Stretch.patch b/patches/0003-ceph-detect-init-support-Debian-Stretch.patch
index d89a501a82502e44bb1733bb17275106d3561169..e41f5a16935107a9ed6dd8c00214d5a34d044326 100644 (file)
--- a/patches/0003-ceph-detect-init-support-Debian-Stretch.patch
+++ b/patches/0003-ceph-detect-init-support-Debian-Stretch.patch
@@ -12,12 +12,12 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/src/ceph-detect-init/ceph_detect_init/__init__.py b/src/ceph-detect-init/ceph_detect_init/__init__.py
-index b431616..d03d8db 100644
+index 9abc421..a7f7beb 100644
 --- a/src/ceph-detect-init/ceph_detect_init/__init__.py
 +++ b/src/ceph-detect-init/ceph_detect_init/__init__.py
-@@ -113,6 +113,7 @@ def platform_information():
+@@ -139,6 +139,7 @@ def platform_information():
      # this could be an empty string in Debian
-     if not codename and 'debian' in distro.lower():
+     if not codename and 'debian' in distro_lower:
          debian_codenames = {
 +            '9': 'stretch',
              '8': 'jessie',