From ce87d9bf4362dc6f3cc30adbdaf1ffba5e03e5d2 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Sun, 12 Jun 2022 12:44:05 +0200 Subject: [PATCH] Added specific control files for different Ubuntu versions --- packaging/Makefile | 5 +++-- packaging/debian/{control => control.bionic} | 5 ++--- packaging/debian/control.focal | 18 ++++++++++++++++++ packaging/debian/control.jammy | 18 ++++++++++++++++++ 4 files changed, 41 insertions(+), 5 deletions(-) rename packaging/debian/{control => control.bionic} (78%) create mode 100644 packaging/debian/control.focal create mode 100644 packaging/debian/control.jammy diff --git a/packaging/Makefile b/packaging/Makefile index a400e67d..e8269f6e 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -28,7 +28,7 @@ OS ?= ubuntu DIST ?= focal TAR_EXT ?= gz -build_dir = _BUILD/$(NAME)/$(OS)/$(DIST) +build_dir = _BUILD/$(OS)/$(DIST) VERSION ?= $(shell git describe --tags --always --abbrev=7) COMMIT ?= $(shell git rev-parse HEAD) @@ -57,7 +57,7 @@ deb: mkdir $(NAME)-$(VERSION) echo "Extracting source archive..." tar xf $(NAME)-$(VERSION).tar.$(TAR_EXT) -C $(NAME)-$(VERSION) --strip-components 1 - cp -R ../../../../debian $(NAME)-$(VERSION)/debian + cp -R ../../../debian $(NAME)-$(VERSION)/debian cd $(NAME)-$(VERSION) $(call subst_template_dir,DATETIME,$(shell date -R),debian) $(call subst_template_dir,OS,${OS},debian) @@ -68,6 +68,7 @@ deb: $(call subst_template_dir,MAINTAINER_NAME,${MAINTAINER_NAME},debian) $(call subst_template_dir,MAINTAINER_EMAIL,${MAINTAINER_EMAIL},debian) mk-origtargz ../$(NAME)-$(VERSION).tar.$(TAR_EXT) + cp debian/control.$(DIST) debian/control # BUILD SOURCE PACKAGE FOR LAUNCHPAD debuild -S -sa -us -d -k$(GPG_KEY) #--source-option=--include-binaries --source-option=--include-removal --source-option=-isession # BUILD LOCALLY BINARY PACKAGE diff --git a/packaging/debian/control b/packaging/debian/control.bionic similarity index 78% rename from packaging/debian/control rename to packaging/debian/control.bionic index 7191fe6b..63aa8d3b 100644 --- a/packaging/debian/control +++ b/packaging/debian/control.bionic @@ -2,7 +2,7 @@ Source: clang-uml Maintainer: Bartek Kryza Section: devel Priority: optional -Build-Depends: debhelper, make, gcc, g++, cmake, libyaml-cpp-dev, clang, libclang-dev, libclang-cpp-dev +Build-Depends: debhelper, make, gcc-8, g++-8, cmake, libyaml-cpp-dev, clang-10, libclang-10-dev, libclang-cpp10-dev Standards-Version: 4.3.0 Vcs-Browser: https://github.com/bkryza/clang-uml Vcs-Git: https://github.com/bkryza/clang-uml.git @@ -10,8 +10,7 @@ Homepage: https://github.com/bkryza/clang-uml Package: clang-uml Architecture: any -#Multi-Arch: same -Section: libs +Section: utils Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} Description: Automatic C++ UML diagram generator based on Clang. diff --git a/packaging/debian/control.focal b/packaging/debian/control.focal new file mode 100644 index 00000000..aaf0af76 --- /dev/null +++ b/packaging/debian/control.focal @@ -0,0 +1,18 @@ +Source: clang-uml +Maintainer: Bartek Kryza +Section: devel +Priority: optional +Build-Depends: debhelper, make, gcc-10, g++-10, cmake, libyaml-cpp-dev, clang-12, libclang-12-dev, libclang-cpp12-dev +Standards-Version: 4.3.0 +Vcs-Browser: https://github.com/bkryza/clang-uml +Vcs-Git: https://github.com/bkryza/clang-uml.git +Homepage: https://github.com/bkryza/clang-uml + +Package: clang-uml +Architecture: any +Section: utils +Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends} +Description: Automatic C++ UML diagram generator based on Clang. + . + This package provides the clang-uml binary. diff --git a/packaging/debian/control.jammy b/packaging/debian/control.jammy new file mode 100644 index 00000000..cf35fe46 --- /dev/null +++ b/packaging/debian/control.jammy @@ -0,0 +1,18 @@ +Source: clang-uml +Maintainer: Bartek Kryza +Section: devel +Priority: optional +Build-Depends: debhelper, make, gcc-12, g++-12, cmake, libyaml-cpp-dev, clang-14, libclang-14-dev, libclang-cpp14-dev +Standards-Version: 4.3.0 +Vcs-Browser: https://github.com/bkryza/clang-uml +Vcs-Git: https://github.com/bkryza/clang-uml.git +Homepage: https://github.com/bkryza/clang-uml + +Package: clang-uml +Architecture: any +Section: utils +Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends} +Description: Automatic C++ UML diagram generator based on Clang. + . + This package provides the clang-uml binary.