proxmox-mirrors/ceph
1
0
Fork 0
mirror of https://git.proxmox.com/git/ceph.git synced 2025-05-01 19:07:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix Debian bug #582819, bump version to 12.1.0-pve2

Browse Source
This commit is contained in:
Dietmar Maurer 2017-07-03 14:05:07 +02:00
parent b86193922f
commit 330b5d17d6
4 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@ RELEASE=5.0
PACKAGE=ceph PACKAGE=ceph
VER=12.1.0 VER=12.1.0
DEBREL=pve1 DEBREL=pve2
SRCDIR=ceph SRCDIR=ceph
BUILDSRC=${SRCDIR}-${VER} BUILDSRC=${SRCDIR}-${VER}

21
patches/0001-update-changelog.patch
View File

@ -11,11 +11,19 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
debian/changelog | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 70 insertions(+) 1 file changed, 70 insertions(+)
diff --git a/debian/changelog b/debian/changelog Index: ceph-12.1.0/debian/changelog
index 9a6469c30c..d2c5a9b509 100644 ===================================================================
--- a/debian/changelog --- ceph-12.1.0.orig/debian/changelog
+++ b/debian/changelog +++ ceph-12.1.0/debian/changelog
@@ -1,27 +1,97 @@ @@ -1,27 +1,105 @@
+ceph (12.1.0-pve2) unstable; urgency=medium
+
+ * fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=582819
+
+ * add 0004-debian-workaround-the-bug-in-dpkg-maintscript-helper.patch
+
+ -- Proxmox Support Team <support@proxmox.com> Mon, 03 Jul 2017 14:03:31 +0200
+
+ceph (12.1.0-pve1) stable; urgency=medium +ceph (12.1.0-pve1) stable; urgency=medium
+ +
+ * rebase on latest upstream Release Candidate + * rebase on latest upstream Release Candidate
@ -113,6 +121,3 @@ index 9a6469c30c..d2c5a9b509 100644
ceph (12.0.0-1) stable; urgency=medium ceph (12.0.0-1) stable; urgency=medium
* New upstream release * New upstream release
--
2.11.0

23
patches/0004-debian-workaround-the-bug-in-dpkg-maintscript-helper.patch Normal file
View File

@ -0,0 +1,23 @@
From c90f0605b6b94579ef0273e63934d4691eb69f00 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Mon, 3 Jul 2017 16:51:21 +0800
Subject: [PATCH] debian: workaround the bug in dpkg-maintscript-helper
see https://bugs.launchpad.net/ubuntu/+source/snap-confine/+bug/1605052
and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=582819
Fixes: http://tracker.ceph.com/issues/20453
Signed-off-by: Kefu Chai <kchai@redhat.com>
---
debian/ceph-base.maintscript | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/ceph-base.maintscript b/debian/ceph-base.maintscript
index 38e36d454f87..9afaacbcae1c 100644
--- a/debian/ceph-base.maintscript
+++ b/debian/ceph-base.maintscript
@@ -1,2 +1,2 @@
-rm_conffile /etc/logrotate.d/ceph.logrotate -- "$@"
-rm_conffile /etc/logrotate.d/ceph -- "$@"
+rm_conffile /etc/logrotate.d/ceph.logrotate
+rm_conffile /etc/logrotate.d/ceph

1
patches/series
View File

@ -1,3 +1,4 @@
0001-update-changelog.patch 0001-update-changelog.patch
0002-cmake-disable-version-from-git.patch 0002-cmake-disable-version-from-git.patch
0003-enable-systemd-targets-by-default.patch 0003-enable-systemd-targets-by-default.patch
0004-debian-workaround-the-bug-in-dpkg-maintscript-helper.patch