debcargo: update to 2.4.1 and force everyone to use it

diff --git a/src/debcargo/debian/changelog b/src/debcargo/debian/changelog
index f84a7aebee1f145da547a5a3a4504d5f1d155f93..229d3b2d96a9e8041aa958cecef7a15105e77e14 100644 (file)
--- a/src/debcargo/debian/changelog
+++ b/src/debcargo/debian/changelog
@@ -1,3 +1,10 @@
+rust-debcargo (2.4.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package debcargo 2.4.1 from crates.io using debcargo 2.4.1
+  * Closes: #945436, #945499, #945560, #947088.
+
+ -- Ximin Luo <infinity0@debian.org>  Fri, 03 Jan 2020 01:19:08 +0000
+
 rust-debcargo (2.4.0-1) unstable; urgency=medium
 
   * Package debcargo 2.4.0 from crates.io using debcargo 2.4.0

diff --git a/src/debcargo/debian/copyright.debcargo.hint b/src/debcargo/debian/copyright.debcargo.hint
index 3e86f1ee86bdc8086a3366f55ed3def860f71bd3..bd21118a9926830358fe0d5bc086a90e60ba4fd9 100644 (file)
--- a/src/debcargo/debian/copyright.debcargo.hint
+++ b/src/debcargo/debian/copyright.debcargo.hint
@@ -27,8 +27,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2018-2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2019 Ximin Luo <infinity0@debian.org>
+ 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2020 Ximin Luo <infinity0@debian.org>
 License: MIT or Apache-2.0
 
 License: Apache-2.0

diff --git a/vars.sh.frag b/vars.sh.frag
index 30d1caff5606ed383c58b123ec8af7217745056c..a4967b8b5e36bfc36eb7ded66e531fd3afab9d7a 100644 (file)
--- a/vars.sh.frag
+++ b/vars.sh.frag
@@ -35,9 +35,7 @@ fi
 test -x "$DEBCARGO" || abort 1 "debcargo found but not executable: $DEBCARGO"
 dcver=$($DEBCARGO --version | sed -ne 's/debcargo //p')
 case $dcver in
-2.0.*|2.1.*|2.2.[0123456789]|2.2.[0123456789]-*)       abort 1 "unsupported debcargo version $dcver. try reinstalling with \`cargo install debcargo --force\`";;
-2.2.*) true;;
-2.3.*) true;;
+2.0.*|2.1.*|2.2.*|2.3.*)       abort 1 "unsupported debcargo version $dcver. try reinstalling with \`cargo install debcargo --force\`";;
 2.4.*) true;;
 *)     abort 1 "unsupported debcargo version: $dcver";;
 esac