update to latest upstream (drop libnih, cgmanager)

diff --git a/Makefile b/Makefile
index 7075a68db80b8316bfbecb2264a4d0be418299bb..4f7345ec82ee5e31e9401a56a51550ee6b445802 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 RELEASE=4.0
 
 PACKAGE=lxcfs
 RELEASE=4.0
 
 PACKAGE=lxcfs

-PKGVER=0.10
-DEBREL=pve2
+PKGVER=0.11
+DEBREL=pve1

 
 SRCDIR=${PACKAGE}
 SRCTAR=${SRCDIR}.tgz
 
 SRCDIR=${PACKAGE}
 SRCTAR=${SRCDIR}.tgz

diff --git a/debian/changelog b/debian/changelog
index 95ce673fa52ff4da373deee5bd6b26ee036557ba..1499e55ef6660fd50d613851c15e9fa970519dea 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lxcfs (0.11-pve1) unstable; urgency=medium
+
+  * update to latest upstream (drop libnih, cgmanager)
+
+  * remove 0001-lxc-mount-hook-add-missing-space-before.patch (upstream)
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 10 Nov 2015 08:10:08 +0100
+

 lxcfs (0.10-pve2) unstable; urgency=medium
 
   * added lxc mount hook fixes
 lxcfs (0.10-pve2) unstable; urgency=medium
 
   * added lxc mount hook fixes

diff --git a/debian/control b/debian/control
index a0f6c5137ec2e914ca93b7a4df2f6428f9422528..3e7d27a1a014f54762c3d071800773fe633fa240 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: admin
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, help2man,
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, help2man,

-  pkg-config, libcgmanager-dev, libfuse-dev, dh-systemd
+  pkg-config, libfuse-dev, dh-systemd

 Standards-Version: 3.9.5
 Homepage: https://linuxcontainers.org
 
 Package: lxcfs
 Architecture: any
 Standards-Version: 3.9.5
 Homepage: https://linuxcontainers.org
 
 Package: lxcfs
 Architecture: any

-Depends: cgmanager, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}

 Description: LXC userspace filesystem
  LXCFS is a simple userspace filesystem designed to workaround some current
  limitations of the Linux kernel. The main driver for this work was the
 Description: LXC userspace filesystem
  LXCFS is a simple userspace filesystem designed to workaround some current
  limitations of the Linux kernel. The main driver for this work was the

diff --git a/debian/patches/0001-lxc-mount-hook-add-missing-space-before.patch b/debian/patches/0001-lxc-mount-hook-add-missing-space-before.patch
deleted file mode 100644 (file)
index fd01b94..0000000
--- a/debian/patches/0001-lxc-mount-hook-add-missing-space-before.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 05e1642e07216fad032d64abd52999d15a732bf4 Mon Sep 17 00:00:00 2001
-From: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Date: Wed, 21 Oct 2015 11:31:01 +0200
-Subject: [PATCH lxcfs 1/2] lxc mount hook: add missing space before ]
-
-Otherwise [ interprets the ] as part of the path and also
-errors about a missing ']'
----
- share/lxc.mount.hook.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/share/lxc.mount.hook.in b/share/lxc.mount.hook.in
-index 7194ab8..5ed2d60 100755
---- a/share/lxc.mount.hook.in
-+++ b/share/lxc.mount.hook.in
-@@ -30,7 +30,7 @@ if [ -d "${LXC_ROOTFS_MOUNT}/sys/fs/cgroup" ]; then
-                 continue
-             fi
- 
--          if [ ! -d ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/$DEST]; then
-+          if [ ! -d ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/$DEST ]; then
-                 mkdir ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/$DEST
-           fi
- 
--- 
-2.1.4
-

diff --git a/debian/patches/series b/debian/patches/series
index 12a4f79bd95766a45c3675f3645d8a28a977040e..bf650b42b1037ca3c7f99c19421c9e1728402554 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 do-not-start-without-lxcfs.patch
 do-not-start-without-lxcfs.patch

-0001-lxc-mount-hook-add-missing-space-before.patch

diff --git a/lxcfs.tgz b/lxcfs.tgz
index 047513b992076130085651f0d1f63d6ad3108acb..77bd0b456082d0b7aa89dc940f2c8e72ac4e04b5 100644 (file)
Binary files a/lxcfs.tgz and b/lxcfs.tgz differ