diff --git a/Cargo.toml b/Cargo.toml index 742bcd23..428ef941 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,3 +8,6 @@ members = [ "proxmox-tools", "proxmox", ] +exclude = [ + "build", +] diff --git a/Makefile b/Makefile index 276d919f..248c4bf3 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,20 @@ # Shortcut for common operations: +CRATES=proxmox proxmox-api proxmox-api-macro proxmox-sortable-macro proxmox-sys proxmox-tools + # By default we just run checks: .PHONY: all all: check +.PHONY: deb +deb: $(foreach c,$(CRATES), $c-deb) + echo $(foreach c,$(CRATES), $c-deb) + lintian build/*.deb + +%-deb: + ./build.sh $* + touch $@ + .PHONY: check check: cargo fmt -- --check @@ -33,6 +44,7 @@ doc: .PHONY: clean clean: cargo clean + rm -rf build *-deb .PHONY: update update: diff --git a/build.sh b/build.sh new file mode 100755 index 00000000..bb57a459 --- /dev/null +++ b/build.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +CRATE=$1 +BUILDCMD=${BUILDCMD:-"dpkg-buildpackage -b -uc -us"} + +mkdir -p build +rm -rf "build/${CRATE}" + +debcargo package --config "$(pwd)/${CRATE}/debian/debcargo.toml" --changelog-ready --no-overlay-write-back --directory "$(pwd)/build/${CRATE}" "${CRATE}" "$(dpkg-parsechangelog -l "${CRATE}/debian/changelog" -SVersion | sed -e 's/-.*//')" +cd "build/${CRATE}" +${BUILDCMD} diff --git a/proxmox-api-macro/Cargo.toml b/proxmox-api-macro/Cargo.toml index 06286244..522ef369 100644 --- a/proxmox-api-macro/Cargo.toml +++ b/proxmox-api-macro/Cargo.toml @@ -3,6 +3,10 @@ name = "proxmox-api-macro" edition = "2018" version = "0.1.1" authors = [ "Wolfgang Bumiller " ] +license = "AGPL-3" +description = "Proxmox API macro" + +exclude = [ "debian" ] [lib] proc-macro = true diff --git a/proxmox-api-macro/debian/cargo-checksum.json b/proxmox-api-macro/debian/cargo-checksum.json deleted file mode 100644 index 7b5c5ec0..00000000 --- a/proxmox-api-macro/debian/cargo-checksum.json +++ /dev/null @@ -1 +0,0 @@ -{"package":"proxmox-api-macro","files":{}} diff --git a/proxmox-api-macro/debian/changelog b/proxmox-api-macro/debian/changelog index 9a17bed2..45d57aab 100644 --- a/proxmox-api-macro/debian/changelog +++ b/proxmox-api-macro/debian/changelog @@ -1,3 +1,9 @@ +rust-proxmox-api-macro (0.1.1-1) proxmox-rust; urgency=medium + + * switch packaging to debcargo with local crate support + + -- Proxmox Support Team Mon, 13 Jan 2020 10:41:01 +0100 + rust-proxmox-api-macro (0.1.1) proxmox-rust; urgency=medium * cover all the basic struct support in the #[api] macro diff --git a/proxmox-api-macro/debian/compat b/proxmox-api-macro/debian/compat deleted file mode 100644 index 48082f72..00000000 --- a/proxmox-api-macro/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/proxmox-api-macro/debian/control b/proxmox-api-macro/debian/control deleted file mode 100644 index 7fde4faa..00000000 --- a/proxmox-api-macro/debian/control +++ /dev/null @@ -1,33 +0,0 @@ -Source: rust-proxmox-api-macro -Section: rust -Priority: optional -Build-Depends: debhelper (>= 12), - dh-cargo (>= 21~), - cargo:native , - rustc:native , - libstd-rust-dev , - librust-failure-0.1+default-dev , - librust-proc-macro2-1.0+default-dev , - librust-quote-1.0+default-dev , - librust-syn-1.0+full-dev , -Maintainer: Proxmox Support Team -Standards-Version: 4.4.1 - -Package: librust-proxmox-api-macro-dev -Architecture: any -Depends: - ${misc:Depends}, - librust-failure-0.1+default-dev, - librust-proc-macro2-1.0+default-dev, - librust-quote-1.0+default-dev, - librust-syn-1.0+full-dev, -Provides: - librust-proxmox-api-macro+default-dev (= ${binary:Version}), - librust-proxmox-api-macro-0-dev (= ${binary:Version}), - librust-proxmox-api-macro-0+default-dev (= ${binary:Version}), - librust-proxmox-api-macro-0.1-dev (= ${binary:Version}), - librust-proxmox-api-macro-0.1+default-dev (= ${binary:Version}), - librust-proxmox-api-macro-0.1.1-dev (= ${binary:Version}), - librust-proxmox-api-macro-0.1.1+default-dev (= ${binary:Version}), -Description: Proxmox API Macro library - Rust source code - This package contains the source for the Rust proxmox-api-macro crate. diff --git a/proxmox-api-macro/debian/debcargo.toml b/proxmox-api-macro/debian/debcargo.toml new file mode 100644 index 00000000..4ac0cfb7 --- /dev/null +++ b/proxmox-api-macro/debian/debcargo.toml @@ -0,0 +1,8 @@ +overlay = "." +crate_src_path = ".." + +[source] +# TODO: update once public +vcs_git = "" +vcs_browser = "" +maintainer = "Proxmox Support Team " diff --git a/proxmox-api-macro/debian/rules b/proxmox-api-macro/debian/rules deleted file mode 100755 index 044c1c21..00000000 --- a/proxmox-api-macro/debian/rules +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/make -f -%: - dh $@ --buildsystem cargo diff --git a/proxmox-api/Cargo.toml b/proxmox-api/Cargo.toml index dbc48e83..b4c81485 100644 --- a/proxmox-api/Cargo.toml +++ b/proxmox-api/Cargo.toml @@ -3,6 +3,10 @@ name = "proxmox-api" edition = "2018" version = "0.1.1" authors = [ "Wolfgang Bumiller " ] +license = "AGPL-3" +description = "Proxmox API library" + +exclude = [ "debian" ] [dependencies] bytes = "0.5" diff --git a/proxmox-api/debian/cargo-checksum.json b/proxmox-api/debian/cargo-checksum.json deleted file mode 100644 index f8cdfb31..00000000 --- a/proxmox-api/debian/cargo-checksum.json +++ /dev/null @@ -1 +0,0 @@ -{"package":"proxmox-api","files":{}} diff --git a/proxmox-api/debian/changelog b/proxmox-api/debian/changelog index a803d368..876fc1f3 100644 --- a/proxmox-api/debian/changelog +++ b/proxmox-api/debian/changelog @@ -1,3 +1,9 @@ +rust-proxmox-api (0.1.1-1) proxmox-rust; urgency=medium + + * switch packaging to debcargo with local crate support + + -- Proxmox Support Team Mon, 13 Jan 2020 10:41:01 +0100 + rust-proxmox-api (0.1.1) proxmox-rust; urgency=medium * bump proxmox-tools dependency diff --git a/proxmox-api/debian/compat b/proxmox-api/debian/compat deleted file mode 100644 index 48082f72..00000000 --- a/proxmox-api/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/proxmox-api/debian/control b/proxmox-api/debian/control deleted file mode 100644 index 7e3a6bd6..00000000 --- a/proxmox-api/debian/control +++ /dev/null @@ -1,62 +0,0 @@ -Source: rust-proxmox-api -Section: rust -Priority: optional -Build-Depends: debhelper (>= 12), - dh-cargo (>= 21~), - cargo:native , - rustc:native , - libstd-rust-dev , - librust-bytes-0.5+default-dev , - librust-failure-0.1+default-dev , - librust-futures-0.3+default-dev , - librust-http-0.2+default-dev , - librust-proxmox-tools-0.1.1+default-dev , - librust-regex-1.2+default-dev , - librust-rustyline-5.0.5+default-dev , - librust-serde-1.0+default-dev , - librust-serde-derive-1.0+default-dev , - librust-serde-json-1.0+default-dev , - librust-textwrap-0.11+default-dev , - librust-url-2.1+default-dev , - librust-tokio-0.2-dev , - librust-hyper-0.13+default-dev , - librust-lazy-static-1.4+default-dev , -Maintainer: Proxmox Support Team -Standards-Version: 4.4.1 - -Package: librust-proxmox-api-dev -Architecture: any -Depends: - ${misc:Depends}, - librust-bytes-0.5+default-dev, - librust-failure-0.1+default-dev, - librust-futures-0.3+default-dev, - librust-http-0.2+default-dev, - librust-proxmox-tools-0.1.1+default-dev, - librust-regex-1.2+default-dev, - librust-rustyline-5.0.5+default-dev, - librust-serde-1.0+default-dev, - librust-serde-derive-1.0+default-dev, - librust-serde-json-1.0+default-dev, - librust-textwrap-0.11+default-dev, - librust-url-2.1+default-dev, - librust-tokio-0.2-dev, - librust-hyper-0.13+default-dev, -Provides: - librust-proxmox-api+default-dev (= ${binary:Version}), - librust-proxmox-api+router-dev (= ${binary:Version}), - librust-proxmox-api+cli-dev (= ${binary:Version}), - librust-proxmox-api-0-dev (= ${binary:Version}), - librust-proxmox-api-0+default-dev (= ${binary:Version}), - librust-proxmox-api-0+router-dev (= ${binary:Version}), - librust-proxmox-api-0+cli-dev (= ${binary:Version}), - librust-proxmox-api-0.1-dev (= ${binary:Version}), - librust-proxmox-api-0.1+default-dev (= ${binary:Version}), - librust-proxmox-api-0.1+router-dev (= ${binary:Version}), - librust-proxmox-api-0.1+cli-dev (= ${binary:Version}), - librust-proxmox-api-0.1.1-dev (= ${binary:Version}), - librust-proxmox-api-0.1.1+default-dev (= ${binary:Version}), - librust-proxmox-api-0.1.1+router-dev (= ${binary:Version}), - librust-proxmox-api-0.1.1+cli-dev (= ${binary:Version}), -Description: Proxmox API library - Rust source code - This package contains the source for the Rust proxmox-api crate. diff --git a/proxmox-api/debian/debcargo.toml b/proxmox-api/debian/debcargo.toml new file mode 100644 index 00000000..4ac0cfb7 --- /dev/null +++ b/proxmox-api/debian/debcargo.toml @@ -0,0 +1,8 @@ +overlay = "." +crate_src_path = ".." + +[source] +# TODO: update once public +vcs_git = "" +vcs_browser = "" +maintainer = "Proxmox Support Team " diff --git a/proxmox-api/debian/rules b/proxmox-api/debian/rules deleted file mode 100755 index c9afbb06..00000000 --- a/proxmox-api/debian/rules +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/make -f -%: - dh $@ --buildsystem cargo - -override_dh_auto_build: - sed -ie 's/, path = ".*"//' Cargo.toml - dh_auto_build diff --git a/proxmox-sortable-macro/Cargo.toml b/proxmox-sortable-macro/Cargo.toml index 5aa7f8ee..ae37d04b 100644 --- a/proxmox-sortable-macro/Cargo.toml +++ b/proxmox-sortable-macro/Cargo.toml @@ -3,6 +3,10 @@ name = "proxmox-sortable-macro" version = "0.1.0" authors = ["Wolfgang Bumiller "] edition = "2018" +license = "AGPL-3" +description = "Proxmox sortable macro" + +exclude = [ "debian" ] [lib] proc-macro = true diff --git a/proxmox-sortable-macro/debian/cargo-checksum.json b/proxmox-sortable-macro/debian/cargo-checksum.json deleted file mode 100644 index b0eedf17..00000000 --- a/proxmox-sortable-macro/debian/cargo-checksum.json +++ /dev/null @@ -1 +0,0 @@ -{"package":"proxmox-sortable-macro","files":{}} diff --git a/proxmox-sortable-macro/debian/changelog b/proxmox-sortable-macro/debian/changelog index cb0095c5..6460c787 100644 --- a/proxmox-sortable-macro/debian/changelog +++ b/proxmox-sortable-macro/debian/changelog @@ -1,3 +1,9 @@ +rust-proxmox-sortable-macro (0.1.0-1) proxmox-rust; urgency=medium + + * switch packaging to debcargo with local crate support + + -- Proxmox Support Team Mon, 13 Jan 2020 10:41:01 +0100 + rust-proxmox-sortable-macro (0.1.0) proxmox-rust; urgency=medium * Initial packaging. diff --git a/proxmox-sortable-macro/debian/compat b/proxmox-sortable-macro/debian/compat deleted file mode 100644 index 48082f72..00000000 --- a/proxmox-sortable-macro/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/proxmox-sortable-macro/debian/control b/proxmox-sortable-macro/debian/control deleted file mode 100644 index 6b6bf888..00000000 --- a/proxmox-sortable-macro/debian/control +++ /dev/null @@ -1,35 +0,0 @@ -Source: rust-proxmox-sortable-macro -Section: rust -Priority: optional -Build-Depends: debhelper (>= 12), - dh-cargo (>= 21~), - cargo:native , - rustc:native , - libstd-rust-dev , - librust-failure-0.1+default-dev , - librust-proc-macro2-1.0+default-dev , - librust-quote-1.0+default-dev , - librust-syn-1.0+full-dev , - librust-syn-1.0+visit-mut-dev , -Maintainer: Proxmox Support Team -Standards-Version: 4.4.1 - -Package: librust-proxmox-sortable-macro-dev -Architecture: any -Depends: - ${misc:Depends}, - librust-failure-0.1+default-dev, - librust-proc-macro2-1.0+default-dev, - librust-quote-1.0+default-dev, - librust-syn-1.0+full-dev, - librust-syn-1.0+visit-mut-dev, -Provides: - librust-proxmox-sortable-macro+default-dev (= ${binary:Version}), - librust-proxmox-sortable-macro-0-dev (= ${binary:Version}), - librust-proxmox-sortable-macro-0+default-dev (= ${binary:Version}), - librust-proxmox-sortable-macro-0.1-dev (= ${binary:Version}), - librust-proxmox-sortable-macro-0.1+default-dev (= ${binary:Version}), - librust-proxmox-sortable-macro-0.1.0-dev (= ${binary:Version}), - librust-proxmox-sortable-macro-0.1.0+default-dev (= ${binary:Version}), -Description: Proxmox Sortable Macro - Rust source code - This package contains the source for the Rust proxmox-sortable-macro crate. diff --git a/proxmox-sortable-macro/debian/debcargo.toml b/proxmox-sortable-macro/debian/debcargo.toml new file mode 100644 index 00000000..4ac0cfb7 --- /dev/null +++ b/proxmox-sortable-macro/debian/debcargo.toml @@ -0,0 +1,8 @@ +overlay = "." +crate_src_path = ".." + +[source] +# TODO: update once public +vcs_git = "" +vcs_browser = "" +maintainer = "Proxmox Support Team " diff --git a/proxmox-sortable-macro/debian/rules b/proxmox-sortable-macro/debian/rules deleted file mode 100755 index 044c1c21..00000000 --- a/proxmox-sortable-macro/debian/rules +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/make -f -%: - dh $@ --buildsystem cargo diff --git a/proxmox-sys/Cargo.toml b/proxmox-sys/Cargo.toml index 423fb78a..0b5ca8b8 100644 --- a/proxmox-sys/Cargo.toml +++ b/proxmox-sys/Cargo.toml @@ -6,6 +6,10 @@ authors = [ "Dietmar Maurer ", "Wolfgang Bumiller ", ] +license = "AGPL-3" +description = "Proxmox system library" + +exclude = [ "debian" ] [dependencies] failure = "0.1" diff --git a/proxmox-sys/debian/cargo-checksum.json b/proxmox-sys/debian/cargo-checksum.json deleted file mode 100644 index e6828ac2..00000000 --- a/proxmox-sys/debian/cargo-checksum.json +++ /dev/null @@ -1 +0,0 @@ -{"package":"proxmox-sys","files":{}} diff --git a/proxmox-sys/debian/changelog b/proxmox-sys/debian/changelog index 80e728da..57133438 100644 --- a/proxmox-sys/debian/changelog +++ b/proxmox-sys/debian/changelog @@ -1,3 +1,9 @@ +rust-proxmox-sys (0.1.1-1) proxmox-rust; urgency=medium + + * switch packaging to debcargo with local crate support + + -- Proxmox Support Team Mon, 13 Jan 2020 10:41:01 +0100 + rust-proxmox-sys (0.1.1) proxmox-rust; urgency=medium * added: various helpers for dealing with nix and io errors diff --git a/proxmox-sys/debian/compat b/proxmox-sys/debian/compat deleted file mode 100644 index 48082f72..00000000 --- a/proxmox-sys/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/proxmox-sys/debian/control b/proxmox-sys/debian/control deleted file mode 100644 index 4333636e..00000000 --- a/proxmox-sys/debian/control +++ /dev/null @@ -1,35 +0,0 @@ -Source: rust-proxmox-sys -Section: rust -Priority: optional -Build-Depends: debhelper (>= 12), - dh-cargo (>= 21~), - cargo:native , - rustc:native , - libstd-rust-dev , - librust-failure-0.1+default-dev , - librust-lazy-static-1.4+default-dev , - librust-libc-0.2+default-dev , - librust-nix-0.16+default-dev , - librust-proxmox-tools-0.1.1+default-dev , -Maintainer: Proxmox Support Team -Standards-Version: 4.4.1 - -Package: librust-proxmox-sys-dev -Architecture: any -Depends: - ${misc:Depends}, - librust-failure-0.1+default-dev, - librust-lazy-static-1.4+default-dev, - librust-libc-0.2+default-dev, - librust-nix-0.16+default-dev, - librust-proxmox-tools-0.1.1+default-dev, -Provides: - librust-proxmox-sys+default-dev (= ${binary:Version}), - librust-proxmox-sys-0-dev (= ${binary:Version}), - librust-proxmox-sys-0+default-dev (= ${binary:Version}), - librust-proxmox-sys-0.1-dev (= ${binary:Version}), - librust-proxmox-sys-0.1+default-dev (= ${binary:Version}), - librust-proxmox-sys-0.1.1-dev (= ${binary:Version}), - librust-proxmox-sys-0.1.1+default-dev (= ${binary:Version}), -Description: Proxmox system library - Rust source code - This package contains the source for the Rust proxmox-sys crate. diff --git a/proxmox-sys/debian/debcargo.toml b/proxmox-sys/debian/debcargo.toml new file mode 100644 index 00000000..4ac0cfb7 --- /dev/null +++ b/proxmox-sys/debian/debcargo.toml @@ -0,0 +1,8 @@ +overlay = "." +crate_src_path = ".." + +[source] +# TODO: update once public +vcs_git = "" +vcs_browser = "" +maintainer = "Proxmox Support Team " diff --git a/proxmox-sys/debian/rules b/proxmox-sys/debian/rules deleted file mode 100755 index e54b0ab1..00000000 --- a/proxmox-sys/debian/rules +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/make -f -%: - dh $@ --buildsystem cargo - -override_dh_auto_build: - sed -ie 's/proxmox-tools = { path = "\.\.\/proxmox-tools" }/proxmox-tools = "0.1.0"/' Cargo.toml - dh_auto_build diff --git a/proxmox-tools/Cargo.toml b/proxmox-tools/Cargo.toml index 717f7d8d..82133cb7 100644 --- a/proxmox-tools/Cargo.toml +++ b/proxmox-tools/Cargo.toml @@ -6,6 +6,10 @@ authors = [ "Dietmar Maurer ", "Wolfgang Bumiller ", ] +license = "AGPL-3" +description = "Proxmox tools" + +exclude = [ "debian" ] [dependencies] base64 = "0.10" diff --git a/proxmox-tools/debian/cargo-checksum.json b/proxmox-tools/debian/cargo-checksum.json deleted file mode 100644 index 6e01cf91..00000000 --- a/proxmox-tools/debian/cargo-checksum.json +++ /dev/null @@ -1 +0,0 @@ -{"package":"proxmox-tools","files":{}} diff --git a/proxmox-tools/debian/changelog b/proxmox-tools/debian/changelog index 8afc8c9e..d8260fea 100644 --- a/proxmox-tools/debian/changelog +++ b/proxmox-tools/debian/changelog @@ -1,3 +1,9 @@ +rust-proxmox-tools (0.1.1-1) proxmox-rust; urgency=medium + + * switch packaging to debcargo with local crate support + + -- Proxmox Support Team Mon, 13 Jan 2020 10:41:01 +0100 + rust-proxmox-tools (0.1.1) proxmox-rust; urgency=medium * correctly default to mode 0644 in replace_file diff --git a/proxmox-tools/debian/compat b/proxmox-tools/debian/compat deleted file mode 100644 index 48082f72..00000000 --- a/proxmox-tools/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/proxmox-tools/debian/control b/proxmox-tools/debian/control deleted file mode 100644 index 8b5f53a7..00000000 --- a/proxmox-tools/debian/control +++ /dev/null @@ -1,67 +0,0 @@ -Source: rust-proxmox-tools -Section: rust -Priority: optional -Build-Depends: debhelper (>= 12), - dh-cargo (>= 21~), - cargo:native , - rustc:native , - libstd-rust-dev , - librust-base64-0.10+default-dev , - librust-chrono-0.4+default-dev , - librust-endian-trait-0.6+arrays-dev , - librust-failure-0.1+default-dev , - librust-lazy-static-1.4+default-dev , - librust-libc-0.2+default-dev , - librust-nix-0.16+default-dev , - librust-regex-1.2+default-dev , - librust-serde-1.0+derive-dev , - librust-serde-json-1.0+default-dev , -# not compatible with stable rustc -# librust-valgrind-request-1.1.0+default-dev , -Maintainer: Proxmox Support Team -Standards-Version: 4.4.1 - -Package: librust-proxmox-tools-dev -Architecture: any -Depends: - ${misc:Depends}, - librust-base64-0.10+default-dev, - librust-chrono-0.4+default-dev, - librust-endian-trait-0.6+arrays-dev, - librust-failure-0.1+default-dev, - librust-libc-0.2+default-dev, - librust-nix-0.16+default-dev, - librust-regex-1.2+default-dev, - librust-serde-1.0+derive-dev, - librust-serde-json-1.0+default-dev, -Provides: - librust-proxmox-tools+default-dev (= ${binary:Version}), - librust-proxmox-tools-0-dev (= ${binary:Version}), - librust-proxmox-tools-0+default-dev (= ${binary:Version}), - librust-proxmox-tools-0.1-dev (= ${binary:Version}), - librust-proxmox-tools-0.1+default-dev (= ${binary:Version}), - librust-proxmox-tools-0.1.1-dev (= ${binary:Version}), - librust-proxmox-tools-0.1.1+default-dev (= ${binary:Version}), -Description: Proxmox tools library - Rust source code - This package contains the source for the Rust proxmox-tools crate. - -# not compatible with stable rustc -# Package: librust-proxmox-tools+valgrind-dev -# Architecture: any -# Depends: -# ${misc:Depends}, -# librust-base64-0.10+default-dev, -# librust-chrono-0.4+default-dev, -# librust-endian-trait-0.6+arrays-dev, -# librust-failure-0.1+default-dev, -# librust-lazy-static-1.3+default-dev, -# librust-libc-0.2+default-dev, -# librust-nix-0.15+default-dev, -# librust-regex-1.2+default-dev, -# librust-serde-1.0+derive-dev, -# librust-serde-json-1.0+default-dev, -# librust-valgrind-request-1.1.0+default-dev, -# Provides: -# librust-proxmox-tools-0+valgrind-dev (= ${binary:Version}), -# librust-proxmox-tools-0.1+valgrind-dev (= ${binary:Version}), -# librust-proxmox-tools-0.1.1+valgrind-dev (= ${binary:Version}), diff --git a/proxmox-tools/debian/debcargo.toml b/proxmox-tools/debian/debcargo.toml new file mode 100644 index 00000000..4ac0cfb7 --- /dev/null +++ b/proxmox-tools/debian/debcargo.toml @@ -0,0 +1,8 @@ +overlay = "." +crate_src_path = ".." + +[source] +# TODO: update once public +vcs_git = "" +vcs_browser = "" +maintainer = "Proxmox Support Team " diff --git a/proxmox-tools/debian/rules b/proxmox-tools/debian/rules deleted file mode 100755 index 044c1c21..00000000 --- a/proxmox-tools/debian/rules +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/make -f -%: - dh $@ --buildsystem cargo diff --git a/proxmox/Cargo.toml b/proxmox/Cargo.toml index 5aa01818..ba0d6905 100644 --- a/proxmox/Cargo.toml +++ b/proxmox/Cargo.toml @@ -6,13 +6,17 @@ authors = [ "Dietmar Maurer ", "Wolfgang Bumiller ", ] +license = "AGPL-3" +description = "Proxmox library" + +exclude = [ "debian" ] [dependencies] -proxmox-api = { path = "../proxmox-api", default-features = false } -proxmox-api-macro = { path = "../proxmox-api-macro", optional = true } -proxmox-sys = { path = "../proxmox-sys" } -proxmox-tools = { path = "../proxmox-tools" } -proxmox-sortable-macro = { path = "../proxmox-sortable-macro", optional = true } +proxmox-api = { path = "../proxmox-api", default-features = false, version = "0.1.1" } +proxmox-api-macro = { path = "../proxmox-api-macro", optional = true, version = "0.1.1" } +proxmox-sys = { path = "../proxmox-sys", version = "0.1.1" } +proxmox-tools = { path = "../proxmox-tools", version = "0.1.1" } +proxmox-sortable-macro = { path = "../proxmox-sortable-macro", optional = true, version = "0.1.0" } [features] api-macro = ["proxmox-api-macro"] diff --git a/proxmox/debian/cargo-checksum.json b/proxmox/debian/cargo-checksum.json deleted file mode 100644 index d8041065..00000000 --- a/proxmox/debian/cargo-checksum.json +++ /dev/null @@ -1 +0,0 @@ -{"package":"proxmox","files":{}} diff --git a/proxmox/debian/changelog b/proxmox/debian/changelog index 00b5ff9c..d617d226 100644 --- a/proxmox/debian/changelog +++ b/proxmox/debian/changelog @@ -1,3 +1,9 @@ +rust-proxmox (0.1.2-1) proxmox-rust; urgency=medium + + * switch packaging to debcargo with local crate support + + -- Proxmox Support Team Mon, 13 Jan 2020 10:41:01 +0100 + rust-proxmox (0.1.2) proxmox-rust; urgency=medium * api-macro: bump to 0.1.1 diff --git a/proxmox/debian/compat b/proxmox/debian/compat deleted file mode 100644 index 48082f72..00000000 --- a/proxmox/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/proxmox/debian/control b/proxmox/debian/control deleted file mode 100644 index 5514984d..00000000 --- a/proxmox/debian/control +++ /dev/null @@ -1,55 +0,0 @@ -Source: rust-proxmox -Section: rust -Priority: optional -Build-Depends: debhelper (>= 12), - dh-cargo (>= 21~), - cargo:native , - rustc:native , - libstd-rust-dev , - librust-proxmox-api-0.1.1-dev , - librust-proxmox-api-macro-0.1.1+default-dev , - librust-proxmox-sys-0.1.1+default-dev , - librust-proxmox-tools-0.1.1+default-dev , - librust-proxmox-sortable-macro-0.1.0+default-dev , -Maintainer: Proxmox Support Team -Standards-Version: 4.4.1 - -# note: could be split up feature-wise if desired -Package: librust-proxmox-dev -Architecture: any -Depends: - ${misc:Depends}, - librust-proxmox-api-0.1.1+cli-dev, - librust-proxmox-api-0.1.1+router-dev, - librust-proxmox-api-macro-0.1.1+default-dev, - librust-proxmox-sys-0.1.1+default-dev, - librust-proxmox-tools-0.1.1+default-dev, - librust-proxmox-sortable-macro-0.1.0+default-dev, -Provides: - librust-proxmox+default-dev (= ${binary:Version}), - librust-proxmox-0-dev (= ${binary:Version}), - librust-proxmox-0+default-dev (= ${binary:Version}), - librust-proxmox-0.1-dev (= ${binary:Version}), - librust-proxmox-0.1+default-dev (= ${binary:Version}), - librust-proxmox-0.1.2-dev (= ${binary:Version}), - librust-proxmox-0.1.2+default-dev (= ${binary:Version}), - librust-proxmox+api-macro-dev (= ${binary:Version}), - librust-proxmox-0+api-macro-dev (= ${binary:Version}), - librust-proxmox-0.1+api-macro-dev (= ${binary:Version}), - librust-proxmox-0.1.2+api-macro-dev (= ${binary:Version}), - librust-proxmox+cli-dev (= ${binary:Version}), - librust-proxmox-0+cli-dev (= ${binary:Version}), - librust-proxmox-0.1+cli-dev (= ${binary:Version}), - librust-proxmox-0.1.2+cli-dev (= ${binary:Version}), - librust-proxmox+router-dev (= ${binary:Version}), - librust-proxmox-0+router-dev (= ${binary:Version}), - librust-proxmox-0.1+router-dev (= ${binary:Version}), - librust-proxmox-0.1.2+router-dev (= ${binary:Version}), - librust-proxmox+sortable-macro-dev (= ${binary:Version}), - librust-proxmox-0+sortable-macro-dev (= ${binary:Version}), - librust-proxmox-0.1+sortable-macro-dev (= ${binary:Version}), - librust-proxmox-0.1.2+sortable-macro-dev (= ${binary:Version}), -Description: Proxmox library - Rust source code - This package contains the source for the Rust proxmox crate. - -# valgrind feature ignored - see proxmox-tools diff --git a/proxmox/debian/debcargo.toml b/proxmox/debian/debcargo.toml new file mode 100644 index 00000000..4aa46c1c --- /dev/null +++ b/proxmox/debian/debcargo.toml @@ -0,0 +1,11 @@ +overlay = "." +crate_src_path = ".." + +[source] +# TODO: update once public +vcs_git = "" +vcs_browser = "" +maintainer = "Proxmox Support Team " + +[packages.lib] +depends = [ "uuid-dev" ] diff --git a/proxmox/debian/rules b/proxmox/debian/rules deleted file mode 100755 index d322cf45..00000000 --- a/proxmox/debian/rules +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/make -f -%: - dh $@ --buildsystem cargo - -override_dh_auto_build: - sed -ie 's/path = "\.\.\/proxmox-.*"/version = "0.1.0"/' Cargo.toml - dh_auto_build