[pve-devel] [PATCH criu 4/6] adapt Makefile for new packaging

Fri Mar 10 12:30:09 CET 2017

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
 changelog.Debian | 17 +++++++++++++++++
 Makefile         |  5 +++--
 debian/changelog | 17 -----------------
 debian/compat    |  1 -
 debian/control   | 43 -------------------------------------------
 debian/copyright | 26 --------------------------
 debian/docs      |  1 -
 debian/rules     | 30 ------------------------------
 8 files changed, 20 insertions(+), 120 deletions(-)
 create mode 100644 changelog.Debian
 delete mode 100644 debian/changelog
 delete mode 100644 debian/compat
 delete mode 100644 debian/control
 delete mode 100644 debian/copyright
 delete mode 100644 debian/docs
 delete mode 100755 debian/rules

diff --git a/changelog.Debian b/changelog.Debian
new file mode 100644
index 0000000..d46cd85
--- /dev/null
+++ b/changelog.Debian
@@ -0,0 +1,17 @@
+criu (2.10-1) unstable; urgency=medium
+
+  * update to version 2.10
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 07 Feb 2017 13:48:12 +0100
+
+criu (1.6.0-1) unstable; urgency=medium
+
+  * update to latest upstream (commit 4a895813ae8bc6420fd1eec2455434fd0f7abf9b)
+
+ -- Proxmox Support Team <support at proxmox.com>  Sun, 09 Aug 2015 11:54:21 +0200
+
+criu (1.5.2-1) unstable; urgency=low
+
+  * Initial release for Proxmox VE
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 07 May 2015 11:47:29 +0200
diff --git a/Makefile b/Makefile
index 929415a..8fbf65c 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
 DEB1=${PACKAGE}_${PKGVER}-${DEBREL}_$(ARCH).deb
-DEB_DBG=${PACKAGE}-dbg_${PKGVER}-${DEBREL}_$(ARCH).deb
+DEB_DBG=${PACKAGE}-dbgsym_${PKGVER}-${DEBREL}_$(ARCH).deb
 DEBS=$(DEB1) $(DEB_DBG)
 
 all: ${DEBS}
@@ -22,7 +22,8 @@ deb $(DEB_DBG): $(DEB1)
 $(DEB1): $(SRCTAR)
 	rm -rf ${SRCDIR}
 	tar xf ${SRCTAR}
-	cp -a debian ${SRCDIR}/debian
+	mv ${SRCDIR}/debian/changelog ${SRCDIR}/debian/changelog.org
+	cat changelog.Debian ${SRCDIR}/debian/changelog.org > ${SRCDIR}/debian/changelog
 	echo "git clone git://git.proxmox.com/git/criu.git\\ngit checkout ${GITVERSION}" >  ${SRCDIR}/debian/SOURCE
 	cd ${SRCDIR}; dpkg-buildpackage -rfakeroot -b -us -uc
 	lintian ${DEBS}
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index d46cd85..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,17 +0,0 @@
-criu (2.10-1) unstable; urgency=medium
-
-  * update to version 2.10
-
- -- Proxmox Support Team <support at proxmox.com>  Tue, 07 Feb 2017 13:48:12 +0100
-
-criu (1.6.0-1) unstable; urgency=medium
-
-  * update to latest upstream (commit 4a895813ae8bc6420fd1eec2455434fd0f7abf9b)
-
- -- Proxmox Support Team <support at proxmox.com>  Sun, 09 Aug 2015 11:54:21 +0200
-
-criu (1.5.2-1) unstable; urgency=low
-
-  * Initial release for Proxmox VE
-
- -- Proxmox Support Team <support at proxmox.com>  Thu, 07 May 2015 11:47:29 +0200
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 0756bba..0000000
--- a/debian/control
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: criu
-Section: admin
-Priority: optional
-Maintainer: Proxmox Support Team <support at proxmox.com>
-Build-Depends:
- debhelper (>= 9),
- dh-python,
- libnl-3-dev,
- libnet1-dev,
- libcap-dev,
- libprotobuf-dev,
- libprotobuf-c-dev,
- protobuf-c-compiler,
- protobuf-compiler,
- asciidoc
-Standards-Version: 3.9.5
-Homepage: http://www.criu.org/
-
-Package: criu
-Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-ipaddr, python-protobuf
-Description: An utility to checkpoint and restore tasks
- An utility to checkpoint/restore tasks. Using this tool, you can
- freeze a running application (or part of it) and checkpoint it to
- a hard drive as a collection of files. You can then use the files
- to restore and run the application from the point it was frozen
- at. The distinctive feature of the CRIU project is that it is
- mainly implemented in user space.
-
-Package: criu-dbg
-Architecture: amd64
-Section: debug
-Priority: extra
-Depends: criu (= ${binary:Version}), ${misc:Depends}
-Description: An utility to checkpoint and restore tasks (debug)
- An utility to checkpoint/restore tasks. Using this tool, you can
- freeze a running application (or part of it) and checkpoint it to
- a hard drive as a collection of files. You can then use the files
- to restore and run the application from the point it was frozen
- at. The distinctive feature of the CRIU project is that it is
- mainly implemented in user space.
- .
- This package contains the debugging symbols.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 442729b..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,26 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: criu
-Source: https://github.com/xemul/criu
-
-Files: *
-Copyright: 2011-2015, Parallels Inc.
-License: GPL-2
-
-Files: debian/*
-Copyright: 2015 Proxmox Server Solutions
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 72cc509..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/SOURCE
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 8e6b56c..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#DH_VERBOSE = 1
-
-# 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 $@ --parallel --with python2
-
-
-override_dh_strip:
-	dh_strip --dbg-package=criu-dbg
-
-
-override_dh_auto_test:
-	# this fails - disable and ignore for now
-
-override_dh_install:
-	#dh_install --exclude=.pyc --fail-missing
-	dh_install --exclude=.pyc --fail-missing
-
-override_dh_auto_install:
-	dh_auto_install -- DESTDIR="$(TMP)" PREFIX="/usr" LIBEXECDIR="/usr/lib"
-	find $(TMP)/usr/lib -type d -empty -delete
-- 
2.1.4



