upgrade to 2.10

For stretch

diff --git a/Makefile b/Makefile
index 6b864e259b8f975c9d2be20f3923aedb56f02176..10b4008b0d8c7ad19cd1121227d215c63db816d9 100644 (file)
--- 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 e5159ac7e04bcfa332be99c7331c1688e5c8b5d3..38782945fdda1e6637c6b2b68507a1aacdab50e7 100644 (file)
Binary files a/criu.tgz and b/criu.tgz differ

diff --git a/debian/changelog b/debian/changelog
index 3ee6864b1f17e7a13d78eeb82f84a4bdd64df043..d46cd852994699eb1b7a1d725b52eff98a30dfe9 100644 (file)
--- 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 (file)
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 c2630a2ff47f53447cee6d8e79f563d5c32c6b95..8e6b56c24af7e47403e3ce324ce407affbb432a0 100755 (executable)
--- 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