bump version to 2.0.7-pve4

diff --git a/Makefile b/Makefile
index f7cdb97ea3cd68b8c3bff40440049866ed9cffd6..13d8843f19ff5e0d9f81073abcb8b90ee2d9bc38 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PACKAGE=lxcfs
 PKGVER=2.0.7
-DEBREL=pve3
+DEBREL=pve4
 
 SRCDIR=${PACKAGE}
 SRCTAR=${SRCDIR}.tgz

diff --git a/debian/changelog b/debian/changelog
index 95a911ece5f00f4bde3e15cd0efc53b78715f7d5..acc5dd2ae991dc0bb7bdbb03f5333c52437ea6ae 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lxcfs (2.0.7-pve4) unstable; urgency=medium
+
+  * fix #1469: merged upstream fix for re-reads of /proc/uptime
+
+  * merged revert of virtualization of btime field in /proc/stat
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 04 Aug 2017 08:20:59 +0200
+
 lxcfs (2.0.7-pve3) unstable; urgency=medium
 
   * merged fix for process times from upstream

diff --git a/debian/patches/0001-bindings-calculate-uptime-via-proc-pid-stat.patch b/debian/patches/0001-bindings-calculate-uptime-via-proc-pid-stat.patch
index 242bd27302e48d0af002b98211e3f7d58cfd4566..b18a6614c279faf5a2039b91234e2954f2a4de12 100644 (file)
--- a/debian/patches/0001-bindings-calculate-uptime-via-proc-pid-stat.patch
+++ b/debian/patches/0001-bindings-calculate-uptime-via-proc-pid-stat.patch
@@ -1,7 +1,7 @@
 From c3d48d76499b8f18e747d068ea60b95875b3bb3d Mon Sep 17 00:00:00 2001
 From: Christian Brauner <christian.brauner@ubuntu.com>
 Date: Fri, 26 May 2017 05:06:30 +0200
-Subject: [PATCH lxcfs 1/2] bindings: calculate uptime via proc/<pid>/stat
+Subject: [PATCH lxcfs 1/4] bindings: calculate uptime via proc/<pid>/stat
 
 Closes #165.
 Closes #184.

diff --git a/debian/patches/0002-bindings-calculate-btime-correctly.patch b/debian/patches/0002-bindings-calculate-btime-correctly.patch
index 32817b0290482ef89e4cc2d4b2e8b5b2135a3d05..bdc627550ff688133733669b7b81779ba770e3c4 100644 (file)
--- a/debian/patches/0002-bindings-calculate-btime-correctly.patch
+++ b/debian/patches/0002-bindings-calculate-btime-correctly.patch
@@ -1,7 +1,7 @@
 From 869c054b01ef90545ad758f048bf670e3ef8d812 Mon Sep 17 00:00:00 2001
 From: Christian Brauner <christian.brauner@ubuntu.com>
 Date: Mon, 12 Jun 2017 14:45:44 +0200
-Subject: [PATCH lxcfs 2/2] bindings: calculate btime correctly
+Subject: [PATCH lxcfs 2/4] bindings: calculate btime correctly
 
 Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 ---