From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Tue, 7 Feb 2017 12:48:16 +0000 (+0100)
Subject: upgrade to 2.10
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f254e41c935d9928c59e519bef72b0fb00bcfca5;p=criu.git

upgrade to 2.10

For stretch
---

diff --git a/Makefile b/Makefile
index 6b864e2..10b4008 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=4.0
 
 PACKAGE=criu
-PKGVER=1.6.0
+PKGVER=2.10
 DEBREL=1
 
 SRCDIR=criu
@@ -29,10 +29,10 @@ $(DEB1): $(SRCTAR)
 
 
 .PHONY: download
-download ${SRCTAR}:
-	rm -rf ${SRCDIR} ${SRCTAR} ${SRCTAR}.tmp
-	git clone https://github.com/xemul/${SRCDIR}
-	tar czf ${SRCTAR}.tmp ${SRCDIR}
+download:
+	rm -rf ${SRCDIR} ${SRCTAR}
+	git clone -b v$(PKGVER) git://github.com/xemul/$(PACKAGE).git
+	tar czf ${SRCTAR}.tmp --exclude=.git ${SRCDIR}
 	mv ${SRCTAR}.tmp ${SRCTAR}
 
 .PHONY: upload
diff --git a/criu.tgz b/criu.tgz
index e5159ac..3878294 100644
Binary files a/criu.tgz and b/criu.tgz differ
diff --git a/debian/changelog b/debian/changelog
index 3ee6864..d46cd85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+criu (2.10-1) unstable; urgency=medium
+
+  * update to version 2.10
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 07 Feb 2017 13:48:12 +0100
+
 criu (1.6.0-1) unstable; urgency=medium
 
   * update to latest upstream (commit 4a895813ae8bc6420fd1eec2455434fd0f7abf9b)
diff --git a/debian/criu.install b/debian/criu.install
deleted file mode 100644
index 93cce24..0000000
--- a/debian/criu.install
+++ /dev/null
@@ -1,9 +0,0 @@
-etc/logrotate.d/criu-service
-usr/bin/crit
-usr/sbin/criu
-usr/share/man/man8/criu.8
-usr/lib/systemd/system/criu.socket
-usr/lib/systemd/system/criu.service
-usr/lib/x86_64-linux-gnu
-usr/include/criu
-usr/lib/python2.7
diff --git a/debian/rules b/debian/rules
index c2630a2..8e6b56c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,13 @@
 
 # see FEATURE AREAS in dpkg-buildflags(1)
 export DEB_BUILD_MAINT_OPTIONS = hardening=-all
+export CFLAGS+=-fPIC
+export LDFLAGS=
+TMP=$(CURDIR)/debian/criu
 
 # main packaging script based on dh7 syntax
 %:
-	dh $@ --with python2
+	dh $@ --parallel --with python2
 
 
 override_dh_strip:
@@ -23,8 +26,5 @@ override_dh_install:
 	dh_install --exclude=.pyc --fail-missing
 
 override_dh_auto_install:
-	dh_auto_install -- PREFIX="/usr" LOGROTATEDIR="/etc/logrotate.d"
-
-
-
-
+	dh_auto_install -- DESTDIR="$(TMP)" PREFIX="/usr" LIBEXECDIR="/usr/lib"
+	find $(TMP)/usr/lib -type d -empty -delete