bindgen: update to 0.59.1

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/src/bindgen/debian/changelog b/src/bindgen/debian/changelog
index 50e25b96e6120fa51812ba47a7dcaab554982bc0..1e630db93ceb8b5d0beae83290b2dd13fc244a8f 100644 (file)
--- a/src/bindgen/debian/changelog
+++ b/src/bindgen/debian/changelog
@@ -1,3 +1,29 @@
+rust-bindgen (0.59.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * Package bindgen 0.59.1 from crates.io using debcargo 2.4.4
+    + Regenerating packaging with debcargo will allow rust-bindgen+env-logger
+      to be installed with both old and new versions of rust-env-logger.
+
+ -- Peter Michael Green <plugwash@debian.org>  Fri, 12 Nov 2021 02:44:31 +0000
+
+rust-bindgen (0.59.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * add patch to relax dependency on Rust library env_logger,
+    and update (build-)dependencies on librust-env-logger-*-dev;
+    this closes: bug#998347
+  * fix Cargo.toml checksum hint file
+
+ -- Jonas Smedegaard <dr@jones.dk>  Tue, 02 Nov 2021 19:36:53 +0100
+
+rust-bindgen (0.59.1-1) unstable; urgency=medium
+
+  * Team upload.
+  * Package bindgen 0.59.1 from crates.io using debcargo 2.4.4-alpha.0
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 22 Aug 2021 17:37:34 +0200
+
 rust-bindgen (0.55.1-3) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/bindgen/debian/copyright.debcargo.hint b/src/bindgen/debian/copyright.debcargo.hint
index 1393758a28a3866f89523701746207882d36cba1..7fe1b428198909a350cce117d677492aa2772988 100644 (file)
--- a/src/bindgen/debian/copyright.debcargo.hint
+++ b/src/bindgen/debian/copyright.debcargo.hint
@@ -29,9 +29,9 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2020 Ximin Luo <infinity0@debian.org>
- 2018-2020 kpcyrd <git@rxv.cc>
+ 2018-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2021 Ximin Luo <infinity0@debian.org>
+ 2018-2021 kpcyrd <git@rxv.cc>
 License: BSD-3-Clause
 
 License: BSD-3-Clause

diff --git a/src/bindgen/debian/patches/disable-runtime.diff b/src/bindgen/debian/patches/disable-runtime.diff
index 64d7dd62140c7925800df535c5b5683f9144fdd8..35211c39ca2432f7cc53effc556a2dd017ac26ec 100644 (file)
--- a/src/bindgen/debian/patches/disable-runtime.diff
+++ b/src/bindgen/debian/patches/disable-runtime.diff
@@ -2,8 +2,8 @@ Index: bindgen/Cargo.toml
 ===================================================================
 --- bindgen.orig/Cargo.toml
 +++ bindgen/Cargo.toml
-@@ -101,7 +101,7 @@ version = "0.1"
- version = "0.1"
+@@ -101,7 +101,7 @@ version = "1"
+ version = "3"
  
  [features]
 -default = ["logging", "clap", "runtime", "which-rustfmt"]

diff --git a/src/bindgen/debian/patches/env_logger.patch b/src/bindgen/debian/patches/env_logger.patch
new file mode 100644 (file)
index 0000000..4f1b17f
--- /dev/null
+++ b/src/bindgen/debian/patches/env_logger.patch
@@ -0,0 +1,21 @@
+Description: relax dependency on env_logger
+ Debian has only a newer release of env_logger,
+ which apparently works just fine.
+ .
+ This patch relaxes dependency from only release 0.7.0
+ to accept any 0.7.x through 0.9.x releases.
+Author: Jonas Smedegaard <dr@jones.dk>
+Last-Update: 2021-11-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -49,7 +49,7 @@
+ optional = true
+ 
+ [dependencies.env_logger]
+-version = "0.7"
++version = ">= 0.7, < 0.10"
+ optional = true
+ 
+ [dependencies.lazy_static]

diff --git a/src/bindgen/debian/patches/lower-dep.diff b/src/bindgen/debian/patches/lower-dep.diff
new file mode 100644 (file)
index 0000000..13f9734
--- /dev/null
+++ b/src/bindgen/debian/patches/lower-dep.diff
@@ -0,0 +1,31 @@
+Index: bindgen/Cargo.toml
+===================================================================
+--- bindgen.orig/Cargo.toml
++++ bindgen/Cargo.toml
+@@ -38,7 +38,7 @@ required-features = ["clap"]
+ version = "1.0.3"
+ 
+ [dependencies.cexpr]
+-version = "0.5"
++version = "0.4"
+ 
+ [dependencies.clang-sys]
+ version = "1"
+@@ -49,7 +49,7 @@ version = "2"
+ optional = true
+ 
+ [dependencies.env_logger]
+-version = "0.8"
++version = "0.7"
+ optional = true
+ 
+ [dependencies.lazy_static]
+@@ -82,7 +82,7 @@ default-features = false
+ version = "1.0.1"
+ 
+ [dependencies.shlex]
+-version = "1"
++version = "0.1"
+ 
+ [dependencies.which]
+ version = "3.0"

diff --git a/src/bindgen/debian/patches/series b/src/bindgen/debian/patches/series
index f0f49ae04c9b73b501cbc7a1317b1d3fdb7d5ed5..0e8bbbba2cdadf1e589708e98fd6f72654ef560e 100644 (file)
--- a/src/bindgen/debian/patches/series
+++ b/src/bindgen/debian/patches/series
@@ -1 +1,3 @@
 disable-runtime.diff
+lower-dep.diff
+env_logger.patch

diff --git a/src/bindgen/debian/rules b/src/bindgen/debian/rules
new file mode 100644 (file)
index 0000000..728b5aa
--- /dev/null
+++ b/src/bindgen/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+%:
+       dh $@ --buildsystem cargo
+
+execute_after_dh_testdir:
+       find . ! -newermt "jan 01, 2000" -exec touch {} +

diff --git a/src/bindgen/debian/rules.debcargo.hint b/src/bindgen/debian/rules.debcargo.hint
new file mode 100755 (executable)
index 0000000..044c1c2
--- /dev/null
+++ b/src/bindgen/debian/rules.debcargo.hint
@@ -0,0 +1,3 @@
+#!/usr/bin/make -f
+%:
+       dh $@ --buildsystem cargo