[pbs-devel] [PATCH debcargo-conf 1/1] tracing-journald: package 0.3.1

[Lukas Wagner]

Signed-off-by: Lukas Wagner <l.wagner at proxmox.com>
---

not sure if I did everything correctly here, d/changelog might need a
touchup when applying :)

 src/tracing-journald/debian/changelog         |  7 +++++
 src/tracing-journald/debian/copyright         |  4 +--
 .../debian/copyright.debcargo.hint            |  4 +--
 .../debian/patches/ignore-failing-tests.patch | 29 +++++++++----------
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/tracing-journald/debian/changelog b/src/tracing-journald/debian/changelog
index 6b5638664..99ce1e52c 100644
--- a/src/tracing-journald/debian/changelog
+++ b/src/tracing-journald/debian/changelog
@@ -1,3 +1,10 @@
+rust-tracing-journald (0.3.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package tracing-journald 0.3.1 from crates.io using debcargo 2.7.8
+
+ -- Lukas Wagner <l.wagner at proxmox.com>  Wed, 9 Apr 2025 13:51:20 +0200
+
 rust-tracing-journald (0.3.0-1~bpo12+pve1) proxmox-rust; urgency=medium
 
   * Rebuild for Debian Bookworm / Proxmox
diff --git a/src/tracing-journald/debian/copyright b/src/tracing-journald/debian/copyright
index 14512630e..b16c9ec08 100644
--- a/src/tracing-journald/debian/copyright
+++ b/src/tracing-journald/debian/copyright
@@ -15,8 +15,8 @@ License: MIT
 
 Files: debian/*
 Copyright:
- 2024 Debian Rust Maintainers <pkg-rust-maintainers at alioth-lists.debian.net>
- 2024 Fabian Grünbichler <f.gruenbichler at proxmox.com>
+ 2024-2025 Debian Rust Maintainers <pkg-rust-maintainers at alioth-lists.debian.net>
+ 2024-2025 Fabian Grünbichler <f.gruenbichler at proxmox.com>
 License: MIT
 
 License: MIT
diff --git a/src/tracing-journald/debian/copyright.debcargo.hint b/src/tracing-journald/debian/copyright.debcargo.hint
index f027649bc..322b80afa 100644
--- a/src/tracing-journald/debian/copyright.debcargo.hint
+++ b/src/tracing-journald/debian/copyright.debcargo.hint
@@ -21,8 +21,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2024 Debian Rust Maintainers <pkg-rust-maintainers at alioth-lists.debian.net>
- 2024 Fabian Grünbichler <f.gruenbichler at proxmox.com>
+ 2024-2025 Debian Rust Maintainers <pkg-rust-maintainers at alioth-lists.debian.net>
+ 2024-2025 Fabian Grünbichler <f.gruenbichler at proxmox.com>
 License: MIT
 
 License: MIT
diff --git a/src/tracing-journald/debian/patches/ignore-failing-tests.patch b/src/tracing-journald/debian/patches/ignore-failing-tests.patch
index 7499864b0..fbd874fb0 100644
--- a/src/tracing-journald/debian/patches/ignore-failing-tests.patch
+++ b/src/tracing-journald/debian/patches/ignore-failing-tests.patch
@@ -1,9 +1,11 @@
 Description: these require a working `journalctl --user` in the test environment..
 
 index c2f30108..78493210 100644
---- a/tests/journal.rs
-+++ b/tests/journal.rs
-@@ -157,6 +157,7 @@ fn retry_read_one_line_from_journal(testname: &str) -> HashMap<String, Field> {
+Index: tracing-journald/tests/journal.rs
+===================================================================
+--- tracing-journald.orig/tests/journal.rs
++++ tracing-journald/tests/journal.rs
+@@ -166,6 +166,7 @@ fn retry_read_one_line_from_journal(test
      .unwrap()
  }
  
@@ -11,15 +13,15 @@ index c2f30108..78493210 100644
  #[test]
  fn simple_message() {
      with_journald(|| {
-@@ -168,6 +169,7 @@ fn simple_message() {
-     });
+@@ -212,6 +213,7 @@ fn custom_priorities() {
+     with_journald_layer(layer, test);
  }
  
 +#[ignore]
  #[test]
  fn multiline_message() {
      with_journald(|| {
-@@ -179,6 +181,7 @@ fn multiline_message() {
+@@ -223,6 +225,7 @@ fn multiline_message() {
      });
  }
  
@@ -27,7 +29,7 @@ index c2f30108..78493210 100644
  #[test]
  fn multiline_message_trailing_newline() {
      with_journald(|| {
-@@ -193,6 +196,7 @@ fn multiline_message_trailing_newline() {
+@@ -237,6 +240,7 @@ fn multiline_message_trailing_newline()
      });
  }
  
@@ -35,7 +37,7 @@ index c2f30108..78493210 100644
  #[test]
  fn internal_null_byte() {
      with_journald(|| {
-@@ -204,6 +208,7 @@ fn internal_null_byte() {
+@@ -248,6 +252,7 @@ fn internal_null_byte() {
      });
  }
  
@@ -43,7 +45,7 @@ index c2f30108..78493210 100644
  #[test]
  fn large_message() {
      let large_string = "b".repeat(512_000);
-@@ -219,6 +224,7 @@ fn large_message() {
+@@ -263,6 +268,7 @@ fn large_message() {
      });
  }
  
@@ -51,7 +53,7 @@ index c2f30108..78493210 100644
  #[test]
  fn simple_metadata() {
      let sub = Layer::new()
-@@ -260,6 +266,7 @@ fn journal_fields() {
+@@ -304,6 +310,7 @@ fn journal_fields() {
      });
  }
  
@@ -59,7 +61,7 @@ index c2f30108..78493210 100644
  #[test]
  fn span_metadata() {
      with_journald(|| {
-@@ -284,6 +291,7 @@ fn span_metadata() {
+@@ -328,6 +335,7 @@ fn span_metadata() {
      });
  }
  
@@ -67,7 +69,7 @@ index c2f30108..78493210 100644
  #[test]
  fn multiple_spans_metadata() {
      with_journald(|| {
-@@ -310,6 +318,7 @@ fn multiple_spans_metadata() {
+@@ -354,6 +362,7 @@ fn multiple_spans_metadata() {
      });
  }
  
@@ -75,6 +77,3 @@ index c2f30108..78493210 100644
  #[test]
  fn spans_field_collision() {
      with_journald(|| {
--- 
-2.39.2
-
-- 
2.39.5