bump proxmox-rs-perl to 0.3.0, pmg-rs to 0.7.0

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/common/pkg/Makefile b/common/pkg/Makefile
index 88ab0849346f22a30a6f5969848377b8507d34b6..9d7a5581d645a1c3bf0e76ca19a8f5e648367f5c 100644 (file)
--- 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 1593980bfae801280f40a1f35ea762a0df8f47e5..308912600dc99e947be8feb656892850e513a35e 100644 (file)
--- 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 <support@proxmox.com>  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 (file)
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 ff819c0d31bf6ec693932363f004ebb345e58388..cf158614a7f0058eaa4091acf656dc16afecb90f 100644 (file)
--- 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 <support@proxmox.com>
 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 90f61b1cea00ab2105b7a54d097712cfe0101d25..f7fdf2b1535acaef2adf7f5da931fb342e825087 100644 (file)
--- 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 <support@proxmox.com>  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