Add focal

diff --git a/Makefile b/Makefile
index 2d6eaffb2549f8ce9a7cfefe56b79c07c7951502..410058d1dcd5aeba37b36e67139242edd2be9762 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ OCVERSION := $(shell cd openconnect && git describe --tags | sed 's/-g[0-9a-f]\*
 PKGVERSION := $(shell echo $(OCVERSION) | sed  -e 's/$$/-0/' -e 's/v\([^-]\+-[^-]\+\)\(-g[0-9a-f-]\+\|\)/\1/')
 OCDATE += $(shell cd openconnect && git show -s --pretty=%aD)
 
 PKGVERSION := $(shell echo $(OCVERSION) | sed  -e 's/$$/-0/' -e 's/v\([^-]\+-[^-]\+\)\(-g[0-9a-f-]\+\|\)/\1/')
 OCDATE += $(shell cd openconnect && git show -s --pretty=%aD)
 

-ppa: xenial bionic
+ppa: bionic focal

 
 debian/libopenconnect5.symbols: gensyms.sh openconnect/openconnect.h openconnect/libopenconnect.map.in
        ./gensyms.sh > $@ || rm $@
 
 debian/libopenconnect5.symbols: gensyms.sh openconnect/openconnect.h openconnect/libopenconnect.map.in
        ./gensyms.sh > $@ || rm $@


@@ -20,14 +20,14 @@ cleandir: debian/libopenconnect5.symbols
        automake --foreign --add-missing --force --copy
        cp -av debian openconnect
 
        automake --foreign --add-missing --force --copy
        cp -av debian openconnect
 

-xenial bionic: cleandir
+xenial bionic focal: cleandir

        sed -e "s/PKGVER/$(PKGVERSION)/" -e "s/GITVER/$(OCVERSION)/" \
            -e "s/COMMITDATE/$(OCDATE)/" -e "s/DISTRO/$@/g" \
            -e "s/DISTREV/$(DISTREV)/" debian/changelog.in > openconnect/debian/changelog
        cd openconnect && DEBUILD_TGZ_CHECK=no debuild -S
        dput openconnect openconnect_$(PKGVERSION)-$@$(DISTREV)_source.changes
 
        sed -e "s/PKGVER/$(PKGVERSION)/" -e "s/GITVER/$(OCVERSION)/" \
            -e "s/COMMITDATE/$(OCDATE)/" -e "s/DISTRO/$@/g" \
            -e "s/DISTREV/$(DISTREV)/" debian/changelog.in > openconnect/debian/changelog
        cd openconnect && DEBUILD_TGZ_CHECK=no debuild -S
        dput openconnect openconnect_$(PKGVERSION)-$@$(DISTREV)_source.changes
 

-bionic-binary xenial-binary: cleandir
+bionic-binary xenial-binary focal-binary: cleandir

        sed -e "s/PKGVER/$(PKGVERSION)/" -e "s/GITVER/$(OCVERSION)/" \
            -e "s/COMMITDATE/$(OCDATE)/" -e "s/DISTRO/$(patsubst %-binary,%,$@)/g" \
            -e "s/DISTREV/$(DISTREV)/" debian/changelog.in > openconnect/debian/changelog
        sed -e "s/PKGVER/$(PKGVERSION)/" -e "s/GITVER/$(OCVERSION)/" \
            -e "s/COMMITDATE/$(OCDATE)/" -e "s/DISTRO/$(patsubst %-binary,%,$@)/g" \
            -e "s/DISTREV/$(DISTREV)/" debian/changelog.in > openconnect/debian/changelog