lalrpop: relax ena dependency to permit 0.14

lalrpop upstream does an un-motivated bump to ena 0.14 in
075150bc8e61f8d450740e589a54fade778f426d, so this appears to be safe.

ena 0.14 is not yet in debian, but it is a requirement for lalrpop
0.19.1, so this should let us update ena without forcing the lalrpop
upgrade at the same time.

diff --git a/src/lalrpop/debian/changelog b/src/lalrpop/debian/changelog
index f820407c8284726763c80584b5dd36ee60300aef..980841ffbaadd3b13f342234dffbfd77fc90272a 100644 (file)
--- a/src/lalrpop/debian/changelog
+++ b/src/lalrpop/debian/changelog
@@ -1,3 +1,10 @@
+rust-lalrpop (0.17.2-6) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * relax dependency on ena to allow 0.14
+  * Package lalrpop 0.17.2 from crates.io using debcargo 2.4.3
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Wed, 14 Oct 2020 11:45:36 -0400
+
 rust-lalrpop (0.17.2-5) unstable; urgency=medium
 
   * bump dependency on itertools to 0.9

diff --git a/src/lalrpop/debian/patches/ena-relax-0.14.patch b/src/lalrpop/debian/patches/ena-relax-0.14.patch
new file mode 100644 (file)
index 0000000..9947585
--- /dev/null
+++ b/src/lalrpop/debian/patches/ena-relax-0.14.patch
@@ -0,0 +1,11 @@
+--- a/Cargo.toml       2020-10-14 11:44:16.338002171 -0400
++++ b/Cargo.toml       2020-10-14 11:43:57.061944563 -0400
+@@ -40,7 +40,7 @@
+ version = "1"
+ 
+ [dependencies.ena]
+-version = "0.13"
++version = ">= 0.13, < 0.15"
+ 
+ [dependencies.itertools]
+ version = ">= 0.8, < 0.10"

diff --git a/src/lalrpop/debian/patches/itertools-bump-0.9.patch b/src/lalrpop/debian/patches/itertools-bump-0.9.patch
deleted file mode 100644 (file)
index 7644ded..0000000
--- a/src/lalrpop/debian/patches/itertools-bump-0.9.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Cargo.toml       2020-10-14 09:47:43.631540014 -0400
-+++ b/Cargo.toml       2020-10-14 09:48:52.512188533 -0400
-@@ -43,7 +43,7 @@
- version = "0.13"
- 
- [dependencies.itertools]
--version = "0.8"
-+version = ">= 0.8, < 0.10"
- 
- [dependencies.lalrpop-util]
- version = "0.17.2"

diff --git a/src/lalrpop/debian/patches/itertools-relax-0.9.patch b/src/lalrpop/debian/patches/itertools-relax-0.9.patch
new file mode 100644 (file)
index 0000000..7644ded
--- /dev/null
+++ b/src/lalrpop/debian/patches/itertools-relax-0.9.patch
@@ -0,0 +1,11 @@
+--- a/Cargo.toml       2020-10-14 09:47:43.631540014 -0400
++++ b/Cargo.toml       2020-10-14 09:48:52.512188533 -0400
+@@ -43,7 +43,7 @@
+ version = "0.13"
+ 
+ [dependencies.itertools]
+-version = "0.8"
++version = ">= 0.8, < 0.10"
+ 
+ [dependencies.lalrpop-util]
+ version = "0.17.2"

diff --git a/src/lalrpop/debian/patches/series b/src/lalrpop/debian/patches/series
index becacb712476472d522cde314577540472b5494e..68ea5f54b3b4ac119fc777506e027ecb212e23e2 100644 (file)
--- a/src/lalrpop/debian/patches/series
+++ b/src/lalrpop/debian/patches/series
@@ -1,4 +1,5 @@
 unicode-xid-bump-0.2.patch
 string_cache-bump-0.8.0.patch
 petgraph-bump-0.5.patch
-itertools-bump-0.9.patch
+itertools-relax-0.9.patch
+ena-relax-0.14.patch