← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/gnupg2/jaunty-updates

« back to all changes in this revision

Viewing changes to debian/gnupg-agent.xsession

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Urlichs
  • Date: 2005-12-08 22:13:21 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20051208221321-4rvs2vu835iam5wv
Tags: 1.9.19-2
http://bugs.debian.org/335066
http://bugs.debian.org/312717
http://bugs.debian.org/308516
http://bugs.debian.org/336480
http://bugs.debian.org/299842
http://bugs.debian.org/304355
* Convert debian/changelog to UTF-8.
* Put gnupg-agent and gpgsm lintian overrides in the respectively
  right package.  Closes: #335066
* Added debhelper tokens to maintainer scripts.
* xsession fixes:
  o Added host name to gpg-agent PID file name.  Closes: #312717
  o Fixed xsession script to be able to run under zsh.  Closes: #308516
  o Don't run gpg-agent if one is already running.  Closes: #336480
* debian/control:
  o Fixed package description of gpgsm package.  Closes: #299842
  o Added mention of gpg-agent to description of gnupg-agent package.
    Closes: #304355
* Thanks to Peter Eisentraut <petere@debian.org> for all of the above.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/gnupg-agent.xsession
1
 
 
2
1
: ${GNUPGHOME=$HOME/.gnupg}
3
2
 
4
3
GPGAGENT=/usr/bin/gpg-agent
5
 
PID_FILE="$GNUPGHOME/gpg-agent-info"
 
4
PID_FILE="$GNUPGHOME/gpg-agent-info-$(hostname)"
6
5
 
7
 
if grep -qs ^use-agent "$GNUPGHOME/gpg.conf" "$GNUPGHOME/options" &&
8
 
   test -x $GPGAGENT; then
 
6
if grep -qs '^use-agent' "$GNUPGHOME/gpg.conf" "$GNUPGHOME/options" &&
 
7
   test -x $GPGAGENT &&
 
8
   { test -z "$GPG_AGENT_INFO" || ! $GPGAGENT 2>/dev/null; }; then
9
9
 
10
10
   if [ -r "$PID_FILE" ]; then
11
11
       . "$PID_FILE"
17
17
       $GPGAGENT --daemon --sh >"$PID_FILE"
18
18
       . "$PID_FILE"
19
19
   fi
20
 
 
21
20
fi