update to latest upstream (commit 4a895813ae8bc6420fd1eec2455434fd0f7abf9b)

diff --git a/Makefile b/Makefile
index eef1d1b76c3e8f4c50174b36db43ba7a2a9c83e8..3966bdc1a3f7703dd8623f2bbfac51798f3c0b18 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=4.0
 
 PACKAGE=criu
-PKGVER=1.5.2
+PKGVER=1.6.0
 DEBREL=1
 
 SRCDIR=criu
@@ -32,6 +32,7 @@ download ${SRCTAR}:
        git clone https://github.com/xemul/${SRCDIR}
        tar czf ${SRCTAR}.tmp ${SRCDIR}
        mv ${SRCTAR}.tmp ${SRCTAR}
+
 .PHONY: upload
 upload: ${DEBS}
        umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 

diff --git a/criu.tgz b/criu.tgz
index 77b752341fbae2cfe05ee28337e98c26a8b411be..e5159ac7e04bcfa332be99c7331c1688e5c8b5d3 100644 (file)
Binary files a/criu.tgz and b/criu.tgz differ

diff --git a/debian/changelog b/debian/changelog
index 8143d2af80c60b5fbae13bf1345f937aeeb7c0b2..3ee6864b1f17e7a13d78eeb82f84a4bdd64df043 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+criu (1.6.0-1) unstable; urgency=medium
+
+  * update to latest upstream (commit 4a895813ae8bc6420fd1eec2455434fd0f7abf9b)
+
+ -- Proxmox Support Team <support@proxmox.com>  Sun, 09 Aug 2015 11:54:21 +0200
+
 criu (1.5.2-1) unstable; urgency=low
 
   * Initial release for Proxmox VE

diff --git a/debian/criu.install b/debian/criu.install
index ad9803cc8993b0ae680002f71a0229e80d985c4e..93cce241c0fb335e10f01707945fbaea70461471 100644 (file)
--- a/debian/criu.install
+++ b/debian/criu.install
@@ -1,5 +1,5 @@
 etc/logrotate.d/criu-service
-bin/crit
+usr/bin/crit
 usr/sbin/criu
 usr/share/man/man8/criu.8
 usr/lib/systemd/system/criu.socket

diff --git a/debian/docs b/debian/docs
index 70f2e10fa81cfcc345aa79c9f5df7d126ff85fe4..72cc509df89f7b87bbd8be57e3e75ea726633c24 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
-README
 debian/SOURCE
\ No newline at end of file

diff --git a/debian/rules b/debian/rules
index 5f54435c4b3d5a7cde46df28cc21d9edfe88211a..c2630a2ff47f53447cee6d8e79f563d5c32c6b95 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,8 +25,6 @@ override_dh_install:
 override_dh_auto_install:
        dh_auto_install -- PREFIX="/usr" LOGROTATEDIR="/etc/logrotate.d"
 
-       mv $(CURDIR)/debian/tmp/lib/python2.7 $(CURDIR)/debian/tmp/usr/lib/
-