From 9439ae556f035e65c9c107ae13ddd09457dbbecd Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 19 Jul 2017 11:25:28 +0200 Subject: [PATCH] bump version to 12.1.1-pve1 while rebasing patches and drop those applied upstream --- patches/0001-update-changelog.patch | 31 ++++++++++++++----- .../0002-cmake-disable-version-from-git.patch | 4 +-- ...03-enable-systemd-targets-by-default.patch | 8 ++--- ...d-the-bug-in-dpkg-maintscript-helper.patch | 23 -------------- patches/series | 1 - 5 files changed, 29 insertions(+), 38 deletions(-) delete mode 100644 patches/0004-debian-workaround-the-bug-in-dpkg-maintscript-helper.patch diff --git a/patches/0001-update-changelog.patch b/patches/0001-update-changelog.patch index 1a36f1a39..02e471a9b 100644 --- a/patches/0001-update-changelog.patch +++ b/patches/0001-update-changelog.patch @@ -1,4 +1,4 @@ -From 50cf83b17ef2120b772ea786cb5e0fcf110eae62 Mon Sep 17 00:00:00 2001 +From 22c6c7657b2767dcd9cbe3b0c42b363f3c979a3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= 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 --- - debian/changelog | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 70 insertions(+) + debian/changelog | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 84 insertions(+) -Index: ceph-12.1.0/debian/changelog -=================================================================== ---- ceph-12.1.0.orig/debian/changelog -+++ ceph-12.1.0/debian/changelog -@@ -1,27 +1,105 @@ +diff --git a/debian/changelog b/debian/changelog +index 0da87edd48..9a029b1afe 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,33 +1,117 @@ ++ceph (12.1.1-pve1) unstable; urgency=medium ++ ++ * rebase on latest upstream Release Candidate ++ ++ -- Proxmox Support Team Wed, 19 Jul 2017 11:22:27 +0200 ++ + ceph (12.1.1-1) stable; urgency=medium + + * New upstream release + + -- Ceph Release Team Mon, 17 Jul 2017 16:55:59 +0000 + +ceph (12.1.0-pve2) unstable; urgency=medium + + * fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=582819 @@ -121,3 +133,6 @@ Index: ceph-12.1.0/debian/changelog ceph (12.0.0-1) stable; urgency=medium * New upstream release +-- +2.11.0 + diff --git a/patches/0002-cmake-disable-version-from-git.patch b/patches/0002-cmake-disable-version-from-git.patch index fe4809919..261618b24 100644 --- a/patches/0002-cmake-disable-version-from-git.patch +++ b/patches/0002-cmake-disable-version-from-git.patch @@ -1,4 +1,4 @@ -From d9c0b01ec77f4df864671d0ddbc6b3f73567afd6 Mon Sep 17 00:00:00 2001 +From 280abe4006f9ec451185f5c5da09d2cbe38cd31f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= 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 1 file changed, 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index aa08de7cea..21f97f58da 100644 +index a764c490e4..ac7447fe21 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 dadcf720f..9bac4acff 100644 --- a/patches/0003-enable-systemd-targets-by-default.patch +++ b/patches/0003-enable-systemd-targets-by-default.patch @@ -1,4 +1,4 @@ -From 4d22b47566842eac090bf9632b8763aca4218b85 Mon Sep 17 00:00:00 2001 +From 653efebdc16c1263d5835c5ae972f95a8ecf97f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 22 Mar 2017 09:00:34 +0100 Subject: [PATCH 3/3] enable systemd targets by default @@ -12,7 +12,7 @@ Signed-off-by: Fabian Grünbichler 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules -index d4b3c97f71..11ed7a177c 100755 +index 2e4ec9d22a..64278d79d1 100755 --- a/debian/rules +++ b/debian/rules @@ -130,6 +130,9 @@ override_dh_installinit: @@ -23,8 +23,8 @@ index d4b3c97f71..11ed7a177c 100755 + dh_systemd_enable -p ceph-mon ceph-mon.target + dh_systemd_enable -p ceph-osd ceph-osd.target - override_dh_systemd_start: - dh_systemd_start --no-restart-on-upgrade + # NOTE: execute systemd helpers so they pickup dh_install'ed units and targets + dh_systemd_enable -- 2.11.0 diff --git a/patches/0004-debian-workaround-the-bug-in-dpkg-maintscript-helper.patch b/patches/0004-debian-workaround-the-bug-in-dpkg-maintscript-helper.patch deleted file mode 100644 index c064ef2d5..000000000 --- a/patches/0004-debian-workaround-the-bug-in-dpkg-maintscript-helper.patch +++ /dev/null @@ -1,23 +0,0 @@ -From c90f0605b6b94579ef0273e63934d4691eb69f00 Mon Sep 17 00:00:00 2001 -From: Kefu Chai -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 ---- - 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 diff --git a/patches/series b/patches/series index 2bd4ed09a..27f742349 100644 --- a/patches/series +++ b/patches/series @@ -1,4 +1,3 @@ 0001-update-changelog.patch 0002-cmake-disable-version-from-git.patch 0003-enable-systemd-targets-by-default.patch -0004-debian-workaround-the-bug-in-dpkg-maintscript-helper.patch -- 2.39.2