bump version to 2.0-32

[pve-firewall.git] / Makefile

diff --git a/Makefile b/Makefile
index 7180795f6f749d3ebce39bab2d3e08e064ea8bbe..ff687d2c1655dc67b5522c755f39906d91b99070 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
-RELEASE=3.3
-
-VERSION=1.0
-PKGREL=1
+VERSION=2.0
+PKGREL=32

 
 PACKAGE=pve-firewall
 
 
 PACKAGE=pve-firewall
 


@@ -13,7 +11,7 @@ DOCDIR=${PREFIX}/share/doc
 MAN1DIR=${MANDIR}/man1/
 PERLDIR=${PREFIX}/share/perl5
 
 MAN1DIR=${MANDIR}/man1/
 PERLDIR=${PREFIX}/share/perl5
 

-ARCH=all
+ARCH=amd64

 GITVERSION:=$(shell cat .git/refs/heads/master)
 
 DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
 DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb


@@ -26,7 +24,7 @@ dinstall: deb
 
 
 .PHONY: deb
 
 
 .PHONY: deb

-deb ${DEB}: 
+deb ${DEB}: check

        rm -rf build
        rsync -a src/ build
        rsync -a debian/ build/debian
        rm -rf build
        rsync -a src/ build
        rsync -a debian/ build/debian


@@ -35,9 +33,15 @@ deb ${DEB}:
        cd build; dpkg-buildpackage -rfakeroot -b -us -uc
        lintian ${DEB}
 
        cd build; dpkg-buildpackage -rfakeroot -b -us -uc
        lintian ${DEB}
 

+.PHONY: check
+check: 
+       make -C test check
+

 .PHONY: clean
 clean:         
 .PHONY: clean
 clean:         

-       rm -rf *~ */*~ *.deb *.changes build ${PACKAGE}-*.tar.gz
+       make -C src clean
+       make -C test clean
+       rm -rf *~ debian/*~ example/*~ *.deb *.changes build ${PACKAGE}-*.tar.gz

 
 .PHONY: distclean
 distclean: clean
 
 .PHONY: distclean
 distclean: clean


@@ -45,11 +49,4 @@ distclean: clean
 
 .PHONY: upload
 upload: ${DEB}
 
 .PHONY: upload
 upload: ${DEB}

-       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/Packages*
-       cp ${DEB} /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 - ${DEB} | ssh repoman@repo.proxmox.com upload