~ubuntu-branches/ubuntu/karmic/xfce4-utils/karmic

« back to all changes in this revision

Viewing changes to debian/patches/02_use-Xsessions.options-for-ssh-agent-handling.patch

  • Committer: Bazaar Package Importer
  • Author(s): Cody A.W. Somerville
  • Date: 2009-07-17 04:52:29 UTC
  • Revision ID: james.westby@ubuntu.com-20090717045229-m8lp3r1fgrjd7zyp
Tags: 4.6.1-1ubuntu2
* Updated following patches to patch scripts/xinitrc.in.in instead of 
  xinitrc.in so that they'll actually get used as xinitrc.in is now generated
  from xinitrc.in.in:
  - debian/patches/04_avoid-xcblib-hang.patch,
  - debian/patches/02_use-Xsessions.options-for-ssh-agent-handling.patch:

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
diff --git a/scripts/xinitrc.in b/scripts/xinitrc.in
2
2
index 1a00294..b99fb8e 100755
3
 
--- a/scripts/xinitrc.in
4
 
+++ b/scripts/xinitrc.in
 
3
--- a/scripts/xinitrc.in.in
 
4
+++ b/scripts/xinitrc.in.in
5
5
@@ -64,12 +64,15 @@ fi
6
6
 
7
7
 # Use ssh-agent if installed and not already running.  Run it separately