From 580c4329eb9eaeb0c80cc365326665a90627727c Mon Sep 17 00:00:00 2001 From: ed neville Date: Sun, 5 Dec 2021 11:59:09 +0000 Subject: [PATCH] Adding config example in /etc * changes in debcargo.toml depend on debcargo 2.5 * this closes bug#994103 --- src/pleaser/debian/RFS | 1 + src/pleaser/debian/changelog | 7 +++++++ src/pleaser/debian/copyright.debcargo.hint | 2 +- src/pleaser/debian/debcargo.toml | 1 + src/pleaser/debian/patches/relax-dep.diff | 15 ++++++++++++--- src/pleaser/debian/pleaser.install | 3 ++- src/pleaser/debian/pleaser.lintian-overrides | 2 ++ src/pleaser/debian/rules | 2 ++ 8 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 src/pleaser/debian/RFS diff --git a/src/pleaser/debian/RFS b/src/pleaser/debian/RFS new file mode 100644 index 000000000..996fa179b --- /dev/null +++ b/src/pleaser/debian/RFS @@ -0,0 +1 @@ +bump 0.5.1 diff --git a/src/pleaser/debian/changelog b/src/pleaser/debian/changelog index 414c29d1b..2cb1a55a9 100644 --- a/src/pleaser/debian/changelog +++ b/src/pleaser/debian/changelog @@ -1,3 +1,10 @@ +rust-pleaser (0.5.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package pleaser 0.5.1 from crates.io using debcargo 2.5.0 + * This closes bug#994103 + + -- Ed Neville Sun, 05 Dec 2021 14:14:13 +0000 + rust-pleaser (0.4.1-2) unstable; urgency=medium * Team upload. diff --git a/src/pleaser/debian/copyright.debcargo.hint b/src/pleaser/debian/copyright.debcargo.hint index 976c32c52..38a77578f 100644 --- a/src/pleaser/debian/copyright.debcargo.hint +++ b/src/pleaser/debian/copyright.debcargo.hint @@ -33,7 +33,7 @@ Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/util.rs +Files: ./src/lib.rs Copyright: 2020-2021 ed neville License: UNKNOWN-LICENSE; FIXME (overlay) Comment: diff --git a/src/pleaser/debian/debcargo.toml b/src/pleaser/debian/debcargo.toml index 8299f6fb4..99c3398a3 100644 --- a/src/pleaser/debian/debcargo.toml +++ b/src/pleaser/debian/debcargo.toml @@ -1,5 +1,6 @@ overlay = "." uploaders = ["Ed Neville "] +requires_root = "binary-targets" [packages.bin] section = "utils" diff --git a/src/pleaser/debian/patches/relax-dep.diff b/src/pleaser/debian/patches/relax-dep.diff index 1e722438e..e028d176d 100644 --- a/src/pleaser/debian/patches/relax-dep.diff +++ b/src/pleaser/debian/patches/relax-dep.diff @@ -2,9 +2,18 @@ Index: pleaser/Cargo.toml =================================================================== --- pleaser.orig/Cargo.toml +++ pleaser/Cargo.toml -@@ -51,4 +51,4 @@ version = "5.0" +@@ -33,7 +33,7 @@ + version = "0.2" + + [dependencies.nix] +-version = ">= 0.23" ++version = ">= 0.19" + + [dependencies.pam] + version = "0.7" +@@ -51,4 +51,4 @@ version = ">= 4.0" - + [dependencies.users] --version = "0.10" +-version = ">= 0.10" +version = ">= 0.10, < 0.12" diff --git a/src/pleaser/debian/pleaser.install b/src/pleaser/debian/pleaser.install index d2716228b..06a94a6ad 100644 --- a/src/pleaser/debian/pleaser.install +++ b/src/pleaser/debian/pleaser.install @@ -1,3 +1,4 @@ -debian/examples/please.ini usr/share/doc/please/ +examples/please.ini etc/ +examples/please.ini usr/share/doc/please/ debian/pam.d/please etc/pam.d/ debian/pam.d/pleaseedit etc/pam.d/ diff --git a/src/pleaser/debian/pleaser.lintian-overrides b/src/pleaser/debian/pleaser.lintian-overrides index 42c10c558..d162153b5 100644 --- a/src/pleaser/debian/pleaser.lintian-overrides +++ b/src/pleaser/debian/pleaser.lintian-overrides @@ -1,3 +1,5 @@ setuid-binary usr/bin/please 4755 root/root setuid-binary usr/bin/pleaseedit 4755 root/root unknown-field pleaser_0.3.16-1_amd64.deb X-Cargo-Built-Using +non-standard-dir-perm etc/please.d/ 0700 != 0755 +non-standard-file-perm etc/please.ini 0600 != 0644 diff --git a/src/pleaser/debian/rules b/src/pleaser/debian/rules index 95501f08c..f247dcc86 100755 --- a/src/pleaser/debian/rules +++ b/src/pleaser/debian/rules @@ -10,3 +10,5 @@ override_dh_installman: override_dh_fixperms: dh_fixperms chmod 4755 ./debian/pleaser/usr/bin/please ./debian/pleaser/usr/bin/pleaseedit + chmod 600 ./debian/pleaser/etc/please.ini + mkdir -m 700 -p ./debian/pleaser/etc/please.d -- 2.39.5