diff --git a/src/x11rb/debian/changelog b/src/x11rb/debian/changelog index 149e435..15ccc0e 100644 --- a/src/x11rb/debian/changelog +++ b/src/x11rb/debian/changelog @@ -1,5 +1,5 @@ -rust-x11rb (0.4.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium +rust-x11rb (0.7.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium - * Package x11rb 0.4.1 from crates.io using debcargo 2.4.2 + * Package x11rb 0.7.0 from crates.io using debcargo 2.4.3 - -- Andrej Shadura Tue, 14 Apr 2020 08:15:13 +0200 + -- Andrej Shadura Sat, 31 Oct 2020 18:14:14 +0100 diff --git a/src/x11rb/debian/copyright b/src/x11rb/debian/copyright index b73a684..1b7e43c 100644 --- a/src/x11rb/debian/copyright +++ b/src/x11rb/debian/copyright @@ -5,6 +5,14 @@ Files: * Copyright: 2019-2020 Uli Schlachter +License: Expat or Apache-2.0 + +Files: + src/cursor/find_cursor.rs + src/cursor/parse_cursor.rs +Copyright: + 2013 Michael Stapelberg + 2002 Keith Packard License: Expat or Apache-2.0 Files: examples/hypnomoire.rs diff --git a/src/x11rb/debian/copyright.debcargo.hint b/src/x11rb/debian/copyright.debcargo.hint index 19862e6..6d4b219 100644 --- a/src/x11rb/debian/copyright.debcargo.hint +++ b/src/x11rb/debian/copyright.debcargo.hint @@ -1,10 +1,14 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: x11rb -Upstream-Contact: Uli Schlachter +Upstream-Contact: + Uli Schlachter + Eduardo Sánchez Muñoz Source: https://github.com/psychon/x11rb Files: * -Copyright: FIXME (overlay) UNKNOWN-YEARS Uli Schlachter +Copyright: + FIXME (overlay) UNKNOWN-YEARS Uli Schlachter + FIXME (overlay) UNKNOWN-YEARS Eduardo Sánchez Muñoz License: MIT or Apache-2.0 Comment: FIXME (overlay): Since upstream copyright years are not available in @@ -14,6 +18,22 @@ Files: ./examples/hypnomoire.rs Copyright: 2001-2002 Bart Massey and Jamey Sharp and is licensed under +License: UNKNOWN-LICENSE; FIXME (overlay) +Comment: + FIXME (overlay): These notices are extracted from files. Please review them + before uploading to the archive. + +Files: ./src/cursor/find_cursor.rs +Copyright: + 2013 Michael Stapelberg + 2002 Keith Packard +License: UNKNOWN-LICENSE; FIXME (overlay) +Comment: + FIXME (overlay): These notices are extracted from files. Please review them + before uploading to the archive. + +Files: ./src/cursor/parse_cursor.rs +Copyright: 2013 Michael Stapelberg License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them diff --git a/src/x11rb/debian/patches/fix-build.patch b/src/x11rb/debian/patches/fix-build.patch index b532227..c9e3353 100644 --- a/src/x11rb/debian/patches/fix-build.patch +++ b/src/x11rb/debian/patches/fix-build.patch @@ -1,40 +1,28 @@ --- a/Cargo.toml +++ b/Cargo.toml -@@ -48,7 +48,7 @@ - allow-unsafe-code = ["libc"] +@@ -68,7 +68,7 @@ allow-unsafe-code = ["libc"] composite = ["xfixes"] + cursor = ["render"] damage = ["xfixes"] --default = ["vendor-xcb-proto", "allow-unsafe-code"] -+default = ["allow-unsafe-code"] +-dl-libxcb = ["allow-unsafe-code", "libloading", "once_cell"] ++#dl-libxcb = ["allow-unsafe-code", "libloading", "once_cell"] dpms = [] dri2 = [] dri3 = [] -@@ -62,7 +62,7 @@ - shape = [] - shm = [] - sync = [] --vendor-xcb-proto = [] -+#vendor-xcb-proto = [] - xevie = [] - xf86dri = [] - xf86vidmode = [] ---- a/build.rs -+++ b/build.rs -@@ -51,14 +51,16 @@ - for py_file in list_files_with_extension("code_generator_helpers", "py") { - println!("cargo:rerun-if-changed={}", py_file.to_str().unwrap()); - } -+ /* - for py_file in list_files_with_extension(pythondir.join("xcbgen"), "py") { - println!("cargo:rerun-if-changed={}", py_file.to_str().unwrap()); - } -+ */ - for xml_file in list_files_with_extension(&includedir, "xml") { - println!("cargo:rerun-if-changed={}", xml_file.to_str().unwrap()); - } +@@ -96,10 +96,10 @@ xtest = [] + xv = ["shm"] + xvmc = ["xv"] + [target."cfg(unix)".dependencies.nix] +-version = "0.18.0" +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = ["winsock2"] ++version = "0.16.0" ++#[target."cfg(windows)".dependencies.winapi] ++#version = "0.3" ++#features = ["winsock2"] -- let status = Command::new("python") -+ let status = Command::new("python3") - .arg("rs_code_generator.py") - .arg("-p") - .arg(&pythondir) +-[target."cfg(windows)".dependencies.winapi-wsapoll] +-version = "0.1.1" ++#[target."cfg(windows)".dependencies.winapi-wsapoll] ++#version = "0.1.1"