zbus-macro, crossbeam-epoch: refresh following proc-macro-crate and memoffset updates

diff --git a/src/crossbeam-epoch/debian/RFS b/src/crossbeam-epoch/debian/RFS
new file mode 100644 (file)
index 0000000..2d41a23
--- /dev/null
+++ b/src/crossbeam-epoch/debian/RFS
@@ -0,0 +1,14 @@
+dependency tree:
+deps for all: system-deps proc-macro-crate
+deps for gtk: rustc-version memoffset field-offset(N)
+sys for gtk-core: glib-sys gobject-sys gio-sys cairo-sys-rs pango-sys pangocairo-sys graphene-sys(N)
+sys for gtk3: gdk-pixbuf-sys gdk-sys gdkx11-sys(N) atk-sys gtk-sys libhandy-sys(N)
+sys for gtk4 (all new): graphene-sys gdk4-sys gdk4-x11-sys gdk4-wayland-sys gsk4-sys gtk4-sys
+gtk core: glib-macros glib  gio cairo-rs pango pangocairo graphene-rs(N)
+gtk3: gdk-pixbuf gdk gdkx11(N) gtk3-macros(N) atk gtk libhandy(N)
+gtk4 (all new): gtk4-macros gdk4 gdk4-wayland gdk4-x11 gsk4 gtk4
+
+reverse dependencies:
+proc-macro-crate: zbus-macros
+memoffset: crossbeam-epoch
+rustc-version: cast extprim generator lexical-core newtype-derive parking-lot-core-0.4 stdweb stackvector

diff --git a/src/crossbeam-epoch/debian/changelog b/src/crossbeam-epoch/debian/changelog
index 7cb0edca7cfb6ee7ecf4904d0eb535c625c57846..c51e7349edc2c99bd6f2a6655ba8dbbfbbf86b43 100644 (file)
--- a/src/crossbeam-epoch/debian/changelog
+++ b/src/crossbeam-epoch/debian/changelog
@@ -1,3 +1,9 @@
+rust-crossbeam-epoch (0.8.2-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+  * Team upload.
+  * Added d/patches/relax-deps.patch so that crossbeam-epoch works with
+    memoffset 0.6.
+ -- Henry-Nicolas Tourneur <debian@nilux.be>  Tue, 26 Oct 2021 19:20:41 +0000
+
 rust-crossbeam-epoch (0.8.2-1) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/crossbeam-epoch/debian/patches/relax-deps.patch b/src/crossbeam-epoch/debian/patches/relax-deps.patch
new file mode 100644 (file)
index 0000000..ac6e8a9
--- /dev/null
+++ b/src/crossbeam-epoch/debian/patches/relax-deps.patch
@@ -0,0 +1,11 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -37,7 +37,7 @@ optional = true
+ version = "2.0.0"
+ 
+ [dependencies.memoffset]
+-version = "0.5"
++version = "0.6"
+ 
+ [dependencies.scopeguard]
+ version = "1"

diff --git a/src/crossbeam-epoch/debian/patches/series b/src/crossbeam-epoch/debian/patches/series
index 38c710551a59aa508b3f6489002be8909744b083..570eda00800cfb7928b193fc0b310632ce82fd75 100644 (file)
--- a/src/crossbeam-epoch/debian/patches/series
+++ b/src/crossbeam-epoch/debian/patches/series
@@ -1 +1,2 @@
+relax-deps.patch
 update-dep-versions.patch

diff --git a/src/zbus-macros/debian/RFS b/src/zbus-macros/debian/RFS
new file mode 100644 (file)
index 0000000..2d41a23
--- /dev/null
+++ b/src/zbus-macros/debian/RFS
@@ -0,0 +1,14 @@
+dependency tree:
+deps for all: system-deps proc-macro-crate
+deps for gtk: rustc-version memoffset field-offset(N)
+sys for gtk-core: glib-sys gobject-sys gio-sys cairo-sys-rs pango-sys pangocairo-sys graphene-sys(N)
+sys for gtk3: gdk-pixbuf-sys gdk-sys gdkx11-sys(N) atk-sys gtk-sys libhandy-sys(N)
+sys for gtk4 (all new): graphene-sys gdk4-sys gdk4-x11-sys gdk4-wayland-sys gsk4-sys gtk4-sys
+gtk core: glib-macros glib  gio cairo-rs pango pangocairo graphene-rs(N)
+gtk3: gdk-pixbuf gdk gdkx11(N) gtk3-macros(N) atk gtk libhandy(N)
+gtk4 (all new): gtk4-macros gdk4 gdk4-wayland gdk4-x11 gsk4 gtk4
+
+reverse dependencies:
+proc-macro-crate: zbus-macros
+memoffset: crossbeam-epoch
+rustc-version: cast extprim generator lexical-core newtype-derive parking-lot-core-0.4 stdweb stackvector

diff --git a/src/zbus-macros/debian/changelog b/src/zbus-macros/debian/changelog
index cd1cb0f8e55f8d698c1a43d0dbf93d5789bf3f99..ebe78a74ddb82da2943946d4975a7fb5b56f153e 100644 (file)
--- a/src/zbus-macros/debian/changelog
+++ b/src/zbus-macros/debian/changelog
@@ -1,3 +1,12 @@
+rust-zbus-macros (1.0.0-3) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * d/patches: add relax-proc-macro-crate.patch to make it compatible with
+    proc-macro-crate 1.1.
+  * d/patches: removed patch relax-deps.patch
+
+ -- Henry-Nicolas Tourneur <debian@nilux.be>  Tue, 26 Oct 2021 18:40:08 +0000
+
 rust-zbus-macros (1.0.0-2) unstable; urgency=high
 
   * Rebuild.

diff --git a/src/zbus-macros/debian/copyright.debcargo.hint b/src/zbus-macros/debian/copyright.debcargo.hint
index 902152894c425789ffea4e24d092531f924cbfaf..42ecdc480b49ad593ad98fe640e629e216be6f8d 100644 (file)
--- a/src/zbus-macros/debian/copyright.debcargo.hint
+++ b/src/zbus-macros/debian/copyright.debcargo.hint
@@ -1,10 +1,10 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: zbus_macros
-Upstream-Contact: Marc-André Lureau <marcandre.lureau@redhat.com
-Source: https://gitlab.freedesktop.org/zeenix/zbus/
+Upstream-Contact: Marc-André Lureau <marcandre.lureau@redhat.com>
+Source: https://gitlab.freedesktop.org/dbus/zbus/
 
 Files: *
-Copyright: FIXME (overlay) UNKNOWN-YEARS Marc-André Lureau <marcandre.lureau@redhat.com
+Copyright: FIXME (overlay) UNKNOWN-YEARS Marc-André Lureau <marcandre.lureau@redhat.com>
 License: MIT
 Comment:
  FIXME (overlay): Since upstream copyright years are not available in
@@ -14,8 +14,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2020 Andrej Shadura <andrewsh@debian.org>
+ 2020-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2020-2021 Andrej Shadura <andrewsh@debian.org>
 License: MIT
 
 License: MIT

diff --git a/src/zbus-macros/debian/patches/relax-deps.patch b/src/zbus-macros/debian/patches/relax-deps.patch
deleted file mode 100644 (file)
index 2057979..0000000
--- a/src/zbus-macros/debian/patches/relax-deps.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -35,7 +35,7 @@ version = "1.0"
- version = "1.0.3"
- 
- [dependencies.syn]
--version = "1.0.18"
-+version = ">= 1.0.12"
- features = ["extra-traits", "full"]
- [dev-dependencies.serde]
- version = "1.0"

diff --git a/src/zbus-macros/debian/patches/relax-proc-macro-crate.patch b/src/zbus-macros/debian/patches/relax-proc-macro-crate.patch
new file mode 100644 (file)
index 0000000..23c13ee
--- /dev/null
+++ b/src/zbus-macros/debian/patches/relax-proc-macro-crate.patch
@@ -0,0 +1,37 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -26,7 +26,7 @@ repository = "https://gitlab.freedesktop
+ [lib]
+ proc-macro = true
+ [dependencies.proc-macro-crate]
+-version = "0.1.4"
++version = "1.1"
+ 
+ [dependencies.proc-macro2]
+ version = "1.0"
+--- a/src/utils.rs
++++ b/src/utils.rs
+@@ -1,17 +1,15 @@
+ use proc_macro2::Span;
+-use proc_macro_crate::crate_name;
++use proc_macro_crate::{crate_name, FoundCrate};
+ use syn::{
+     Attribute, FnArg, Ident, Lit, Meta, MetaList, NestedMeta, Pat, PatIdent, PatType, Result,
+ };
+ 
+ pub fn get_crate_ident(name: &str) -> Ident {
+-    Ident::new(
+-        &match crate_name(name) {
+-            Ok(x) => x,
+-            Err(_) => name.into(),
+-        },
+-        Span::call_site(),
+-    )
++    if let Ok(FoundCrate::Name(name)) = crate_name("zbus") {
++        Ident::new(&name, Span::call_site())
++    } else {
++        Ident::new("zbus", Span::call_site())
++    }
+ }
+ 
+ pub fn arg_ident(arg: &FnArg) -> Option<&Ident> {

diff --git a/src/zbus-macros/debian/patches/series b/src/zbus-macros/debian/patches/series
index bdddf05ae546555b06f7432fa9bd69cb4590599a..bf7d5d7f5f2c6836bac101e5a5a5c74f94695c5f 100644 (file)
--- a/src/zbus-macros/debian/patches/series
+++ b/src/zbus-macros/debian/patches/series
@@ -1 +1 @@
-relax-deps.patch
+relax-proc-macro-crate.patch