adapt Makefile for new packaging

[criu.git] / Makefile

diff --git a/Makefile b/Makefile
index ee6631a86b1175a30b2eb8628698252c972e1715..8fbf65c2ff7cd5a978c293e635411a3b0e2dee8f 100644 (file)
--- 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}
@@ -31,20 +32,13 @@ $(DEB1): $(SRCTAR)
 .PHONY: download
 download:
        rm -rf ${SRCDIR} ${SRCTAR}
-       git clone -b v$(PKGVER) git://github.com/xemul/$(PACKAGE).git
+       git clone -b debian/2.11.1-1 https://anonscm.debian.org/git/collab-maint/criu.git ${SRCDIR}
        tar czf ${SRCTAR}.tmp --exclude=.git ${SRCDIR}
        mv ${SRCTAR}.tmp ${SRCTAR}
 
 .PHONY: upload
 upload: ${DEBS}
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-       mkdir -p /pve/${RELEASE}/extra
-       rm -f /pve/${RELEASE}/extra/${PACKAGE}_*.deb
-       rm -f /pve/${RELEASE}/extra/${PACKAGE}-dbg_*.deb
-       rm -f /pve/${RELEASE}/extra/Packages*
-       cp ${DEBS} /pve/${RELEASE}/extra
-       cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+       tar cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}
 
 distclean: clean