From 55d409f509121c67754df3b58ba22d87336e9ea4 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Tue, 20 Aug 2024 21:50:44 +0000 Subject: [PATCH] Import safe-vdash_0.17.9-2+rpi1.debian.tar.xz [dgit import tarball safe-vdash 0.17.9-2+rpi1 safe-vdash_0.17.9-2+rpi1.debian.tar.xz] --- changelog | 176 ++++++++++++++++++++++++++++++++++ clean | 1 + control | 63 ++++++++++++ copyright | 36 +++++++ copyright-check | 3 + copyright_hints | 55 +++++++++++ gbp.conf | 14 +++ patches/2001_env_logger.patch | 18 ++++ patches/2001_rename.patch | 15 +++ patches/README | 3 + patches/series | 3 + patches/use-native-tls.patch | 11 +++ rules | 19 ++++ safe-vdash.manpages | 1 + source/format | 1 + source/lintian-overrides | 5 + watch | 9 ++ 17 files changed, 433 insertions(+) create mode 100644 changelog create mode 100644 clean create mode 100644 control create mode 100644 copyright create mode 100755 copyright-check create mode 100644 copyright_hints create mode 100644 gbp.conf create mode 100644 patches/2001_env_logger.patch create mode 100644 patches/2001_rename.patch create mode 100644 patches/README create mode 100644 patches/series create mode 100644 patches/use-native-tls.patch create mode 100755 rules create mode 100644 safe-vdash.manpages create mode 100644 source/format create mode 100644 source/lintian-overrides create mode 100644 watch diff --git a/changelog b/changelog new file mode 100644 index 0000000..3a4c72f --- /dev/null +++ b/changelog @@ -0,0 +1,176 @@ +safe-vdash (0.17.9-2+rpi1) trixie-staging; urgency=medium + + * Use native-tls instead of rustls to hopefully avoid armv7 contamination. + + -- Peter Michael Green Tue, 20 Aug 2024 21:50:44 +0000 + +safe-vdash (0.17.9-2) unstable; urgency=medium + + * no-changes source-only upload to enable testing migration + + -- Jonas Smedegaard Sun, 21 Jul 2024 00:23:32 +0200 + +safe-vdash (0.17.9-1) experimental; urgency=medium + + [ upstream ] + * new release(s) + + [ Jonas Smedegaard ] + * build-depend on package for crate reqwest + * drop patches 2002_*, obsoleted by Debian package changes; + update and unfuzz patches; + bump build-dependencies for crates byte-unit ratatui + (see bug#1057254) + * simplify packaging; + build-depend on dh-sequence-rust + (not dh-cargo libstring-shellquote-perl) + * declare compliance with Debian Policy 4.7.0 + * update copyright info: update coverage + * set Static-Built-Using (not X-Cargo-Built-Using) + + -- Jonas Smedegaard Sat, 20 Jul 2024 13:35:28 +0200 + +safe-vdash (0.16.4-1) unstable; urgency=medium + + [ upstream ] + * new release(s) + + [ Jonas Smedegaard ] + * unfuzz patches + + -- Jonas Smedegaard Fri, 12 Jan 2024 09:40:06 +0100 + +safe-vdash (0.16.1-1) unstable; urgency=medium + + [ upstream ] + * new release + + [ Jonas Smedegaard ] + * unfuzz patches + * update dh-cargo fork + + -- Jonas Smedegaard Sat, 30 Dec 2023 17:24:19 +0100 + +safe-vdash (0.16.0-1) unstable; urgency=medium + + [ upstream ] + * new release + + [ Jonas Smedegaard ] + * declare Built-Using and X-Cargo-Built-Using + * drop patch 2002_serde_with, + obsoleted by Debian package changes + * unfuzz patches + + -- Jonas Smedegaard Fri, 15 Dec 2023 22:20:49 +0100 + +safe-vdash (0.15.5-2) unstable; urgency=medium + + * bump build-dependency for crate env_logger; + closes: bug#1057673, thanks to Peter Green + + -- Jonas Smedegaard Thu, 07 Dec 2023 08:17:20 +0100 + +safe-vdash (0.15.5-1) unstable; urgency=medium + + [ upstream ] + * new release(s) + + [ Jonas Smedegaard ] + * drop patches 2003_*, obsoleted by upstream changes + * unfuzz patches; update DEP-3 headers + * build-depend on packages + for crates glob serde serde_json serde_with strfmt; + tighten build-dependencies + for crates chrono ratatui + * add patch 2002_serde_with + to accept older releases of crate serde_with + * update patch 2002 + + -- Jonas Smedegaard Sun, 03 Dec 2023 23:26:01 +0100 + +safe-vdash (0.13.2-1) unstable; urgency=medium + + [ upstream ] + * new release(s) + + [ Jonas Smedegaard ] + * update patch 2002_ratatui; + unfuzz patches; + bump build-dependency for crate ratatui + * add patches 2003_* to avoid not-in-Debian crate strfmt + * drop patch 2002_crossterm, + obsoleted by Debian package changes; + bump build-dependency for crate crossterm + + -- Jonas Smedegaard Sat, 02 Dec 2023 09:34:47 +0100 + +safe-vdash (0.11.3-1) unstable; urgency=medium + + [ upstream ] + * new release(s) + + [ Jonas Smedegaard ] + * add DEP-3 headers + * drop TODO note about musl, rumored to cause trouble om arm + + -- Jonas Smedegaard Mon, 16 Oct 2023 16:23:57 +0200 + +safe-vdash (0.10.1-1) unstable; urgency=medium + + [ upstream ] + * new release(s) + + [ Jonas Smedegaard ] + * update and unfuzz patches + * build-depend on packages for crates crossterm ratatui tokio-macros + (not termion tui) + + -- Jonas Smedegaard Fri, 06 Oct 2023 20:15:34 +0200 + +safe-vdash (0.8.12-1) unstable; urgency=medium + + [ upstream ] + * new release(s) + + [ Jonas Smedegaard ] + * update patches + * update dh-cargo fork + * update copyright info: update coverage + + -- Jonas Smedegaard Sat, 23 Sep 2023 11:10:36 +0200 + +safe-vdash (0.8.7-1) unstable; urgency=medium + + [ upstream ] + * new release + + [ Jonas Smedegaard ] + * update dh-cargo fork + + -- Jonas Smedegaard Wed, 13 Sep 2023 21:16:28 +0200 + +safe-vdash (0.8.6-1) unstable; urgency=medium + + [ upstream ] + * new release + + [ Jonas Smedegaard ] + * update DEP-3 patch headers + * update dh-cargo fork + + -- Jonas Smedegaard Sun, 20 Aug 2023 11:52:35 +0200 + +safe-vdash (0.8.5-2) unstable; urgency=medium + + * update DEP-3 patch headers + * update dh-cargo fork + + -- Jonas Smedegaard Thu, 03 Aug 2023 19:14:13 +0200 + +safe-vdash (0.8.5-1) experimental; urgency=low + + * initial Release; + closes: bug#1009781 + + -- Jonas Smedegaard Sat, 22 Jul 2023 21:17:26 +0200 diff --git a/clean b/clean new file mode 100644 index 0000000..75167fa --- /dev/null +++ b/clean @@ -0,0 +1 @@ +debian/build/ diff --git a/control b/control new file mode 100644 index 0000000..2f7dc83 --- /dev/null +++ b/control @@ -0,0 +1,63 @@ +Source: safe-vdash +Section: net +Priority: optional +Maintainer: Jonas Smedegaard +Build-Depends: + debhelper-compat (= 13), + dh-sequence-rust, + help2man, + librust-bincode-1+default-dev, + librust-byte-unit-5+default-dev, + librust-chrono-0.4+default-dev, + librust-chrono-0.4+serde-dev, + librust-crossterm-0.27+default-dev, + librust-env-logger-0.10+default-dev, + librust-fs2-0.4+default-dev, + librust-futures-0.3+default-dev, + librust-glob-0.3+default-dev, + librust-lazy-static-1+default-dev, + librust-linemux-0.3+default-dev, + librust-log-0.4+default-dev, + librust-rand-0.8+default-dev, + librust-ratatui-0.25+default-dev, + librust-ratatui-0.25+serde-dev, + librust-regex-1+default-dev, + librust-reqwest-0.11+default-dev, + librust-serde-1+default-dev, + librust-serde-1+derive-dev, + librust-serde-json-1+default-dev, + librust-serde-with-3+chrono-0-4-dev, + librust-serde-with-3+default-dev, + librust-strfmt-0.2+default-dev, + librust-structopt-0.3+default-dev, + librust-tempfile-3+default-dev, + librust-time-0.3+default-dev, + librust-tokio-1+default-dev, + librust-tokio-1+macros-dev, + librust-tokio-1+rt-multi-thread-dev, + librust-tokio-1+sync-dev, + librust-tokio-macros-2+default-dev, + librust-tokio-stream-0.1+default-dev, +Standards-Version: 4.7.0 +Homepage: https://github.com/happybeing/vdash +Vcs-Git: https://salsa.debian.org/debian/safe-vdash.git +Vcs-Browser: https://salsa.debian.org/debian/safe-vdash +Rules-Requires-Root: no + +Package: safe-vdash +X-Cargo-Crates: + vdash, +Architecture: any +Depends: + ${misc:Depends}, + ${shlibs:Depends}, +Built-Using: + ${cargo:Built-Using}, +Static-Built-Using: + ${cargo:Static-Built-Using}, +Description: node dashboard for the Safe Network + vdash is a terminal based dashboard + for monitoring SAFE Network nodes. + . + The Safe Network is a fully autonomous + data and communications network. diff --git a/copyright b/copyright new file mode 100644 index 0000000..15d9241 --- /dev/null +++ b/copyright @@ -0,0 +1,36 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: vdash +Upstream-Contact: https://github.com/happybeing/vdash/issues +Source: https://github.com/happybeing/vdash + +Files: * +Copyright: + Mark +License-Grant: + Everything is GPL3.0 unless otherwise stated. +License: GPL-3 +Reference: + Cargo.toml + README.md +Comment: + No copyright holders explicitly stated. + Copyright assumed from "author" field of file +License-Grant: + This packaging is free software; + you can redistribute it and/or modify it + under the terms of the GNU General Public License + as published by the Free Software Foundation; + either version 3, + or (at your option) any later version. +License: GPL-3+ +Reference: debian/copyright + +License: GPL-3 +Reference: /usr/share/common-licenses/GPL-3 + +License: GPL-3+ +Reference: /usr/share/common-licenses/GPL-3 diff --git a/copyright-check b/copyright-check new file mode 100755 index 0000000..957296a --- /dev/null +++ b/copyright-check @@ -0,0 +1,3 @@ +#!/bin/sh + +licensecheck --check '.*' --recursive --copyright --deb-machine --ignore '^(screenshots/vdash(-v.0.2.4.gif| v0.2.0.png)|debian/(changelog|copyright(_hints)?))$' --lines 0 -- * > debian/copyright_hints diff --git a/copyright_hints b/copyright_hints new file mode 100644 index 0000000..011c7c9 --- /dev/null +++ b/copyright_hints @@ -0,0 +1,55 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: FIXME +Upstream-Contact: FIXME +Source: FIXME +Disclaimer: Autogenerated by licensecheck + +Files: Cargo.lock + Cargo.toml + README.md + debian/clean + debian/control + debian/copyright-check + debian/gbp.conf + debian/patches/2001_env_logger.patch + debian/patches/2001_rename.patch + debian/patches/README + debian/patches/series + debian/rules + debian/safe-vdash.manpages + debian/source/format + debian/source/lintian-overrides + debian/watch + rustfmt.toml + src/bin/vdash.rs + src/custom/app.rs + src/custom/app_timelines.rs + src/custom/logfile_checkpoints.rs + src/custom/logfiles_manager.rs + src/custom/mod.rs + src/custom/opt.rs + src/custom/timelines.rs + src/custom/ui.rs + src/custom/ui_debug.rs + src/custom/ui_help.rs + src/custom/ui_keyboard.rs + src/custom/ui_node.rs + src/custom/ui_status.rs + src/custom/ui_summary.rs + src/custom/ui_summary_table.rs + src/custom/web_requests.rs + src/event.rs + src/mod.rs + src/util.rs + src/widgets/gauge.rs + src/widgets/mod.rs + src/widgets/sparkline.rs +Copyright: NONE +License: UNKNOWN + FIXME + +Files: LICENSE +Copyright: 2007, Free Software Foundation, Inc. +License: GPL-3 + FIXME + diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000..10e7015 --- /dev/null +++ b/gbp.conf @@ -0,0 +1,14 @@ +# clone this source: gbp clone $PKG_GIT_URL +# track upstream source: git remote add upstream-git $UPSTREAM_GIT_URL +# update this source: gbp pull +# update upstream source: git fetch upstream-git --tags +# import upstream release: gbp import-orig --upstream-vcs-tag=$VERSION --uscan +# build package: gbp buildpackage +# publish source release: gbp tag && gbp push + +[DEFAULT] +pristine-tar = True +sign-tags = True +filter = */.git* +debian-branch = debian/latest +upstream-branch = upstream/latest diff --git a/patches/2001_env_logger.patch b/patches/2001_env_logger.patch new file mode 100644 index 0000000..de84f02 --- /dev/null +++ b/patches/2001_env_logger.patch @@ -0,0 +1,18 @@ +Description: accept older branch of crate env_logger +Author: Jonas Smedegaard +Bug-Debian: https://bugs.debian.org/1063720 +Forwarded: not-needed +Last-Update: 2024-02-11 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -33,7 +33,7 @@ + fs2 = "0.4.3" + rand = "0.8.5" + log = "0.4.11" +-env_logger = "0.11.1" ++env_logger = ">= 0.10, <= 0.11" + strfmt = "0.2.4" + glob = "0.3.1" + serde = {version = "1.0.192", features = ["derive"] } diff --git a/patches/2001_rename.patch b/patches/2001_rename.patch new file mode 100644 index 0000000..4a09364 --- /dev/null +++ b/patches/2001_rename.patch @@ -0,0 +1,15 @@ +Description: rename main executable +Author: Jonas Smedegaard +Forwarded: not-needed +Last-Update: 2023-08-12 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -42,5 +42,5 @@ + reqwest = { version = "0.11.23", default_features = false, features = ["rustls-tls"] } + + [[bin]] +-name = "vdash" ++name = "safe-vdash" + path = "src/bin/vdash.rs" diff --git a/patches/README b/patches/README new file mode 100644 index 0000000..b5c82cb --- /dev/null +++ b/patches/README @@ -0,0 +1,3 @@ +0xxx: Grabbed from upstream development. +1xxx: Possibly relevant for upstream adoption. +2xxx: Only relevant for official Debian release. \ No newline at end of file diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..5d444d7 --- /dev/null +++ b/patches/series @@ -0,0 +1,3 @@ +2001_rename.patch +2001_env_logger.patch +use-native-tls.patch diff --git a/patches/use-native-tls.patch b/patches/use-native-tls.patch new file mode 100644 index 0000000..982557a --- /dev/null +++ b/patches/use-native-tls.patch @@ -0,0 +1,11 @@ +--- safe-vdash-0.17.9.orig/Cargo.toml ++++ safe-vdash-0.17.9/Cargo.toml +@@ -39,7 +39,7 @@ glob = "0.3.1" + serde = {version = "1.0.192", features = ["derive"] } + serde_json = "1.0.108" + serde_with = { version = "3.4.0", features = ["chrono_0_4"] } +-reqwest = { version = "0.11.23", default_features = false, features = ["rustls-tls"] } ++reqwest = { version = "0.11.23", default_features = false, features = ["native-tls"] } + + [[bin]] + name = "safe-vdash" diff --git a/rules b/rules new file mode 100755 index 0000000..ea3eb93 --- /dev/null +++ b/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f + +# generate documentation unless nodoc requested +ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) +MANPAGES = debian/build/safe-vdash.1 +endif + +%: + dh $@ + +execute_after_dh_auto_install: $(MANPAGES) + +# build manpages +debian/build/safe-vdash.1: debian/build/%.1: debian/safe-vdash/usr/bin/% + mkdir --parents $(dir $@) + help2man --section 1 --no-info \ + --name "CLI tool to monitor nodes on the Safe Network" \ + --output $@ $< \ + || { $1 --help; false; } diff --git a/safe-vdash.manpages b/safe-vdash.manpages new file mode 100644 index 0000000..a304dfb --- /dev/null +++ b/safe-vdash.manpages @@ -0,0 +1 @@ +debian/build/safe-vdash.1 diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/source/lintian-overrides b/source/lintian-overrides new file mode 100644 index 0000000..90a669f --- /dev/null +++ b/source/lintian-overrides @@ -0,0 +1,5 @@ +# License is in Reference field (see bug#786450) +missing-license-paragraph-in-dep5-copyright gpl-3 * +missing-license-paragraph-in-dep5-copyright gpl-3\+ * +missing-license-text-in-dep5-copyright GPL-3 * +missing-license-text-in-dep5-copyright GPL-3\+ * diff --git a/watch b/watch new file mode 100644 index 0000000..d126520 --- /dev/null +++ b/watch @@ -0,0 +1,9 @@ +version=4 +# check: uscan --report +# update: gbp import-orig --upstream-vcs-tag=vX.Y.Z --uscan + +opts=\ +filenamemangle=s/.*?(@ANY_VERSION@@ARCHIVE_EXT@)/@PACKAGE@-$1/,\ +dversionmangle=auto \ +https://github.com/happybeing/vdash/tags \ +.*?@ANY_VERSION@@ARCHIVE_EXT@ -- 2.30.2