update smallvec and some rdeps

diff --git a/dev/link-patches.sh b/dev/link-patches.sh
index ee2437fd556b7aec9eac7ccc3880771174f87302..11d76d7c1f652e1eb0d9512cd2174b8fcfd6183f 100755 (executable)
--- a/dev/link-patches.sh
+++ b/dev/link-patches.sh
@@ -1,5 +1,13 @@
 #!/bin/sh
 # Symlink {build => src}/$pkg/debian/patches for easier editing.
+#
+# If you give a second argument $2, will create this patch, add Cargo.toml to
+# it, open it for editing, refresh the patch, and call cargo build for you.
+#
+# If the build succeeds, exits with success, and you can re-rerun update.sh
+# If the build fails, will "quilt add" everything so you can begin editing the
+# files without forgetting to add them.
+
 set -e
 
 pkg="$1"
@@ -13,3 +21,30 @@ test -d "src/$pkg/debian/patches" || mkdir "src/$pkg/debian/patches"
 rm -rf "build/$pkg/debian/patches"
 rm -rf "build/$pkg/.pc"
 ln -sfT "$PWD/src/$pkg/debian/patches" "build/$pkg/debian/patches"
+
+if [ -z "$2" ]; then exit 0; fi
+
+cd "build/$pkg"
+export QUILT_PATCHES=debian/patches
+patchname="${2%.patch}.patch"
+quilt new "$patchname"
+quilt add Cargo.toml
+sensible-editor Cargo.toml
+quilt refresh
+find src -type f -execdir quilt add '{}' +
+
+while ! cargo build; do
+
+cat <<-eof
+Spawning a sub-shell. Please try to fix the build failure by editing files in
+src/, which have been already quilt-added for you to $patchname. Afterwards,
+don't forgot to run "quilt refresh". To exit this loop without having fixed the
+problem, press Ctrl-D then quickly Ctrl-C.
+eof
+$SHELL
+quilt refresh
+cargo build
+
+done
+
+echo "patching was a success!"

diff --git a/src/once-cell/debian/changelog b/src/once-cell/debian/changelog
index f64e2d260c1f2493b8674ee87e8d18e9e57b1b03..62503c4f2616d4a9618d4d9b9cbc8af5d9a666d1 100644 (file)
--- a/src/once-cell/debian/changelog
+++ b/src/once-cell/debian/changelog
@@ -1,9 +1,13 @@
 rust-once-cell (1.2.0-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
 
+  * Team upload.
+  * Package once_cell 1.2.0 from crates.io using debcargo 2.4.2
+
+  [ Nikos Tsipinakis ]
   * Patch failing reentrant_init test
   * Package once_cell 1.2.0 from crates.io using debcargo 2.4.1
 
- -- Nikos Tsipinakis <nikos@tsipinakis.com>  Wed, 08 Jan 2020 13:50:41 +0000
+ -- Ximin Luo <infinity0@debian.org>  Wed, 08 Jan 2020 22:25:49 +0000
 
 rust-once-cell (1.2.0-1) unstable; urgency=medium
 

diff --git a/src/once-cell/debian/patches/series b/src/once-cell/debian/patches/series
index 224593f34bebe6a107f85b6d174eb9d202257836..30588c437b386e4ade1818b262619b31151cc395 100644 (file)
--- a/src/once-cell/debian/patches/series
+++ b/src/once-cell/debian/patches/series
@@ -1 +1,2 @@
+update-parking-lot.patch
 fix-reentrant-init-test.patch

diff --git a/src/once-cell/debian/patches/update-parking-lot.patch b/src/once-cell/debian/patches/update-parking-lot.patch
new file mode 100644 (file)
index 0000000..74d932e
--- /dev/null
+++ b/src/once-cell/debian/patches/update-parking-lot.patch
@@ -0,0 +1,13 @@
+Index: once-cell/Cargo.toml
+===================================================================
+--- once-cell.orig/Cargo.toml
++++ once-cell/Cargo.toml
+@@ -44,7 +44,7 @@ required-features = ["std"]
+ name = "regex"
+ required-features = ["std"]
+ [dependencies.parking_lot]
+-version = "0.9.0"
++version = "0.10.0"
+ optional = true
+ default_features = false
+ [dev-dependencies.crossbeam-utils]

diff --git a/src/parking-lot-core/debian/changelog b/src/parking-lot-core/debian/changelog
index 9ba7a0c2ae0890c0714eca001b2f3ec6b1cc29f5..800a53a06a1ee369a28989521b50492c0430497d 100644 (file)
--- a/src/parking-lot-core/debian/changelog
+++ b/src/parking-lot-core/debian/changelog
@@ -1,3 +1,10 @@
+rust-parking-lot-core (0.7.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package parking_lot_core 0.7.0 from crates.io using debcargo 2.4.2
+
+ -- Ximin Luo <infinity0@debian.org>  Wed, 08 Jan 2020 22:25:36 +0000
+
 rust-parking-lot-core (0.6.2-1) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/parking-lot-core/debian/copyright.debcargo.hint b/src/parking-lot-core/debian/copyright.debcargo.hint
index 0ab3233a00f41470fe55af7ff19bc055c5723b5c..a76ba9d28a9cb66a31aebcc4498136916745dea3 100644 (file)
--- a/src/parking-lot-core/debian/copyright.debcargo.hint
+++ b/src/parking-lot-core/debian/copyright.debcargo.hint
@@ -133,9 +133,9 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2018-2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2019 Sylvestre Ledru <sylvestre@debian.org>
- 2018-2019 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+ 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2020 Sylvestre Ledru <sylvestre@debian.org>
+ 2018-2020 Wolfgang Silbermayr <wolfgang@silbermayr.at>
 License: Apache-2.0 or MIT
 
 License: Apache-2.0

diff --git a/src/parking-lot-core/debian/patches/series b/src/parking-lot-core/debian/patches/series
new file mode 100644 (file)
index 0000000..9224b48
--- /dev/null
+++ b/src/parking-lot-core/debian/patches/series
@@ -0,0 +1 @@
+update-dep-smallvec.patch

diff --git a/src/parking-lot-core/debian/patches/update-dep-smallvec.patch b/src/parking-lot-core/debian/patches/update-dep-smallvec.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/parking-lot/debian/changelog b/src/parking-lot/debian/changelog
index 9b62f9bfd1c7cb9a56a5dc99ad293470065f0034..789016fb4a513198c9df546b63a32bbfa48f41a5 100644 (file)
--- a/src/parking-lot/debian/changelog
+++ b/src/parking-lot/debian/changelog
@@ -1,3 +1,10 @@
+rust-parking-lot (0.10.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package parking_lot 0.10.0 from crates.io using debcargo 2.4.2
+
+ -- Ximin Luo <infinity0@debian.org>  Wed, 08 Jan 2020 22:25:39 +0000
+
 rust-parking-lot (0.9.0-1) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/parking-lot/debian/copyright.debcargo.hint b/src/parking-lot/debian/copyright.debcargo.hint
index 473c148576986dc6c28c111c6bad1bd110b05fb7..f9e25f6c8a86ff9b7f0cb48f5f606a17d1ff5f9e 100644 (file)
--- a/src/parking-lot/debian/copyright.debcargo.hint
+++ b/src/parking-lot/debian/copyright.debcargo.hint
@@ -91,9 +91,9 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2018-2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2019 Sylvestre Ledru <sylvestre@debian.org>
- 2018-2019 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+ 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2020 Sylvestre Ledru <sylvestre@debian.org>
+ 2018-2020 Wolfgang Silbermayr <wolfgang@silbermayr.at>
 License: Apache-2.0 or MIT
 
 License: Apache-2.0

diff --git a/src/smallvec/debian/changelog b/src/smallvec/debian/changelog
index b8804a1e424697e3e38d09b4462a77ec0125eba4..dfcea00105c8392bf2072b66b044c66499aeb1f7 100644 (file)
--- a/src/smallvec/debian/changelog
+++ b/src/smallvec/debian/changelog
@@ -1,3 +1,10 @@
+rust-smallvec (1.1.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package smallvec 1.1.0 from crates.io using debcargo 2.4.2
+
+ -- Ximin Luo <infinity0@debian.org>  Wed, 08 Jan 2020 22:26:50 +0000
+
 rust-smallvec (0.6.10-1) unstable; urgency=medium
 
   * Package smallvec 0.6.10 from crates.io using debcargo 2.3.1-alpha.0

diff --git a/src/smallvec/debian/copyright.debcargo.hint b/src/smallvec/debian/copyright.debcargo.hint
index 024eead6d15032d32043d5947fd4902dcb95a594..b0377cf0ee0944f0db8ad0a0453cc13b2711aa3d 100644 (file)
--- a/src/smallvec/debian/copyright.debcargo.hint
+++ b/src/smallvec/debian/copyright.debcargo.hint
@@ -21,9 +21,9 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2018-2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2019 kpcyrd <git@rxv.cc>
- 2018-2019 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+ 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2020 kpcyrd <git@rxv.cc>
+ 2018-2020 Wolfgang Silbermayr <wolfgang@silbermayr.at>
 License: MIT or Apache-2.0
 
 License: Apache-2.0