Adding config example in /etc

  * changes in debcargo.toml depend on debcargo 2.5
  * this closes bug#994103

diff --git a/src/pleaser/debian/RFS b/src/pleaser/debian/RFS
new file mode 100644 (file)
index 0000000..996fa17
--- /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 414c29d1bc1aae0e5f8e8f92b4cd7e1792c2f2e0..2cb1a55a973854c6ca2ef6ad0753a2e85988b59d 100644 (file)
--- 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 <ed-debian@s5h.net>  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 976c32c526be73d61f0de2505c50a45e095755cb..38a77578ff242c7263cad96c601998265180c029 100644 (file)
--- 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 8299f6fb4440c2432e64ec9cadd063a94c63ec75..99c3398a3bb2854b92c7c27dbca2d507f82dbcad 100644 (file)
--- a/src/pleaser/debian/debcargo.toml
+++ b/src/pleaser/debian/debcargo.toml
@@ -1,5 +1,6 @@
 overlay = "."
 uploaders = ["Ed Neville <ed-debian@s5h.net>"]
+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 1e722438e4664f5c82c72515d688952c5f06f29d..e028d176d3ab68599bdce5fbd82ada2187996c97 100644 (file)
--- 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 d2716228bae695a6d85ea9ca190e006b3cf83365..06a94a6ad8062933829b71eeb9399caaf4bd1c95 100644 (file)
--- 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 42c10c5584ba1af30b1d3dfd88437a1d4aeaaa72..d162153b5f604d6807a7e38f746a3d2563f27e70 100644 (file)
--- 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 95501f08cb60418ea02cd20a8a969d361772c68e..f247dcc865d8cb69fbbf503068528471dace21ce 100755 (executable)
--- 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