diff --git a/dev/link-patches.sh b/dev/link-patches.sh index b4394eb..11d358c 100755 --- a/dev/link-patches.sh +++ b/dev/link-patches.sh @@ -20,6 +20,7 @@ test -d "src/$pkg/debian/patches" || mkdir "src/$pkg/debian/patches" rm -rf "build/$pkg/debian/patches" rm -rf "build/$pkg/.pc" +mkdir -p "build/$pkg/debian" ln -sfT "$PWD/src/$pkg/debian/patches" "build/$pkg/debian/patches" if [ -z "$2" ]; then exit 0; fi diff --git a/src/cargo/debian/changelog b/src/cargo/debian/changelog index a52f1ef..2ae29a5 100644 --- a/src/cargo/debian/changelog +++ b/src/cargo/debian/changelog @@ -1,3 +1,9 @@ +rust-cargo (0.47.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package cargo 0.47.0 from crates.io using debcargo 2.4.3 + + -- Ximin Luo Thu, 01 Oct 2020 22:03:19 +0100 + rust-cargo (0.43.1-1) unstable; urgency=medium * Package cargo 0.43.1 from crates.io using debcargo 2.4.2 diff --git a/src/cargo/debian/patches/disable-pretty-env-logger.patch b/src/cargo/debian/patches/disable-pretty-env-logger.patch index ed9c0ca..d518f76 100644 --- a/src/cargo/debian/patches/disable-pretty-env-logger.patch +++ b/src/cargo/debian/patches/disable-pretty-env-logger.patch @@ -2,7 +2,7 @@ +++ b/Cargo.toml @@ -125,4 +125,0 @@ -[dependencies.pretty_env_logger] --version = "0.3" +-version = "0.4" -optional = true - @@ -188,1 +184,1 @@ diff --git a/src/cargo/debian/patches/disable-vendor.patch b/src/cargo/debian/patches/disable-vendor.patch index f6fcfb9..04431db 100644 --- a/src/cargo/debian/patches/disable-vendor.patch +++ b/src/cargo/debian/patches/disable-vendor.patch @@ -1,11 +1,11 @@ --- a/Cargo.toml +++ b/Cargo.toml -@@ -196,7 +196,7 @@ +@@ -194,7 +194,7 @@ [features] deny-warnings = [] pretty-env-logger = ["pretty_env_logger"] -vendored-openssl = ["openssl/vendored"] +vendored-openssl = ["openssl"] [target."cfg(target_os = \"macos\")".dependencies.core-foundation] - version = "0.7.0" + version = "0.9.0" features = ["mac_os_10_7_support"] diff --git a/src/cargo/debian/patches/relax-deps.patch b/src/cargo/debian/patches/relax-deps.patch new file mode 100644 index 0000000..713a430 --- /dev/null +++ b/src/cargo/debian/patches/relax-deps.patch @@ -0,0 +1,11 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -140,7 +140,7 @@ + version = "1" + + [dependencies.semver] +-version = "0.10" ++version = "0.11" + features = ["serde"] + + [dependencies.serde] diff --git a/src/cargo/debian/patches/series b/src/cargo/debian/patches/series index 9e50271..fffce91 100644 --- a/src/cargo/debian/patches/series +++ b/src/cargo/debian/patches/series @@ -1,2 +1,3 @@ disable-vendor.patch disable-pretty-env-logger.patch +relax-deps.patch diff --git a/src/core-foundation/debian/changelog b/src/core-foundation/debian/changelog index 365084d..e2baa8f 100644 --- a/src/core-foundation/debian/changelog +++ b/src/core-foundation/debian/changelog @@ -1,3 +1,9 @@ +rust-core-foundation (0.9.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package core-foundation 0.9.1 from crates.io using debcargo 2.4.3 + + -- Ximin Luo Thu, 01 Oct 2020 21:02:16 +0100 + rust-core-foundation (0.7.0-1) unstable; urgency=medium * Package core-foundation 0.7.0 from crates.io using debcargo 2.4.2 diff --git a/src/core-foundation-sys/debian/changelog b/src/core-foundation-sys/debian/changelog index 79a2351..2b32029 100644 --- a/src/core-foundation-sys/debian/changelog +++ b/src/core-foundation-sys/debian/changelog @@ -1,3 +1,9 @@ +rust-core-foundation-sys (0.8.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package core-foundation-sys 0.8.1 from crates.io using debcargo 2.4.3 + + -- Ximin Luo Thu, 01 Oct 2020 21:16:44 +0100 + rust-core-foundation-sys (0.7.0-1) unstable; urgency=medium * Package core-foundation-sys 0.7.0 from crates.io using debcargo 2.4.2 diff --git a/src/crates-io/debian/changelog b/src/crates-io/debian/changelog index c1c9759..3137830 100644 --- a/src/crates-io/debian/changelog +++ b/src/crates-io/debian/changelog @@ -1,3 +1,9 @@ +rust-crates-io (0.31.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package crates-io 0.31.1 from crates.io using debcargo 2.4.3 + + -- Ximin Luo Thu, 01 Oct 2020 21:47:52 +0100 + rust-crates-io (0.31.0-1) unstable; urgency=medium * Package crates-io 0.31.0 from crates.io using debcargo 2.4.2 diff --git a/src/curl/debian/changelog b/src/curl/debian/changelog index 7a05328..e71690f 100644 --- a/src/curl/debian/changelog +++ b/src/curl/debian/changelog @@ -1,9 +1,9 @@ -rust-curl (0.4.28-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium +rust-curl (0.4.33-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium * Team upload. - * Package curl 0.4.28 from crates.io using debcargo 2.4.2 + * Package curl 0.4.33 from crates.io using debcargo 2.4.3 - -- Ximin Luo Sat, 18 Apr 2020 18:51:33 +0100 + -- Ximin Luo Thu, 01 Oct 2020 21:52:45 +0100 rust-curl (0.4.25-2) unstable; urgency=medium diff --git a/src/git2/debian/changelog b/src/git2/debian/changelog index 47d2354..2d6b07d 100644 --- a/src/git2/debian/changelog +++ b/src/git2/debian/changelog @@ -1,3 +1,10 @@ +rust-git2 (0.13.11-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package git2 0.13.11 from crates.io using debcargo 2.4.3 + + -- Ximin Luo Thu, 01 Oct 2020 21:52:11 +0100 + rust-git2 (0.11.0-1) unstable; urgency=medium * Team upload. diff --git a/src/git2/debian/copyright.debcargo.hint b/src/git2/debian/copyright.debcargo.hint index 62f2d51..8e9189d 100644 --- a/src/git2/debian/copyright.debcargo.hint +++ b/src/git2/debian/copyright.debcargo.hint @@ -26,7 +26,7 @@ Files: debian/* Copyright: 2018-2020 Debian Rust Maintainers - 2018-2020 Paride Legovini + 2018-2020 Paride Legovini License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/git2/debian/debcargo.toml b/src/git2/debian/debcargo.toml index 4039c05..8454362 100644 --- a/src/git2/debian/debcargo.toml +++ b/src/git2/debian/debcargo.toml @@ -4,3 +4,4 @@ [packages."lib+@"] # a file is missing in libgit2-sys test_is_broken = true +test_depends = ["git"] diff --git a/src/git2/debian/patches/disable-vendor.patch b/src/git2/debian/patches/disable-vendor.patch index 305d4d4..a883c58 100644 --- a/src/git2/debian/patches/disable-vendor.patch +++ b/src/git2/debian/patches/disable-vendor.patch @@ -7,6 +7,6 @@ ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"] unstable = [] -vendored-openssl = ["openssl-sys/vendored"] + zlib-ng-compat = ["libgit2-sys/zlib-ng-compat"] [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-probe] version = "0.1" - optional = true diff --git a/src/git2/debian/tests/control b/src/git2/debian/tests/control deleted file mode 100644 index 39c47e8..0000000 --- a/src/git2/debian/tests/control +++ /dev/null @@ -1,39 +0,0 @@ -Test-Command: /usr/share/cargo/bin/cargo-auto-test git2 0.11.0 --all-targets --all-features -Features: test-name=@ -Depends: git, dh-cargo (>= 18), librust-docopt-1+default-dev, librust-serde-1+default-dev, librust-serde-derive-1+default-dev, librust-tempfile-3+default-dev (>= 3.1.0-~~), librust-thread-id-3+default-dev (>= 3.3.0-~~), librust-time-0.1+default-dev (>= 0.1.39-~~), @ -Restrictions: allow-stderr, skip-not-installable, flaky - -Test-Command: /usr/share/cargo/bin/cargo-auto-test git2 0.11.0 --all-targets --no-default-features -Features: test-name=librust-git2-dev -Depends: git, dh-cargo (>= 18), librust-docopt-1+default-dev, librust-serde-1+default-dev, librust-serde-derive-1+default-dev, librust-tempfile-3+default-dev (>= 3.1.0-~~), librust-thread-id-3+default-dev (>= 3.3.0-~~), librust-time-0.1+default-dev (>= 0.1.39-~~), @ -Restrictions: allow-stderr, skip-not-installable - -Test-Command: /usr/share/cargo/bin/cargo-auto-test git2 0.11.0 --all-targets --features default -Features: test-name=librust-git2+default-dev -Depends: git, dh-cargo (>= 18), librust-docopt-1+default-dev, librust-serde-1+default-dev, librust-serde-derive-1+default-dev, librust-tempfile-3+default-dev (>= 3.1.0-~~), librust-thread-id-3+default-dev (>= 3.3.0-~~), librust-time-0.1+default-dev (>= 0.1.39-~~), @ -Restrictions: allow-stderr, skip-not-installable - -Test-Command: /usr/share/cargo/bin/cargo-auto-test git2 0.11.0 --all-targets --features https -Features: test-name=librust-git2+https-dev -Depends: git, dh-cargo (>= 18), librust-docopt-1+default-dev, librust-serde-1+default-dev, librust-serde-derive-1+default-dev, librust-tempfile-3+default-dev (>= 3.1.0-~~), librust-thread-id-3+default-dev (>= 3.3.0-~~), librust-time-0.1+default-dev (>= 0.1.39-~~), @ -Restrictions: allow-stderr, skip-not-installable - -Test-Command: /usr/share/cargo/bin/cargo-auto-test git2 0.11.0 --all-targets --features openssl-probe -Features: test-name=librust-git2+openssl-probe-dev -Depends: git, dh-cargo (>= 18), librust-docopt-1+default-dev, librust-serde-1+default-dev, librust-serde-derive-1+default-dev, librust-tempfile-3+default-dev (>= 3.1.0-~~), librust-thread-id-3+default-dev (>= 3.3.0-~~), librust-time-0.1+default-dev (>= 0.1.39-~~), @ -Restrictions: allow-stderr, skip-not-installable - -Test-Command: /usr/share/cargo/bin/cargo-auto-test git2 0.11.0 --all-targets --features openssl-sys -Features: test-name=librust-git2+openssl-sys-dev -Depends: git, dh-cargo (>= 18), librust-docopt-1+default-dev, librust-serde-1+default-dev, librust-serde-derive-1+default-dev, librust-tempfile-3+default-dev (>= 3.1.0-~~), librust-thread-id-3+default-dev (>= 3.3.0-~~), librust-time-0.1+default-dev (>= 0.1.39-~~), @ -Restrictions: allow-stderr, skip-not-installable - -Test-Command: /usr/share/cargo/bin/cargo-auto-test git2 0.11.0 --all-targets --features ssh -Features: test-name=librust-git2+ssh-dev -Depends: git, dh-cargo (>= 18), librust-docopt-1+default-dev, librust-serde-1+default-dev, librust-serde-derive-1+default-dev, librust-tempfile-3+default-dev (>= 3.1.0-~~), librust-thread-id-3+default-dev (>= 3.3.0-~~), librust-time-0.1+default-dev (>= 0.1.39-~~), @ -Restrictions: allow-stderr, skip-not-installable - -Test-Command: /usr/share/cargo/bin/cargo-auto-test git2 0.11.0 --all-targets --features ssh_key_from_memory -Features: test-name=librust-git2+ssh-key-from-memory-dev -Depends: git, dh-cargo (>= 18), librust-docopt-1+default-dev, librust-serde-1+default-dev, librust-serde-derive-1+default-dev, librust-tempfile-3+default-dev (>= 3.1.0-~~), librust-thread-id-3+default-dev (>= 3.3.0-~~), librust-time-0.1+default-dev (>= 0.1.39-~~), @ -Restrictions: allow-stderr, skip-not-installable diff --git a/src/git2/debian/tests/control.debcargo.hint b/src/git2/debian/tests/control.debcargo.hint deleted file mode 100644 index fffafd7..0000000 --- a/src/git2/debian/tests/control.debcargo.hint +++ /dev/null @@ -1,39 +0,0 @@ -Test-Command: /usr/share/cargo/bin/cargo-auto-test git2 0.11.0 --all-targets --all-features -Features: test-name=@ -Depends: dh-cargo (>= 18), librust-docopt-1+default-dev, librust-serde-1+default-dev, librust-serde-derive-1+default-dev, librust-tempfile-3+default-dev (>= 3.1.0-~~), librust-thread-id-3+default-dev (>= 3.3.0-~~), librust-time-0.1+default-dev (>= 0.1.39-~~), @ -Restrictions: allow-stderr, skip-not-installable, flaky - -Test-Command: /usr/share/cargo/bin/cargo-auto-test git2 0.11.0 --all-targets --no-default-features -Features: test-name=librust-git2-dev -Depends: dh-cargo (>= 18), librust-docopt-1+default-dev, librust-serde-1+default-dev, librust-serde-derive-1+default-dev, librust-tempfile-3+default-dev (>= 3.1.0-~~), librust-thread-id-3+default-dev (>= 3.3.0-~~), librust-time-0.1+default-dev (>= 0.1.39-~~), @ -Restrictions: allow-stderr, skip-not-installable - -Test-Command: /usr/share/cargo/bin/cargo-auto-test git2 0.11.0 --all-targets --features default -Features: test-name=librust-git2+default-dev -Depends: dh-cargo (>= 18), librust-docopt-1+default-dev, librust-serde-1+default-dev, librust-serde-derive-1+default-dev, librust-tempfile-3+default-dev (>= 3.1.0-~~), librust-thread-id-3+default-dev (>= 3.3.0-~~), librust-time-0.1+default-dev (>= 0.1.39-~~), @ -Restrictions: allow-stderr, skip-not-installable - -Test-Command: /usr/share/cargo/bin/cargo-auto-test git2 0.11.0 --all-targets --features https -Features: test-name=librust-git2+https-dev -Depends: dh-cargo (>= 18), librust-docopt-1+default-dev, librust-serde-1+default-dev, librust-serde-derive-1+default-dev, librust-tempfile-3+default-dev (>= 3.1.0-~~), librust-thread-id-3+default-dev (>= 3.3.0-~~), librust-time-0.1+default-dev (>= 0.1.39-~~), @ -Restrictions: allow-stderr, skip-not-installable - -Test-Command: /usr/share/cargo/bin/cargo-auto-test git2 0.11.0 --all-targets --features openssl-probe -Features: test-name=librust-git2+openssl-probe-dev -Depends: dh-cargo (>= 18), librust-docopt-1+default-dev, librust-serde-1+default-dev, librust-serde-derive-1+default-dev, librust-tempfile-3+default-dev (>= 3.1.0-~~), librust-thread-id-3+default-dev (>= 3.3.0-~~), librust-time-0.1+default-dev (>= 0.1.39-~~), @ -Restrictions: allow-stderr, skip-not-installable - -Test-Command: /usr/share/cargo/bin/cargo-auto-test git2 0.11.0 --all-targets --features openssl-sys -Features: test-name=librust-git2+openssl-sys-dev -Depends: dh-cargo (>= 18), librust-docopt-1+default-dev, librust-serde-1+default-dev, librust-serde-derive-1+default-dev, librust-tempfile-3+default-dev (>= 3.1.0-~~), librust-thread-id-3+default-dev (>= 3.3.0-~~), librust-time-0.1+default-dev (>= 0.1.39-~~), @ -Restrictions: allow-stderr, skip-not-installable - -Test-Command: /usr/share/cargo/bin/cargo-auto-test git2 0.11.0 --all-targets --features ssh -Features: test-name=librust-git2+ssh-dev -Depends: dh-cargo (>= 18), librust-docopt-1+default-dev, librust-serde-1+default-dev, librust-serde-derive-1+default-dev, librust-tempfile-3+default-dev (>= 3.1.0-~~), librust-thread-id-3+default-dev (>= 3.3.0-~~), librust-time-0.1+default-dev (>= 0.1.39-~~), @ -Restrictions: allow-stderr, skip-not-installable - -Test-Command: /usr/share/cargo/bin/cargo-auto-test git2 0.11.0 --all-targets --features ssh_key_from_memory -Features: test-name=librust-git2+ssh-key-from-memory-dev -Depends: dh-cargo (>= 18), librust-docopt-1+default-dev, librust-serde-1+default-dev, librust-serde-derive-1+default-dev, librust-tempfile-3+default-dev (>= 3.1.0-~~), librust-thread-id-3+default-dev (>= 3.3.0-~~), librust-time-0.1+default-dev (>= 0.1.39-~~), @ -Restrictions: allow-stderr, skip-not-installable diff --git a/src/git2-curl/debian/changelog b/src/git2-curl/debian/changelog index f765ad0..ac4781b 100644 --- a/src/git2-curl/debian/changelog +++ b/src/git2-curl/debian/changelog @@ -1,3 +1,9 @@ +rust-git2-curl (0.14.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package git2-curl 0.14.1 from crates.io using debcargo 2.4.3 + + -- Ximin Luo Thu, 01 Oct 2020 21:37:29 +0100 + rust-git2-curl (0.12.0-1) unstable; urgency=medium * Package git2-curl 0.12.0 from crates.io using debcargo 2.4.2 diff --git a/src/im-rc/debian/changelog b/src/im-rc/debian/changelog index c5d7254..8ab046a 100644 --- a/src/im-rc/debian/changelog +++ b/src/im-rc/debian/changelog @@ -1,3 +1,9 @@ +rust-im-rc (15.0.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package im-rc 15.0.0 from crates.io using debcargo 2.4.3 + + -- Ximin Luo Thu, 01 Oct 2020 21:08:07 +0100 + rust-im-rc (14.3.0-1) unstable; urgency=medium * Team upload. diff --git a/src/im-rc/debian/patches/disable-features.patch b/src/im-rc/debian/patches/disable-features.patch deleted file mode 100644 index 93cdf40..0000000 --- a/src/im-rc/debian/patches/disable-features.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: im-rc/Cargo.toml -=================================================================== ---- im-rc.orig/Cargo.toml -+++ im-rc/Cargo.toml -@@ -29,9 +29,9 @@ all-features = true - - [lib] - path = "./src/lib.rs" --[dependencies.arbitrary] --version = "0.4" --optional = true -+#[dependencies.arbitrary] -+#version = "0.4" -+#optional = true - - [dependencies.bitmaps] - version = "2.0.0" -@@ -54,9 +54,9 @@ version = "0.4.0" - version = "1.0" - optional = true - --[dependencies.refpool] --version = "0.2.2" --optional = true -+#[dependencies.refpool] -+#version = "0.2.2" -+#optional = true - - [dependencies.serde] - version = "1.0" diff --git a/src/im-rc/debian/patches/relax-deps.patch b/src/im-rc/debian/patches/relax-deps.patch deleted file mode 100644 index b2b7980..0000000 --- a/src/im-rc/debian/patches/relax-deps.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: im-rc/Cargo.toml -=================================================================== ---- im-rc.orig/Cargo.toml -+++ im-rc/Cargo.toml -@@ -63,7 +63,7 @@ version = "1.0" - optional = true - - [dependencies.sized-chunks] --version = "0.5.1" -+version = ">= 0.5.1, < 0.7" - - [dependencies.typenum] - version = "1.10" diff --git a/src/im-rc/debian/patches/series b/src/im-rc/debian/patches/series deleted file mode 100644 index 779dd0f..0000000 --- a/src/im-rc/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -relax-deps.patch -disable-features.patch diff --git a/src/jobserver/debian/changelog b/src/jobserver/debian/changelog index 206b191..b97dc1e 100644 --- a/src/jobserver/debian/changelog +++ b/src/jobserver/debian/changelog @@ -1,3 +1,9 @@ +rust-jobserver (0.1.21-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package jobserver 0.1.21 from crates.io using debcargo 2.4.3 + + -- Ximin Luo Thu, 01 Oct 2020 21:20:26 +0100 + rust-jobserver (0.1.17-2) unstable; urgency=medium * Team upload. diff --git a/src/jobserver/debian/copyright b/src/jobserver/debian/copyright index 519b89b..7cdcbc0 100644 --- a/src/jobserver/debian/copyright +++ b/src/jobserver/debian/copyright @@ -9,8 +9,8 @@ Files: debian/* Copyright: - 2018 Debian Rust Maintainers - 2018 Ximin Luo + 2018-2020 Debian Rust Maintainers + 2018-2020 Ximin Luo License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/jobserver/debian/copyright.debcargo.hint b/src/jobserver/debian/copyright.debcargo.hint index 06c976e..a2f8d06 100644 --- a/src/jobserver/debian/copyright.debcargo.hint +++ b/src/jobserver/debian/copyright.debcargo.hint @@ -21,8 +21,8 @@ Files: debian/* Copyright: - 2018-2019 Debian Rust Maintainers - 2018-2019 Ximin Luo + 2018-2020 Debian Rust Maintainers + 2018-2020 Ximin Luo License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/libgit2-sys/debian/changelog b/src/libgit2-sys/debian/changelog index 222aa8f..002de36 100644 --- a/src/libgit2-sys/debian/changelog +++ b/src/libgit2-sys/debian/changelog @@ -1,3 +1,9 @@ +rust-libgit2-sys (0.12.13-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package libgit2-sys 0.12.13+1.0.1 from crates.io using debcargo 2.4.3 + + -- Ximin Luo Thu, 01 Oct 2020 21:34:39 +0100 + rust-libgit2-sys (0.10.0-1) unstable; urgency=medium * Package libgit2-sys 0.10.0 from crates.io using debcargo 2.4.2 diff --git a/src/libgit2-sys/debian/patches/abi-compat-0.28.3.patch b/src/libgit2-sys/debian/patches/abi-compat-0.28.3.patch deleted file mode 100644 index 43c1c97..0000000 --- a/src/libgit2-sys/debian/patches/abi-compat-0.28.3.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/lib.rs -+++ b/lib.rs -@@ -331,7 +331,6 @@ - pub push_negotiation: Option, - pub transport: Option, - pub payload: *mut c_void, -- pub resolve_url: Option, - } - - #[repr(C)] diff --git a/src/libgit2-sys/debian/patches/no-special-snowflake-env.patch b/src/libgit2-sys/debian/patches/no-special-snowflake-env.patch index d9d3a91..88e59b8 100644 --- a/src/libgit2-sys/debian/patches/no-special-snowflake-env.patch +++ b/src/libgit2-sys/debian/patches/no-special-snowflake-env.patch @@ -1,20 +1,20 @@ --- a/build.rs +++ b/build.rs -@@ -7,7 +7,7 @@ - let https = env::var("CARGO_FEATURE_HTTPS").is_ok(); - let ssh = env::var("CARGO_FEATURE_SSH").is_ok(); - -- if env::var("LIBGIT2_SYS_USE_PKG_CONFIG").is_ok() { -+ if true { +@@ -11,7 +11,7 @@ + // To use zlib-ng in zlib-compat mode, we have to build libgit2 ourselves. + if !zlib_ng_compat { let mut cfg = pkg_config::Config::new(); - if let Ok(lib) = cfg.atleast_version("0.28.0").probe("libgit2") { +- if let Ok(lib) = cfg.atleast_version("1.0.0").probe("libgit2") { ++ if let Ok(lib) = cfg.probe("libgit2") { for include in &lib.include_paths { -@@ -17,7 +17,7 @@ + println!("cargo:root={}", include.display()); + } +@@ -19,7 +19,7 @@ } } - if !Path::new("libgit2/.git").exists() { + if false { let _ = Command::new("git") - .args(&["submodule", "update", "--init"]) + .args(&["submodule", "update", "--init", "libgit2"]) .status(); diff --git a/src/libgit2-sys/debian/patches/series b/src/libgit2-sys/debian/patches/series index 54a9d18..206beed 100644 --- a/src/libgit2-sys/debian/patches/series +++ b/src/libgit2-sys/debian/patches/series @@ -1,2 +1 @@ no-special-snowflake-env.patch -abi-compat-0.28.3.patch diff --git a/src/libssh2-sys/debian/changelog b/src/libssh2-sys/debian/changelog index 1a18ca9..d9583a3 100644 --- a/src/libssh2-sys/debian/changelog +++ b/src/libssh2-sys/debian/changelog @@ -1,3 +1,9 @@ +rust-libssh2-sys (0.2.19-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package libssh2-sys 0.2.19 from crates.io using debcargo 2.4.3 + + -- Ximin Luo Thu, 01 Oct 2020 21:42:34 +0100 + rust-libssh2-sys (0.2.13-1) unstable; urgency=medium * Package libssh2-sys 0.2.13 from crates.io using debcargo 2.4.0 diff --git a/src/libssh2-sys/debian/copyright b/src/libssh2-sys/debian/copyright index 9bdc18f..7b93b57 100644 --- a/src/libssh2-sys/debian/copyright +++ b/src/libssh2-sys/debian/copyright @@ -13,8 +13,8 @@ Files: debian/* Copyright: - 2018-2019 Debian Rust Maintainers - 2018-2019 Ximin Luo + 2018-2020 Debian Rust Maintainers + 2018-2020 Ximin Luo License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/libssh2-sys/debian/copyright.debcargo.hint b/src/libssh2-sys/debian/copyright.debcargo.hint index b3613c0..f5b0cf6 100644 --- a/src/libssh2-sys/debian/copyright.debcargo.hint +++ b/src/libssh2-sys/debian/copyright.debcargo.hint @@ -18,8 +18,8 @@ Files: debian/* Copyright: - 2018-2019 Debian Rust Maintainers - 2018-2019 Ximin Luo + 2018-2020 Debian Rust Maintainers + 2018-2020 Ximin Luo License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/libssh2-sys/debian/patches/disable-vendored.patch b/src/libssh2-sys/debian/patches/disable-vendored.patch index 17ebe21..dd86bcd 100644 --- a/src/libssh2-sys/debian/patches/disable-vendored.patch +++ b/src/libssh2-sys/debian/patches/disable-vendored.patch @@ -6,6 +6,6 @@ [features] -vendored-openssl = ["openssl-sys/vendored"] +vendored-openssl = [] + zlib-ng-compat = ["libz-sys/zlib-ng"] [target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] version = "0.2" - [target."cfg(unix)".dependencies.openssl-sys] diff --git a/src/libssh2-sys/debian/patches/no-special-snowflake-env.patch b/src/libssh2-sys/debian/patches/no-special-snowflake-env.patch index 46dceb5..63dbca8 100644 --- a/src/libssh2-sys/debian/patches/no-special-snowflake-env.patch +++ b/src/libssh2-sys/debian/patches/no-special-snowflake-env.patch @@ -1,14 +1,14 @@ --- a/build.rs +++ b/build.rs @@ -17,7 +17,7 @@ - // The system copy of libssh2 is not used by default because it // can lead to having two copies of libssl loaded at once. // See https://github.com/alexcrichton/ssh2-rs/pull/88 + println!("cargo:rerun-if-env-changed=LIBSSH2_SYS_USE_PKG_CONFIG"); - if env::var("LIBSSH2_SYS_USE_PKG_CONFIG").is_ok() { + if true { - if let Ok(lib) = pkg_config::find_library("libssh2") { - for path in &lib.include_paths { - println!("cargo:include={}", path.display()); + if zlib_ng_compat { + panic!("LIBSSH2_SYS_USE_PKG_CONFIG set, but cannot use zlib-ng-compat with system libssh2"); + } @@ -26,7 +26,7 @@ } } diff --git a/src/libz-sys/debian/changelog b/src/libz-sys/debian/changelog index 1ed09c4..37bf91a 100644 --- a/src/libz-sys/debian/changelog +++ b/src/libz-sys/debian/changelog @@ -1,3 +1,9 @@ +rust-libz-sys (1.1.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package libz-sys 1.1.2 from crates.io using debcargo 2.4.3 + + -- Ximin Luo Thu, 01 Oct 2020 21:33:05 +0100 + rust-libz-sys (1.0.25-1) unstable; urgency=medium * Team upload. diff --git a/src/libz-sys/debian/copyright b/src/libz-sys/debian/copyright index a15ca11..cec82b0 100644 --- a/src/libz-sys/debian/copyright +++ b/src/libz-sys/debian/copyright @@ -1,16 +1,20 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: libz-sys -Upstream-Contact: Alex Crichton -Source: https://github.com/alexcrichton/libz-sys +Upstream-Contact: + Alex Crichton + Josh Triplett +Source: https://github.com/rust-lang/libz-sys Files: * -Copyright: 2014-2018 Alex Crichton +Copyright: + 2014-2020 Alex Crichton + 2020 Josh Triplett License: MIT or Apache-2.0 Files: debian/* Copyright: - 2018 Debian Rust Maintainers - 2018 Ximin Luo + 2018-2020 Debian Rust Maintainers + 2018-2020 Ximin Luo License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/libz-sys/debian/copyright.debcargo.hint b/src/libz-sys/debian/copyright.debcargo.hint index 1e35948..d216cbd 100644 --- a/src/libz-sys/debian/copyright.debcargo.hint +++ b/src/libz-sys/debian/copyright.debcargo.hint @@ -1,10 +1,14 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: libz-sys -Upstream-Contact: Alex Crichton -Source: https://github.com/alexcrichton/libz-sys +Upstream-Contact: + Alex Crichton + Josh Triplett +Source: https://github.com/rust-lang/libz-sys Files: * -Copyright: FIXME (overlay) UNKNOWN-YEARS Alex Crichton +Copyright: + FIXME (overlay) UNKNOWN-YEARS Alex Crichton + FIXME (overlay) UNKNOWN-YEARS Josh Triplett License: MIT or Apache-2.0 Comment: FIXME (overlay): Since upstream copyright years are not available in @@ -13,7 +17,9 @@ the archive. Files: ./LICENSE-MIT -Copyright: 2014 Alex Crichton +Copyright: + 2014 Alex Crichton + 2020 Josh Triplett License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them @@ -21,8 +27,8 @@ Files: debian/* Copyright: - 2018 Debian Rust Maintainers - 2018 Ximin Luo + 2018-2020 Debian Rust Maintainers + 2018-2020 Ximin Luo License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/libz-sys/debian/debcargo.toml b/src/libz-sys/debian/debcargo.toml index fd9427d..e8ead2e 100644 --- a/src/libz-sys/debian/debcargo.toml +++ b/src/libz-sys/debian/debcargo.toml @@ -1,6 +1,7 @@ overlay = "." uploaders = ["Ximin Luo "] excludes = ["src/zlib-*/**", "src/zlib/**"] +whitelist = ["src/smoke.c"] [packages.lib] depends = ["zlib1g-dev"] diff --git a/src/semver/debian/changelog b/src/semver/debian/changelog index 6c68537..b14ced1 100644 --- a/src/semver/debian/changelog +++ b/src/semver/debian/changelog @@ -1,3 +1,9 @@ +rust-semver (0.11.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package semver 0.11.0 from crates.io using debcargo 2.4.3 + + -- Ximin Luo Thu, 01 Oct 2020 21:08:22 +0100 + rust-semver (0.9.0-1) unstable; urgency=medium * Package semver 0.9.0 from crates.io using debcargo 2.2.8 diff --git a/src/semver/debian/copyright b/src/semver/debian/copyright index 39d0704..afd9c65 100644 --- a/src/semver/debian/copyright +++ b/src/semver/debian/copyright @@ -7,14 +7,14 @@ Files: * Copyright: - 2012-2014 Steve Klabnik + 2012-2020 Steve Klabnik 2012-2014 The Rust Project Developers License: MIT or Apache-2.0 Files: debian/* Copyright: - 2018 Debian Rust Maintainers - 2018 Ximin Luo + 2018-2020 Debian Rust Maintainers + 2018-2020 Ximin Luo License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/semver/debian/copyright.debcargo.hint b/src/semver/debian/copyright.debcargo.hint index 901c556..bcdd89e 100644 --- a/src/semver/debian/copyright.debcargo.hint +++ b/src/semver/debian/copyright.debcargo.hint @@ -46,8 +46,8 @@ Files: debian/* Copyright: - 2018 Debian Rust Maintainers - 2018 Ximin Luo + 2018-2020 Debian Rust Maintainers + 2018-2020 Ximin Luo License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/semver-parser/debian/changelog b/src/semver-parser/debian/changelog index 29d9177..cb13199 100644 --- a/src/semver-parser/debian/changelog +++ b/src/semver-parser/debian/changelog @@ -1,3 +1,9 @@ +rust-semver-parser (0.10.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package semver-parser 0.10.0 from crates.io using debcargo 2.4.3 + + -- Ximin Luo Thu, 01 Oct 2020 21:08:42 +0100 + rust-semver-parser (0.9.0-1) unstable; urgency=medium * Package semver-parser 0.9.0 from crates.io using debcargo 2.1.1 diff --git a/src/semver-parser/debian/copyright b/src/semver-parser/debian/copyright index 3bdcc90..38bfa3e 100644 --- a/src/semver-parser/debian/copyright +++ b/src/semver-parser/debian/copyright @@ -4,12 +4,13 @@ Source: https://github.com/steveklabnik/semver-parser Files: * -Copyright: 2016-2018 Steve Klabnik +Copyright: 2016-2020 Steve Klabnik License: MIT or Apache-2.0 Files: debian/* -Copyright: 2018 Rust Maintainers - 2018 Ximin Luo +Copyright: + 2018-2020 Rust Maintainers + 2018-2020 Ximin Luo License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/semver-parser/debian/copyright.debcargo.hint b/src/semver-parser/debian/copyright.debcargo.hint index b3cd6d3..8bba711 100644 --- a/src/semver-parser/debian/copyright.debcargo.hint +++ b/src/semver-parser/debian/copyright.debcargo.hint @@ -4,7 +4,7 @@ Source: https://github.com/steveklabnik/semver-parser Files: * -Copyright: FIXME (overlay) UNKNOWN Steve Klabnik +Copyright: FIXME (overlay) UNKNOWN-YEARS Steve Klabnik License: MIT or Apache-2.0 Comment: FIXME (overlay): Since upstream copyright years are not available in @@ -14,14 +14,15 @@ Files: ./LICENSE-MIT Copyright: 2016 Steve Klabnik -License: UNKNOWN; FIXME (overlay) +License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. Files: debian/* -Copyright: 2018 Rust Maintainers - 2018 FIXME (overlay) Your Name +Copyright: + 2018-2020 Debian Rust Maintainers + 2018-2020 Ximin Luo License: MIT or Apache-2.0 License: Apache-2.0 @@ -46,6 +47,3 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - - diff --git a/src/semver-parser/debian/debcargo.toml b/src/semver-parser/debian/debcargo.toml index 62cc3f7..fdbb775 100644 --- a/src/semver-parser/debian/debcargo.toml +++ b/src/semver-parser/debian/debcargo.toml @@ -1 +1,2 @@ overlay = "." +uploaders = ["Ximin Luo "] diff --git a/src/typenum/debian/changelog b/src/typenum/debian/changelog index 9cf631f..633cdda 100644 --- a/src/typenum/debian/changelog +++ b/src/typenum/debian/changelog @@ -1,3 +1,10 @@ +rust-typenum (1.12.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package typenum 1.12.0 from crates.io using debcargo 2.4.3 + + -- Ximin Luo Thu, 01 Oct 2020 21:09:46 +0100 + rust-typenum (1.11.2-1) unstable; urgency=medium * Team upload. diff --git a/src/typenum/debian/copyright.debcargo.hint b/src/typenum/debian/copyright.debcargo.hint index cef8312..1fba0a8 100644 --- a/src/typenum/debian/copyright.debcargo.hint +++ b/src/typenum/debian/copyright.debcargo.hint @@ -25,8 +25,8 @@ Files: debian/* Copyright: - 2018-2019 Debian Rust Maintainers - 2018-2019 kpcyrd + 2018-2020 Debian Rust Maintainers + 2018-2020 kpcyrd License: MIT or Apache-2.0 License: Apache-2.0