From 4917bd4ead20f3ebf54c4e025a856d0ba7509cf2 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 17 May 2023 15:49:08 +0200 Subject: [PATCH] bump proxmox-rs-perl to 0.3.0, pmg-rs to 0.7.0 Signed-off-by: Wolfgang Bumiller --- common/pkg/Makefile | 34 +++++++++++++++++++++++++++++----- common/pkg/debian/changelog | 6 ++++++ common/pkg/debian/compat | 1 - common/pkg/debian/control | 3 ++- pmg-rs/debian/changelog | 6 ++++++ 5 files changed, 43 insertions(+), 7 deletions(-) delete mode 100644 common/pkg/debian/compat diff --git a/common/pkg/Makefile b/common/pkg/Makefile index 88ab084..9d7a558 100644 --- a/common/pkg/Makefile +++ b/common/pkg/Makefile @@ -1,4 +1,4 @@ -include /usr/share/dpkg/default.mk +include /usr/share/dpkg/pkg-info.mk PACKAGE=libproxmox-rs-perl @@ -8,7 +8,9 @@ export GITVERSION:=$(shell git rev-parse HEAD) PERL_INSTALLVENDORARCH != perl -MConfig -e 'print $$Config{installvendorarch};' PERL_INSTALLVENDORLIB != perl -MConfig -e 'print $$Config{installvendorlib};' -DEB=${PACKAGE}_${DEB_VERSION}_${ARCH}.deb +DEB=$(PACKAGE)_$(DEB_VERSION)_$(ARCH).deb +DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc +BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM) DESTDIR= @@ -34,8 +36,30 @@ install: Proxmox/RS/CalendarEvent.pm find PVE \! -type d -print -exec install -Dm644 '{}' $(DESTDIR)$(PERL_INSTALLVENDORLIB)'/{}' ';' find Proxmox \! -type d -print -exec install -Dm644 '{}' $(DESTDIR)$(PERL_INSTALLVENDORLIB)'/{}' ';' +$(BUILDDIR): debian PVE Proxmox Makefile + rm -rf $(BUILDDIR) $(BUILDDIR).tmp + mkdir $(BUILDDIR).tmp + cp -t $(BUILDDIR).tmp -a debian PVE Proxmox Makefile + mv $(BUILDDIR).tmp $(BUILDDIR) + .PHONY: deb deb: $(DEB) -$(DEB): build - cd build; dpkg-buildpackage -b -us -uc --no-pre-clean - lintian $(DEBS) +$(DEB): $(BUILDDIR) + cd $(BUILDDIR); dpkg-buildpackage -b -us -uc --no-pre-clean + lintian $(DEB) + +.PHONY: dsc +dsc: $(DSC) +$(DSC): $(BUILDDIR) + cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d + lintian $(DSC) + +sbuild: $(DSC) + sbuild $(DSC) + +.PHONY: upload +upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION) +upload: $(DEB) + # check if working directory is clean + git diff --exit-code --stat && git diff --exit-code --stat --staged + tar cf - $(DEB) | ssh -X repoman@repo.proxmox.com upload --product pve,pmg --dist $(DEB_DISTRIBUTION) diff --git a/common/pkg/debian/changelog b/common/pkg/debian/changelog index 1593980..3089126 100644 --- a/common/pkg/debian/changelog +++ b/common/pkg/debian/changelog @@ -1,3 +1,9 @@ +libproxmox-rs-perl (0.3.0) bullseye; urgency=medium + + * rebuild for Debian 12 Bookworm based release series + + -- Proxmox Support Team Wed, 17 May 2023 15:48:41 +0200 + libproxmox-rs-perl (0.2.1) bullseye; urgency=medium * update to proxmox-subscription 0.3 / proxmox-http 0.7 diff --git a/common/pkg/debian/compat b/common/pkg/debian/compat deleted file mode 100644 index 48082f7..0000000 --- a/common/pkg/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/common/pkg/debian/control b/common/pkg/debian/control index ff819c0..cf15861 100644 --- a/common/pkg/debian/control +++ b/common/pkg/debian/control @@ -2,7 +2,8 @@ Source: libproxmox-rs-perl Section: perl Priority: optional Build-Depends: - debhelper (>= 12), + debhelper-compat (= 13), + perlmod-bin, Maintainer: Proxmox Support Team Standards-Version: 4.5.1 Vcs-Git: git://git.proxmox.com/git/proxmox-perl-rs.git diff --git a/pmg-rs/debian/changelog b/pmg-rs/debian/changelog index 90f61b1..f7fdf2b 100644 --- a/pmg-rs/debian/changelog +++ b/pmg-rs/debian/changelog @@ -1,3 +1,9 @@ +libpmg-rs-perl (0.7.0) bullseye; urgency=medium + + * rebuild for Debian 12 Bookworm based release series + + -- Proxmox Support Team Wed, 17 May 2023 15:48:43 +0200 + libpmg-rs-perl (0.6.2) bullseye; urgency=medium * update to proxmox-subscription 0.3 / proxmox-http 0.7 -- 2.39.2