[Pkg-gnupg-commit] [gnupg2] 04/12: remove scdaemon.service; it will be managed by gpg-agent.service

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit d5972142ee8f7818eb3e10b4e10b9372f1af220b
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Sun Jul 31 12:35:22 2016 -0400

    remove scdaemon.service; it will be managed by gpg-agent.service
    
    the systemd user services presented here will be scoped and cleaned up
    automatically by systemd upon login and logout.
    
    scdaemon shouldn't need to be managed independently, since it will be
    started and stopped by the gpg-agent service itself.
---
 debian/scdaemon.README.Debian        | 48 ------------------------------------
 debian/scdaemon.install              |  1 -
 debian/systemd-user/scdaemon.service | 11 ---------
 3 files changed, 60 deletions(-)

diff --git a/debian/scdaemon.README.Debian b/debian/scdaemon.README.Debian
deleted file mode 100644
index 921e470..0000000
--- a/debian/scdaemon.README.Debian
+++ /dev/null
@@ -1,48 +0,0 @@
-scdaemon system integration
-===========================
-
-Since 2.1.x, gpg and most related processes will auto-launch scdaemon
-if needed.  These auto-launched processes will inherit whatever
-environment they started from, and they will not terminate
-automatically.
-
-systemd
-=======
-
-Users on machines with systemd can ensure that scdaemon is always
-running for their session, and that it gets terminated safely at
-logout by doing:
-
-   systemctl --user enable scdaemon
-
-If you do this from the middle of a running session, you probably also
-want to clean up any other running scdaemon, and ensure that the
-service is started for the current session as well:
-
-   gpgconf --kill scdaemon
-   systemctl --user start scdaemon
-
-Manual scdaemon startup
-=======================
-
-Any user who wants to launch scdaemon manually (e.g., to talk to it
-with a tool from outside the GnuPG suite) should do so with:
-
-   gpgconf --launch scdaemon
-
-You may wish to add this to your session login scripts if you're not
-using systemd.
-
-scdaemon teardown
-=================
-
-If scdaemon is launched manually or automatically (but not supervised
-by systemd), you probably want to ensure that it terminates when your
-session ends with:
-
-   gpgconf --kill scdaemon
-
-You may wish to add this to your session logout scripts if you're not
-using systemd.
-
- -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>, Wed, 29 Jun 2016 13:41:11 -0400
diff --git a/debian/scdaemon.install b/debian/scdaemon.install
index ae6916c..a2a79aa 100644
--- a/debian/scdaemon.install
+++ b/debian/scdaemon.install
@@ -1,2 +1 @@
-debian/systemd-user/scdaemon.service usr/lib/systemd/user
 debian/tmp/usr/lib/gnupg/scdaemon
diff --git a/debian/systemd-user/scdaemon.service b/debian/systemd-user/scdaemon.service
deleted file mode 100644
index 39649f6..0000000
--- a/debian/systemd-user/scdaemon.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=GnuPG smartcard daemon
-Documentation=man:scdaemon(1)
-
-[Service]
-Type=forking
-ExecStart=/usr/lib/gnupg/scdaemon --daemon --homedir %h/.gnupg
-Restart=always
-
-[Install]
-WantedBy=default.target

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git