From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Fri, 4 Aug 2017 06:21:50 +0000 (+0200)
Subject: bump version to 2.0.7-pve4
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=648fbbfdd5edcbcc36cca6d125b709e44e4e8c6c;p=lxcfs.git

bump version to 2.0.7-pve4
---

diff --git a/Makefile b/Makefile
index f7cdb97..13d8843 100644
--- 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 95a911e..acc5dd2 100644
--- 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 242bd27..b18a661 100644
--- 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 32817b0..bdc6275 100644
--- 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>
 ---