buildsys: use dpkg-dev makefile helpers for pkg info

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index fba83b4841b4137914ab83a2e34a941fef1a376b..9bf873452c999f06f6b97144b4872a81b6bc2ff0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,15 @@
-RELEASE=5.0
+include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/architecture.mk
 
 PACKAGE=criu
-PKGVER=3.11
-DEBREL=2~bpo90
 
 SRCDIR=criu
 SRCTAR=${SRCDIR}.tgz
 
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
-DEB1=${PACKAGE}_${PKGVER}-${DEBREL}_$(ARCH).deb
-DEB_DBG=${PACKAGE}-dbgsym_${PKGVER}-${DEBREL}_$(ARCH).deb
+DEB1=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
+DEB_DBG=${PACKAGE}-dbgsym_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
 DEBS=$(DEB1) $(DEB_DBG)
 
 all: ${DEBS}
@@ -23,7 +21,7 @@ $(DEB1): $(SRCTAR)
        rm -rf ${SRCDIR}
        tar xf ${SRCTAR}
        mv ${SRCDIR}/debian/changelog ${SRCDIR}/debian/changelog.org
-       cat changelog.Debian ${SRCDIR}/debian/changelog.org > ${SRCDIR}/debian/changelog
+       cat debian/changelog ${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 -b -us -uc
        lintian ${DEBS}
@@ -38,13 +36,13 @@ download:
 
 .PHONY: upload
 upload: ${DEBS}
-       tar cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}
+       tar cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${DEB_BUILD_ARCH}
 
 distclean: clean
 
 .PHONY: clean
 clean:
-       rm -rf ${SRCDIR} ${SRCDIR}.tmp *_${ARCH}.deb *.changes *.dsc *.buildinfo
+       rm -rf ${SRCDIR} ${SRCDIR}.tmp *_${DEB_BUILD_ARCH}.deb *.changes *.dsc *.buildinfo
        find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall

diff --git a/changelog.Debian b/changelog.Debian
deleted file mode 100644 (file)
index cbcee68..0000000
--- a/changelog.Debian
+++ /dev/null
@@ -1,29 +0,0 @@
-criu (3.11-2~bpo90) unstable; urgency=medium
-
-  * build 3.11-2 for Debian Buster
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 21 Mar 2019 10:27:42 +0100
-
-criu (2.11.1-1~bpo90) unstable; urgency=medium
-
-  * rebuild 2.11.1-1 for Debian Stretch
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 12:27:42 +0100
-
-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)
-
- -- 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
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 07 May 2015 11:47:29 +0200

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..cbcee68
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,29 @@
+criu (3.11-2~bpo90) unstable; urgency=medium
+
+  * build 3.11-2 for Debian Buster
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 21 Mar 2019 10:27:42 +0100
+
+criu (2.11.1-1~bpo90) unstable; urgency=medium
+
+  * rebuild 2.11.1-1 for Debian Stretch
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 10 Mar 2017 12:27:42 +0100
+
+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)
+
+ -- 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
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 07 May 2015 11:47:29 +0200