diff --git a/src/gps-share/debian/RFS b/src/gps-share/debian/RFS new file mode 100644 index 0000000..3f1f565 --- /dev/null +++ b/src/gps-share/debian/RFS @@ -0,0 +1,10 @@ +deps tree: +gps-share (NEW) +- serial (NEW) + - serial-core (NEW) + - serial-unix (NEW) + - termios (UPDATE, no rdeps) + - ioctl-rs (NEW) +- libudev (NEW) +- zvariant (UPDATE, rdep zbus build OK) + - zvariant-derive (UPDATE) diff --git a/src/gps-share/debian/changelog b/src/gps-share/debian/changelog new file mode 100644 index 0000000..ef3c781 --- /dev/null +++ b/src/gps-share/debian/changelog @@ -0,0 +1,7 @@ +rust-gps-share (0.3.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package gps-share 0.3.1 from crates.io using debcargo 2.4.4 + * Initial release (Closes: #988659) + + + -- Henry-Nicolas Tourneur Mon, 17 May 2021 12:10:14 +0000 diff --git a/src/gps-share/debian/copyright b/src/gps-share/debian/copyright new file mode 100644 index 0000000..a5f6ed2 --- /dev/null +++ b/src/gps-share/debian/copyright @@ -0,0 +1,24 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: gps-share +Upstream-Contact: + Zeeshan Ali + Dorota Czaplejewicz + Angus Ainslie +Source: https://github.com/zeenix/gps-share + +Files: * +Copyright: + 2017 Pelagicore AB. + 2017-2021 Zeeshan Ali + 2021 Dorota Czaplejewicz + 2021 Angus Ainslie +License: GPL-2.0+ + +Files: debian/* +Copyright: + 2021 Debian Rust Maintainers + 2021 Henry-Nicolas Tourneur +License: GPL-2.0+ + +License: GPL-2.0+ + Debian systems provide the GPL 2.0 in /usr/share/common-licenses/GPL-2 diff --git a/src/gps-share/debian/copyright.debcargo.hint b/src/gps-share/debian/copyright.debcargo.hint new file mode 100644 index 0000000..f5bba29 --- /dev/null +++ b/src/gps-share/debian/copyright.debcargo.hint @@ -0,0 +1,135 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: gps-share +Upstream-Contact: + Zeeshan Ali + Dorota Czaplejewicz + Angus Ainslie +Source: https://github.com/zeenix/gps-share + +Files: * +Copyright: + FIXME (overlay) UNKNOWN-YEARS Zeeshan Ali + FIXME (overlay) UNKNOWN-YEARS Dorota Czaplejewicz + FIXME (overlay) UNKNOWN-YEARS Angus Ainslie +License: GPL-2.0+ +Comment: + FIXME (overlay): Since upstream copyright years are not available in + Cargo.toml, they were extracted from the upstream Git repository. This may not + be correct information so you should review and fix this before uploading to + the archive. + +Files: ./LICENSE +Copyright: 1989, 1991 Free Software Foundation, Inc., +License: UNKNOWN-LICENSE; FIXME (overlay) +Comment: + FIXME (overlay): These notices are extracted from files. Please review them + before uploading to the archive. + +Files: ./src/avahi.rs +Copyright: + 2017 Pelagicore AB. + 2017 Zeeshan Ali. +License: UNKNOWN-LICENSE; FIXME (overlay) +Comment: + FIXME (overlay): These notices are extracted from files. Please review them + before uploading to the archive. + +Files: ./src/client_handler.rs +Copyright: + 2017 Pelagicore AB. + 2017 Zeeshan Ali. +License: UNKNOWN-LICENSE; FIXME (overlay) +Comment: + FIXME (overlay): These notices are extracted from files. Please review them + before uploading to the archive. + +Files: ./src/cmdline_config.rs +Copyright: + 2017 Pelagicore AB. + 2017 Zeeshan Ali. +License: UNKNOWN-LICENSE; FIXME (overlay) +Comment: + FIXME (overlay): These notices are extracted from files. Please review them + before uploading to the archive. + +Files: ./src/config.rs +Copyright: + 2017 Pelagicore AB. + 2017 Zeeshan Ali. +License: UNKNOWN-LICENSE; FIXME (overlay) +Comment: + FIXME (overlay): These notices are extracted from files. Please review them + before uploading to the archive. + +Files: ./src/gnss.rs +Copyright: + 2017 Pelagicore AB. + 2017 Zeeshan Ali. + 2020 Purism SPC. +License: UNKNOWN-LICENSE; FIXME (overlay) +Comment: + FIXME (overlay): These notices are extracted from files. Please review them + before uploading to the archive. + +Files: ./src/gps.rs +Copyright: + 2017 Pelagicore AB. + 2017 Zeeshan Ali. +License: UNKNOWN-LICENSE; FIXME (overlay) +Comment: + FIXME (overlay): These notices are extracted from files. Please review them + before uploading to the archive. + +Files: ./src/main.rs +Copyright: + 2017 Pelagicore AB. + 2017 Zeeshan Ali. +License: UNKNOWN-LICENSE; FIXME (overlay) +Comment: + FIXME (overlay): These notices are extracted from files. Please review them + before uploading to the archive. + +Files: ./src/rs232.rs +Copyright: + 2017 Pelagicore AB. + 2017 Zeeshan Ali. +License: UNKNOWN-LICENSE; FIXME (overlay) +Comment: + FIXME (overlay): These notices are extracted from files. Please review them + before uploading to the archive. + +Files: ./src/server.rs +Copyright: + 2017 Pelagicore AB. + 2017 Zeeshan Ali. +License: UNKNOWN-LICENSE; FIXME (overlay) +Comment: + FIXME (overlay): These notices are extracted from files. Please review them + before uploading to the archive. + +Files: ./src/stdin_gps.rs +Copyright: + 2017 Pelagicore AB. + 2017 Zeeshan Ali. +License: UNKNOWN-LICENSE; FIXME (overlay) +Comment: + FIXME (overlay): These notices are extracted from files. Please review them + before uploading to the archive. + +Files: ./tests/stdin_gps.rs +Copyright: + 2017 Pelagicore AB. + 2017 Zeeshan Ali. +License: UNKNOWN-LICENSE; FIXME (overlay) +Comment: + FIXME (overlay): These notices are extracted from files. Please review them + before uploading to the archive. + +Files: debian/* +Copyright: + 2021 Debian Rust Maintainers + 2021 Henry-Nicolas Tourneur +License: GPL-2.0+ + +License: GPL-2.0+ + Debian systems provide the GPL 2.0 in /usr/share/common-licenses/GPL-2 diff --git a/src/gps-share/debian/debcargo.toml b/src/gps-share/debian/debcargo.toml new file mode 100644 index 0000000..e16e09a --- /dev/null +++ b/src/gps-share/debian/debcargo.toml @@ -0,0 +1,2 @@ +overlay = "." +uploaders = ["Henry-Nicolas Tourneur "] diff --git a/src/gps-share/debian/patches/fix-compilation.patch b/src/gps-share/debian/patches/fix-compilation.patch new file mode 100644 index 0000000..d3b9631 --- /dev/null +++ b/src/gps-share/debian/patches/fix-compilation.patch @@ -0,0 +1,21 @@ +--- a/src/avahi.rs ++++ b/src/avahi.rs +@@ -70,13 +70,16 @@ impl Avahi { + } + + pub fn publish(&self, net_iface: Option<&str>, port: u16) -> Result<(), zbus::Error> { +- let server = ServerProxy::new(&self.connection.clone())?; ++ let server = self.connection.clone(); ++ let server = ServerProxy::new(&server)?; + + // FIXME: Make this async when it's possible + let group_path = server.entry_group_new()?; + println!("group: {}", group_path.as_str()); + +- let group = EntryGroupProxy::new_for(&self.connection.clone(), "org.freedesktop.Avahi", &group_path)?; ++ let group = self.connection.clone(); ++ let group = EntryGroupProxy::new_for(&group, "org.freedesktop.Avahi", &group_path)?; ++ + let txt = "accuracy=exact".to_string(); + let array: Vec> = vec![txt.into_bytes()]; + diff --git a/src/gps-share/debian/patches/fix-test.patch b/src/gps-share/debian/patches/fix-test.patch new file mode 100644 index 0000000..ef37e5b --- /dev/null +++ b/src/gps-share/debian/patches/fix-test.patch @@ -0,0 +1,11 @@ +--- a/tests/stdin_gps.rs ++++ b/tests/stdin_gps.rs +@@ -51,7 +51,7 @@ fn stdin_gps() { + } + + fn test_stdin_gps(tcp_port: Option, net_iface: Option<&str>, local_socket: LocalSocket) { +- let mut cmd = Command::new("target/debug/gps-share"); ++ let mut cmd = Command::new(env!("CARGO_BIN_EXE_gps-share")); + + cmd.arg("-a") + .arg("-") diff --git a/src/gps-share/debian/patches/relax-deps.patch b/src/gps-share/debian/patches/relax-deps.patch new file mode 100644 index 0000000..9db165b --- /dev/null +++ b/src/gps-share/debian/patches/relax-deps.patch @@ -0,0 +1,22 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -27,16 +27,16 @@ version = "2.23.1" + version = "^0.2.21" + + [dependencies.libudev] +-version = "0.2.0" ++version = "0.3.0" + + [dependencies.serial] +-version = "0.3" ++version = "0.4" + + [dependencies.signal-hook] + version = "0.1.13" + + [dependencies.zbus] +-version = "1.8" ++version = "1.0" + + [dependencies.zvariant] + version = "2.6" diff --git a/src/gps-share/debian/patches/series b/src/gps-share/debian/patches/series new file mode 100644 index 0000000..2ad52b3 --- /dev/null +++ b/src/gps-share/debian/patches/series @@ -0,0 +1,3 @@ +fix-test.patch +fix-compilation.patch +relax-deps.patch