pest: update to 2.7.3

for syn 2.x

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

diff --git a/src/pest-derive/debian/changelog b/src/pest-derive/debian/changelog
index f9185d2641b62226b3174546a23dd7a348314cdf..84af83366b7a95b6f9768a42c11265ffd5bc1703 100644 (file)
--- a/src/pest-derive/debian/changelog
+++ b/src/pest-derive/debian/changelog
@@ -1,3 +1,10 @@
+rust-pest-derive (2.7.3-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package pest_derive 2.7.3 from crates.io using debcargo 2.6.0
+
+ -- Fabian Grünbichler <f.gruenbichler@proxmox.com>  Thu, 21 Sep 2023 09:49:19 +0200
+
 rust-pest-derive (2.5.2-1) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/pest-derive/debian/copyright.debcargo.hint b/src/pest-derive/debian/copyright.debcargo.hint
index 46d3ea2d9531ad82c04716c7db6b1d66e9d1e436..f896647609dc0106dd0b122bcbc3758576ff1521 100644 (file)
--- a/src/pest-derive/debian/copyright.debcargo.hint
+++ b/src/pest-derive/debian/copyright.debcargo.hint
@@ -63,8 +63,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2020-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2020-2022 Arnaud Ferraris <arnaud.ferraris@gmail.com>
+ 2020-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2020-2023 Arnaud Ferraris <arnaud.ferraris@gmail.com>
 License: MIT or Apache-2.0
 
 License: Apache-2.0

diff --git a/src/pest-generator/debian/changelog b/src/pest-generator/debian/changelog
index 30363683292e69a4e01b14b87e9536267cb525aa..1e5686467678ba4aa6fb2e562ac9aba2de05f2b6 100644 (file)
--- a/src/pest-generator/debian/changelog
+++ b/src/pest-generator/debian/changelog
@@ -1,3 +1,10 @@
+rust-pest-generator (2.7.3-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package pest_generator 2.7.3 from crates.io using debcargo 2.6.0
+
+ -- Fabian Grünbichler <f.gruenbichler@proxmox.com>  Thu, 21 Sep 2023 09:49:18 +0200
+
 rust-pest-generator (2.5.2-1) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/pest-generator/debian/copyright.debcargo.hint b/src/pest-generator/debian/copyright.debcargo.hint
index 50a4422be6317bd4efedfa943c942136e2d700da..682fb4bd7f7c8a7b8dfa4a2422b5d4ede265e181 100644 (file)
--- a/src/pest-generator/debian/copyright.debcargo.hint
+++ b/src/pest-generator/debian/copyright.debcargo.hint
@@ -35,8 +35,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2019-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2019-2022 Robin Krahl <robin.krahl@ireas.org>
+ 2019-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2019-2023 Robin Krahl <robin.krahl@ireas.org>
 License: MIT or Apache-2.0
 
 License: Apache-2.0

diff --git a/src/pest-meta/debian/changelog b/src/pest-meta/debian/changelog
index 72984a0c8ec0b300fe0d7169feb01d6cab8c1598..898222a89f3172db9aa7b5683c804d4530598e05 100644 (file)
--- a/src/pest-meta/debian/changelog
+++ b/src/pest-meta/debian/changelog
@@ -1,3 +1,10 @@
+rust-pest-meta (2.7.3-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package pest_meta 2.7.3 from crates.io using debcargo 2.6.0
+
+ -- Fabian Grünbichler <f.gruenbichler@proxmox.com>  Thu, 21 Sep 2023 09:52:27 +0200
+
 rust-pest-meta (2.5.2-1) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/pest-meta/debian/copyright.debcargo.hint b/src/pest-meta/debian/copyright.debcargo.hint
index f9082f0c60ed0caf4814db7dcd842b9f2db4a779..f00b83acf4c46aa2962f809c636bd96bc75277f6 100644 (file)
--- a/src/pest-meta/debian/copyright.debcargo.hint
+++ b/src/pest-meta/debian/copyright.debcargo.hint
@@ -105,8 +105,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2019-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2019-2022 Robin Krahl <robin.krahl@ireas.org>
+ 2019-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2019-2023 Robin Krahl <robin.krahl@ireas.org>
 License: MIT or Apache-2.0
 
 License: Apache-2.0

diff --git a/src/pest-meta/debian/patches/disable-tests-missing-testdata.patch b/src/pest-meta/debian/patches/disable-tests-missing-testdata.patch
index d86be1980791571970c1e540f54264d68025b09c..98f93f006e7b69f68f7574d509166635eab66beb 100644 (file)
--- a/src/pest-meta/debian/patches/disable-tests-missing-testdata.patch
+++ b/src/pest-meta/debian/patches/disable-tests-missing-testdata.patch
@@ -2,7 +2,7 @@ Index: pest-meta/src/parser.rs
 ===================================================================
 --- pest-meta.orig/src/parser.rs
 +++ pest-meta/src/parser.rs
-@@ -1578,7 +1578,7 @@ mod tests {
+@@ -1732,7 +1732,7 @@ mod tests {
          assert_eq!(unescape(string), None);
      }
  
@@ -11,7 +11,7 @@ Index: pest-meta/src/parser.rs
      fn handles_deep_nesting() {
          let sample1 = include_str!(concat!(
              env!("CARGO_MANIFEST_DIR"),
-@@ -1617,5 +1617,5 @@ mod tests {
+@@ -1771,5 +1771,5 @@ mod tests {
          let s5 = parse(Rule::grammar_rules, sample5);
          assert!(s5.is_err());
          assert_eq!(s5.unwrap_err().variant.message(), ERROR);

diff --git a/src/pest-meta/debian/patches/drop-cargo-dep.patch b/src/pest-meta/debian/patches/drop-cargo-dep.patch
new file mode 100644 (file)
index 0000000..b1d638f
--- /dev/null
+++ b/src/pest-meta/debian/patches/drop-cargo-dep.patch
@@ -0,0 +1,21 @@
+Index: pest-meta/Cargo.toml
+===================================================================
+--- pest-meta.orig/Cargo.toml
++++ pest-meta/Cargo.toml
+@@ -43,10 +43,6 @@ version = "1.8.0"
+ [dependencies.pest]
+ version = "2.7.3"
+ 
+-[build-dependencies.cargo]
+-version = "0.72.2"
+-optional = true
+-
+ [build-dependencies.sha2]
+ version = "0.10"
+ default-features = false
+@@ -54,4 +50,4 @@ default-features = false
+ [features]
+ default = []
+ grammar-extras = []
+-not-bootstrap-in-src = ["dep:cargo"]
++not-bootstrap-in-src = []

diff --git a/src/pest-meta/debian/patches/series b/src/pest-meta/debian/patches/series
index 241ef801834045e882f63d5c624919abf3dc0adb..2f03d01d3d7e1bd16ead9954ee068ed60898e1fe 100644 (file)
--- a/src/pest-meta/debian/patches/series
+++ b/src/pest-meta/debian/patches/series
@@ -1,2 +1,2 @@
-remove-dep-sha-1.patch
 disable-tests-missing-testdata.patch
+drop-cargo-dep.patch

diff --git a/src/pest/debian/changelog b/src/pest/debian/changelog
index ad3e9764eecbd585816f772080043950f3a82f5b..64335b9492b2f8c665a26f4992b9d766888a6f61 100644 (file)
--- a/src/pest/debian/changelog
+++ b/src/pest/debian/changelog
@@ -1,3 +1,10 @@
+rust-pest (2.7.3-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package pest 2.7.3 from crates.io using debcargo 2.6.0
+
+ -- Fabian Grünbichler <f.gruenbichler@proxmox.com>  Thu, 21 Sep 2023 09:49:14 +0200
+
 rust-pest (2.5.2-1) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/pest/debian/copyright.debcargo.hint b/src/pest/debian/copyright.debcargo.hint
index 48bdc2a613ecb5dc96840457bc748b42e314a80c..ecd3eebcab32725d776fb0e1336b53c100033f44 100644 (file)
--- a/src/pest/debian/copyright.debcargo.hint
+++ b/src/pest/debian/copyright.debcargo.hint
@@ -12,6 +12,13 @@ Comment:
  be correct information so you should review and fix this before uploading to
  the archive.
 
+Files: benches/stack.rs
+Copyright: 2018 Dragoș Tiselice
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
 Files: src/error.rs
 Copyright: 2018 Dragoș Tiselice
 License: UNKNOWN-LICENSE; FIXME (overlay)
@@ -147,8 +154,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2019-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2019-2022 Sylvestre Ledru <sylvestre@debian.org>
+ 2019-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2019-2023 Sylvestre Ledru <sylvestre@debian.org>
 License: MIT or Apache-2.0
 
 License: Apache-2.0