bump pmg-rs to 0.6.3

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
bump pve-rs to 0.7.7
2023-06-09 11:36:23 +02:00 · 2023-06-09 11:31:10 +02:00 · 2023-06-09 11:29:59 +02:00 · 2023-06-09 11:28:48 +02:00 · 2023-06-09 11:28:48 +02:00 · 2023-06-09 11:28:48 +02:00
15 changed files with 187 additions and 182 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,45 +0,0 @@
-[workspace]
-exclude = [ "build", "common-src", "perl", "scripts" ]
-members = [
-    "pve-rs",
-    "pmg-rs",
-]
-
-[workspace.package]
-authors = ["Proxmox Support Team <support@proxmox.com>"]
-edition = "2021"
-license = "AGPL-3"
-repository = "https://git.proxmox.com/?p=proxmox.git"
-
-[workspace.dependencies]
-anyhow = "1.0"
-base32 = "0.4"
-base64 = "0.13"
-env_logger = "0.9"
-hex = "0.4"
-http = "0.2.7"
-libc = "0.2"
-nix = "0.26"
-openssl = "0.10.40"
-serde = "1.0"
-serde_bytes = "0.11"
-serde_json = "1.0"
-url = "2"
-
-perlmod = { version = "0.13", features = [ "exporter" ] }
-
-proxmox-acme-rs = { version = "0.4", features = ["client"] }
-proxmox-apt = "0.9"
-proxmox-http = { version = "0.8", features = ["client-sync", "client-trait"] }
-proxmox-openid = "0.9.8"
-proxmox-resource-scheduling = "0.2.1"
-proxmox-subscription = "0.3"
-proxmox-sys = "0.4.2"
-proxmox-tfa = { version = "4", features = ["api"] }
-proxmox-time = "1.1.3"
-
-[patch.crates-io]
-# proxmox-tfa requires -time and -uuid as well, so enable *all* or *none* of them
-#proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
-#proxmox-time = { path = "../proxmox/proxmox-time" }
-#proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
--- a/51
+++ b/51
@ -2,19 +2,9 @@ CARGO ?= cargo

 ifeq ($(BUILD_MODE), release)
 CARGO_BUILD_ARGS += --release
-DEBUG_LIBPATH :=
 else
-DEBUG_LIBPATH := "-L./target/debug", 
 endif

-define upload_template
-	cd build; \
-	    dcmd --deb lib$(1)-rs-perl*.changes \
-	    | grep -v '.changes$$' \
-	    | tar -cf "$@.tar" -T-; \
-	    cat "$@.tar" | ssh -X repoman@repo.proxmox.com upload --product $(2) --dist bullseye
-endef
-
 .PHONY: all
 all:
 ifeq ($(BUILD_TARGET), pve)
@ -27,10 +17,6 @@ else
 	@echo "  - make pmg"
 endif

-.PHONY: pve pmg
-pve pmg:
-	$(CARGO) build $(CARGO_BUILD_ARGS) -p $@-rs
-
 build:
 	rm -rf build
 	mkdir build
@ -47,30 +33,13 @@ build:
 	done
 # So the common packages end up in ./build, rather than ./build/common
 	mv ./build/common/pkg ./build/common-pkg
-
-pve-deb: build
-	cd ./build/pve-rs && dpkg-buildpackage -b -uc -us
-	touch $@
-
-pmg-deb: build
-	cd ./build/pmg-rs && dpkg-buildpackage -b -uc -us
-	touch $@
-
-common-deb: build
-	cd ./build/common-pkg && dpkg-buildpackage -b -uc -us
-	touch $@
-
-pve-upload: pve-deb
-	$(call upload_template,pve,pve)
-pmg-upload: pmg-deb
-	$(call upload_template,pmg,pmg)
-
-# need to put into variable to ensure comma isn't interpreted as param separator on call
-common_target=pve,pmg
-common-upload: common-deb
-	$(call upload_template,proxmox,$(common_target))
-
-.PHONY: clean
-clean:
-	cargo clean
-	rm -rf ./build ./PVE ./PMG ./pve-deb ./pmg-deb ./common-deb
+# Copy the workspace root into the sources
+	mkdir build/pve-rs/.workspace
+	cp -t build/pve-rs/.workspace Cargo.toml
+	sed -i -e '/\[package\]/a\workspace = ".workspace"' build/pve-rs/Cargo.toml
+# Clear the member array and replace it with ".."
+	sed -i -e '/^members = \[/,/^]$$/d' build/pve-rs/.workspace/Cargo.toml
+	sed -i -e '/^\[workspace\]/a\members = [ ".." ]' build/pve-rs/.workspace/Cargo.toml
+# Copy the cargo config
+	mkdir build/pve-rs/.cargo
+	cp -t build/pve-rs/.cargo .cargo/config
--- 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,34 @@ 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)
+
+clean:
+	rm -f *.deb *.dsc *.tar.* *.build *.buildinfo *.changes
+	rm -rf $(PACKAGE)-[0-9]*/
--- a/common/pkg/debian/control
+++ b/common/pkg/debian/control
@ -3,6 +3,7 @@ Section: perl
 Priority: optional
 Build-Depends:
 debhelper (>= 12),
+ 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
--- a/pmg-rs/.cargo/config
+++ b/pmg-rs/.cargo/config
--- a/pmg-rs/Cargo.toml
+++ b/pmg-rs/Cargo.toml
@ -1,11 +1,12 @@
 [package]
 name = "pmg-rs"
-version = "0.6.2"
+version = "0.6.3"
 description = "PMG parts which have been ported to rust"
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-repository.workspace = true
+homepage = "https://www.proxmox.com"
+authors = ["Proxmox Support Team <support@proxmox.com>"]
+edition = "2021"
+license = "AGPL-3"
+repository = "https://git.proxmox.com/?p=proxmox.git"

 exclude = [
    "build",
@ -17,24 +18,24 @@ exclude = [
 crate-type = [ "cdylib" ]

 [dependencies]
-anyhow.workspace = true
-env_logger.workspace = true
-hex.workspace = true
-http.workspace = true
-libc.workspace = true
-nix.workspace = true
-openssl.workspace = true
-serde.workspace = true
-serde_bytes.workspace = true
-serde_json.workspace = true
-url.workspace = true
+anyhow = "1.0"
+env_logger = "0.9"
+hex = "0.4"
+http = "0.2.7"
+libc = "0.2"
+nix = "0.26"
+openssl = "0.10.40"
+serde = "1.0"
+serde_bytes = "0.11"
+serde_json = "1.0"
+url = "2"

-perlmod.workspace = true
+perlmod = { version = "0.13", features = [ "exporter" ] }

-proxmox-acme-rs.workspace = true
-proxmox-apt.workspace = true
-proxmox-http.workspace = true
-proxmox-subscription.workspace = true
-proxmox-sys.workspace = true
-proxmox-tfa.workspace = true
-proxmox-time.workspace = true
+proxmox-acme-rs = { version = "0.4", features = ["client"] }
+proxmox-apt = "0.9.4"
+proxmox-http = { version = "0.8", features = ["client-sync", "client-trait"] }
+proxmox-subscription = "0.3"
+proxmox-sys = "0.4.2"
+proxmox-tfa = { version = "4", features = ["api"] }
+proxmox-time = "1.1.3"
--- a/pmg-rs/Makefile
+++ b/pmg-rs/Makefile
@ -1,4 +1,4 @@
-include /usr/share/dpkg/default.mk
+include /usr/share/dpkg/pkg-info.mk

 PACKAGE=libpmg-rs-perl

@ -8,9 +8,11 @@ export GITVERSION:=$(shell git rev-parse HEAD)
 PERL_INSTALLVENDORARCH != perl -MConfig -e 'print $$Config{installvendorarch};'
 PERL_INSTALLVENDORLIB != perl -MConfig -e 'print $$Config{installvendorlib};'

-MAIN_DEB=${PACKAGE}_${DEB_VERSION}_${ARCH}.deb
-DBGSYM_DEB=${PACKAGE}-dbgsym_${DEB_VERSION}_${ARCH}.deb
+MAIN_DEB=$(PACKAGE)_$(DEB_VERSION)_$(ARCH).deb
+DBGSYM_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION)_$(ARCH).deb
 DEBS=$(MAIN_DEB) $(DBGSYM_DEB)
+DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
+BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)

 DESTDIR=

@ -36,37 +38,58 @@ else
 TARGET_DIR=debug
 endif

-all:
-ifneq ($(BUILD_MODE), skip)
+all: PMG
 	cargo build $(CARGO_BUILD_ARGS)
-endif

 PMG: Proxmox/Lib/PMG.pm
 Proxmox/Lib/PMG.pm:
 	$(PERLMOD_GENPACKAGE) $(PERLMOD_PACKAGES)

 .PHONY: install
-install: ../target/release/libpmg_rs.so Proxmox/Lib/PMG.pm PMG
+install: target/release/libpmg_rs.so Proxmox/Lib/PMG.pm PMG
 	install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORARCH)/auto
-	install -m644 ../target/release/libpmg_rs.so $(DESTDIR)$(PERL_INSTALLVENDORARCH)/auto/libpmg_rs.so
+	install -m644 target/release/libpmg_rs.so $(DESTDIR)$(PERL_INSTALLVENDORARCH)/auto/libpmg_rs.so
 	install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB)
 	install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB)/Proxmox/Lib
 	install -m644 Proxmox/Lib/PMG.pm $(DESTDIR)$(PERL_INSTALLVENDORLIB)/Proxmox/Lib/PMG.pm
 	find $(PM_DIR) \! -type d -print -exec install -Dm644 '{}' $(DESTDIR)$(PERL_INSTALLVENDORLIB)'/{}' ';'

 distclean: clean
-
 clean:
 	cargo clean
-	rm -rf *.deb *.dsc *.tar.gz *.buildinfo *.changes Cargo.lock
-	find . -name '*~' -exec rm {} ';'
+	rm -f *.deb *.dsc *.tar.* *.build *.buildinfo *.changes Cargo.lock
+	rm -rf $(PACKAGE)-[0-9]*/

 .PHONY: dinstall
-dinstall: ${DEBS}
-	dpkg -i ${DEBS}
+dinstall: $(DEBS)
+	dpkg -i $(DEBS)

 .PHONY: upload
-upload: ${DEBS}
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
+upload: $(DEBS)
 	# check if working directory is clean
 	git diff --exit-code --stat && git diff --exit-code --stat --staged
-	tar cf - ${DEBS} | ssh -X repoman@repo.proxmox.com upload --product pmg --dist bullseye
+	tar cf - $(DEBS) | ssh -X repoman@repo.proxmox.com upload --product pmg --dist $(DEB_DISTRIBUTION)
+
+$(BUILDDIR): src debian common/src Cargo.toml Makefile .cargo/config
+	rm -rf $(BUILDDIR) $(BUILDDIR).tmp
+	mkdir $(BUILDDIR).tmp
+	mkdir $(BUILDDIR).tmp/common
+	cp -a -t $(BUILDDIR).tmp src debian Cargo.toml Makefile .cargo
+	cp -a -t $(BUILDDIR).tmp/common common/src
+	mv $(BUILDDIR).tmp $(BUILDDIR)
+
+.PHONY: deb
+deb: $(DEBS)
+$(DEBS): $(BUILDDIR)
+	cd $(BUILDDIR); PATH="/usr/local/bin:/usr/bin" dpkg-buildpackage -b -us -uc
+	lintian $(DEBS)
+
+.PHONY: dsc
+dsc: $(DSC)
+$(DSC): $(BUILDDIR)
+	cd $(BUILDDIR); PATH="/usr/local/bin:/usr/bin" dpkg-buildpackage -S -us -uc -d
+	lintian $(DSC)
+
+sbuild: $(DSC)
+	sbuild $(DSC)
--- a/pmg-rs/debian/changelog
+++ b/pmg-rs/debian/changelog
@ -1,3 +1,10 @@
+libpmg-rs-perl (0.6.3) bullseye; urgency=medium
+
+  * build with proxmox-apt 0.9.4 to also detect repository with next suite as
+    configured
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Jun 2023 11:36:12 +0200
+
 libpmg-rs-perl (0.6.2) bullseye; urgency=medium

  * update to proxmox-subscription 0.3 / proxmox-http 0.7
--- a/pmg-rs/debian/control
+++ b/pmg-rs/debian/control
@ -20,7 +20,7 @@ Build-Depends:
 librust-perlmod-0.13+exporter-dev,
 librust-proxmox-acme-rs-0.4+client-dev,
 librust-proxmox-acme-rs-0.4+default-dev,
- librust-proxmox-apt-0.9+default-dev,
+ librust-proxmox-apt-0.9+default-dev (>= 0.9.4-~~),
 librust-proxmox-http-0.8+client-sync-dev,
 librust-proxmox-http-0.8+client-trait-dev,
 librust-proxmox-http-0.8+default-dev,
--- a/pve-rs/.cargo/config
+++ b/pve-rs/.cargo/config
@ -0,0 +1,5 @@
+[source]
+[source.debian-packages]
+directory = "/usr/share/cargo/registry"
+[source.crates-io]
+replace-with = "debian-packages"
--- a/pve-rs/Cargo.toml
+++ b/pve-rs/Cargo.toml
@ -1,12 +1,12 @@
 [package]
 name = "pve-rs"
-version = "0.7.6"
+version = "0.7.7"
 description = "PVE parts which have been ported to Rust"
 homepage = "https://www.proxmox.com"
-authors.workspace = true
-edition.workspace = true
-license.workspace = true
-repository.workspace = true
+authors = ["Proxmox Support Team <support@proxmox.com>"]
+edition = "2021"
+license = "AGPL-3"
+repository = "https://git.proxmox.com/?p=proxmox.git"

 exclude = [
    "debian",
@ -16,27 +16,27 @@ exclude = [
 crate-type = [ "cdylib" ]

 [dependencies]
-anyhow.workspace = true
-base32.workspace = true
-base64.workspace = true
-env_logger.workspace = true
-hex.workspace = true
-http.workspace = true
-libc.workspace = true
-nix.workspace = true
-openssl.workspace = true
-serde.workspace = true
-serde_bytes.workspace = true
-serde_json.workspace = true
-url.workspace = true
+anyhow = "1.0"
+base32 = "0.4"
+base64 = "0.13"
+env_logger = "0.9"
+hex = "0.4"
+http = "0.2.7"
+libc = "0.2"
+nix = "0.26"
+openssl = "0.10.40"
+serde = "1.0"
+serde_bytes = "0.11"
+serde_json = "1.0"
+url = "2"

-perlmod.workspace = true
+perlmod = { version = "0.13", features = [ "exporter" ] }

-proxmox-apt.workspace = true
-proxmox-http.workspace = true
-proxmox-openid.workspace = true
-proxmox-resource-scheduling.workspace = true
-proxmox-subscription.workspace = true
-proxmox-sys.workspace = true
-proxmox-tfa.workspace = true
-proxmox-time.workspace = true
+proxmox-apt = "0.9.4"
+proxmox-http = { version = "0.8", features = ["client-sync", "client-trait"] }
+proxmox-openid = "0.9.8"
+proxmox-resource-scheduling = "0.2.1"
+proxmox-subscription = "0.3"
+proxmox-sys = "0.4.2"
+proxmox-tfa = { version = "4", features = ["api"] }
+proxmox-time = "1.1.3"
--- a/pve-rs/Makefile
+++ b/pve-rs/Makefile
@ -1,5 +1,4 @@
 include /usr/share/dpkg/pkg-info.mk
-include /usr/share/dpkg/default.mk

 PACKAGE=libpve-rs-perl
 export PERLMOD_PRODUCT=PVE
@ -10,10 +9,11 @@ export GITVERSION:=$(shell git rev-parse HEAD)
 PERL_INSTALLVENDORARCH != perl -MConfig -e 'print $$Config{installvendorarch};'
 PERL_INSTALLVENDORLIB != perl -MConfig -e 'print $$Config{installvendorlib};'

-MAIN_DEB=${PACKAGE}_${DEB_VERSION}_${ARCH}.deb
-DBGSYM_DEB=${PACKAGE}-dbgsym_${DEB_VERSION}_${ARCH}.deb
+MAIN_DEB=$(PACKAGE)_$(DEB_VERSION)_$(ARCH).deb
+DBGSYM_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION)_$(ARCH).deb
 DEBS=$(MAIN_DEB) $(DBGSYM_DEB)
-DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
+DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
+BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)

 DESTDIR=

@ -39,13 +39,11 @@ TARGET_DIR=debug
 endif

 all: PVE
-ifneq ($(BUILD_MODE), skip)
 	cargo build $(CARGO_BUILD_ARGS)
 	mkdir -p test/Proxmox/Lib
 	sed -r -e \
-	  's@^sub libdirs.*$$@sub libdirs { return ("../target/$(TARGET_DIR)", "../../target/$(TARGET_DIR)"); }@' \
+	  's@^sub libdirs.*$$@sub libdirs { return ("./target/$(TARGET_DIR)", "./../target/$(TARGET_DIR)"); }@' \
 	  Proxmox/Lib/PVE.pm >test/Proxmox/Lib/PVE.pm
-endif

 PVE: Proxmox/Lib/PVE.pm
 Proxmox/Lib/PVE.pm:
@ -55,37 +53,49 @@ check: all
 	$(MAKE) -C test test

 .PHONY: install
-install: ../target/release/libpve_rs.so Proxmox/Lib/PVE.pm PVE
+install: target/release/libpve_rs.so Proxmox/Lib/PVE.pm PVE
 	install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORARCH)/auto
-	install -m644 ../target/release/libpve_rs.so $(DESTDIR)$(PERL_INSTALLVENDORARCH)/auto/libpve_rs.so
+	install -m644 target/release/libpve_rs.so $(DESTDIR)$(PERL_INSTALLVENDORARCH)/auto/libpve_rs.so
 	install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB)
 	install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB)/Proxmox/Lib
 	install -m644 Proxmox/Lib/PVE.pm $(DESTDIR)$(PERL_INSTALLVENDORLIB)/Proxmox/Lib/PVE.pm
 	find $(PM_DIR) \! -type d -print -exec install -Dm644 '{}' $(DESTDIR)$(PERL_INSTALLVENDORLIB)'/{}' ';'

-distclean: clean
-
 clean:
 	cargo clean
-	rm -rf *.deb *.dsc *.tar.gz *.buildinfo *.changes Cargo.lock
-	find . -name '*~' -exec rm {} ';'
+	rm -f *.deb *.dsc *.tar.* *.build *.buildinfo *.changes Cargo.lock
+	rm -rf $(PACKAGE)-[0-9]*/

 .PHONY: dinstall
-dinstall: ${DEBS}
-	dpkg -i ${DEBS}
+dinstall: $(DEBS)
+	dpkg -i $(DEBS)

 .PHONY: upload
 upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
-upload: ${DEBS}
+upload: $(DEBS)
 	# check if working directory is clean
 	git diff --exit-code --stat && git diff --exit-code --stat --staged
-	tar cf - ${DEBS} | ssh -X repoman@repo.proxmox.com upload --product pve --dist $(DEB_DISTRIBUTION)
+	tar cf - $(DEBS) | ssh -X repoman@repo.proxmox.com upload --product pve --dist $(DEB_DISTRIBUTION)
+
+$(BUILDDIR): src debian test common/src Cargo.toml Makefile .cargo/config
+	rm -rf $(BUILDDIR) $(BUILDDIR).tmp
+	mkdir $(BUILDDIR).tmp
+	mkdir $(BUILDDIR).tmp/common
+	cp -a -t $(BUILDDIR).tmp src debian test Cargo.toml Makefile .cargo
+	cp -a -t $(BUILDDIR).tmp/common common/src
+	mv $(BUILDDIR).tmp $(BUILDDIR)
+
+.PHONY: deb
+deb: $(DEBS)
+$(DEBS): $(BUILDDIR)
+	cd $(BUILDDIR); PATH="/usr/local/bin:/usr/bin" dpkg-buildpackage -b -us -uc
+	lintian $(DEBS)

 .PHONY: dsc
-dsc: ${DSC}
-${DSC}: ${BUILDDIR}
-	cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d
-	lintian ${DSC}
+dsc: $(DSC)
+$(DSC): $(BUILDDIR)
+	cd $(BUILDDIR); PATH="/usr/local/bin:/usr/bin" dpkg-buildpackage -S -us -uc -d
+	lintian $(DSC)

 sbuild: $(DSC)
 	sbuild $(DSC)
--- a/pve-rs/debian/changelog
+++ b/pve-rs/debian/changelog
@ -1,3 +1,10 @@
+libpve-rs-perl (0.7.7) bullseye; urgency=medium
+
+  * build with proxmox-apt 0.9.4 to also detect repository with next suite as
+    configured
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Jun 2023 11:30:59 +0200
+
 libpve-rs-perl (0.7.6) bullseye; urgency=medium

  * update to new tfa crate
--- a/pve-rs/debian/compat
+++ b/pve-rs/debian/compat
@ -1 +0,0 @@
-10
--- a/pve-rs/debian/control
+++ b/pve-rs/debian/control
@ -2,7 +2,7 @@ Source: libpve-rs-perl
 Section: perl
 Priority: optional
 Build-Depends:
- debhelper (>= 12),
+ debhelper-compat (= 13),
 dh-cargo (>= 24),
 perlmod-bin,
 cargo:native <!nocheck>,
@ -19,7 +19,7 @@ Build-Depends:
 librust-openssl-0.10+default-dev (>= 0.10.40-~~),
 librust-perlmod-0.13+default-dev,
 librust-perlmod-0.13+exporter-dev,
- librust-proxmox-apt-0.9+default-dev,
+ librust-proxmox-apt-0.9+default-dev (>= 0.9.4-~~),
 librust-proxmox-http-0.8+client-sync-dev,
 librust-proxmox-http-0.8+client-trait-dev,
 librust-proxmox-http-0.8+default-dev,
Author	SHA1	Message	Date
Wolfgang Bumiller	8b352bc47d	bump pmg-rs to 0.6.3 Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>	2023-06-09 11:36:23 +02:00
Wolfgang Bumiller	79deb6532e	bump pve-rs to 0.7.7 Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>	2023-06-09 11:31:10 +02:00
Wolfgang Bumiller	6ad1d2d72b	d/control fixup Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>	2023-06-09 11:29:59 +02:00
Wolfgang Bumiller	0e09f40f29	update proxmox-apt dependency to 0.9.4 Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>	2023-06-09 11:28:48 +02:00
Thomas Lamprecht	522f90bfbc	buildsys: add clean target for common package Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2023-06-09 11:28:48 +02:00
Thomas Lamprecht	a32c2c8aa7	buildsys: cleanup and expand clean target Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2023-06-09 11:28:48 +02:00
Wolfgang Bumiller	c37bb4e579	buildsys: add missing deb targets Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>	2023-06-09 11:28:48 +02:00
Wolfgang Bumiller	e10520d252	buildsys: backport common pkg buildsystem fixups Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>	2023-06-09 11:28:48 +02:00
Wolfgang Bumiller	9d5bd4c093	buildsys: pmg-rs: dsc and sbuild updates Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>	2023-06-09 11:28:48 +02:00
Wolfgang Bumiller	6cf02f24d1	buildsys: make pve-rs sbuild compatible Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>	2023-06-09 11:28:48 +02:00
Wolfgang Bumiller	38441def60	undo rust workspace change in preparation for .dsc builds The library ending up a level above the actual code just makes .dsc/sbuild building very inconvenient, and pve-rs and pmg-rs often grow independently from one another. All we need is the common code available. Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>	2023-06-09 11:28:48 +02:00