← Back to branch summary

~ubuntu-branches/ubuntu/maverick/xinit/maverick

« back to all changes in this revision

Viewing changes to debian/patches/001_debian_xinitrc.diff

  • Committer: Bazaar Package Importer
  • Author(s): Brice Goglin
  • Date: 2008-05-21 23:28:57 UTC
  • Revision ID: james.westby@ubuntu.com-20080521232857-u3usk4x3gu55sq22
Tags: 1.0.9-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/001_debian_xinitrc.diff
1
 
--- xinit.orig/xinitrc.cpp
2
 
+++ xinit/xinitrc.cpp
 
1
Index: xinit/xinitrc.cpp
 
2
===================================================================
 
3
--- xinit.orig/xinitrc.cpp      2008-05-21 23:08:58.000000000 +0200
 
4
+++ xinit/xinitrc.cpp   2008-05-21 23:19:30.000000000 +0200
3
5
@@ -1,103 +1,9 @@
4
6
 XCOMM!SHELL_CMD
5
7
 XCOMM $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
30
32
-    XMODMAP $sysmodmap
31
33
-fi
32
34
-
33
 
-if [ -f $userresources ]; then
 
35
-if [ -f "$userresources" ]; then
34
36
-#ifdef __APPLE__
35
37
-    if [ -x /usr/bin/cpp ] ; then
36
 
-        XRDB -merge $userresources
 
38
-        XRDB -merge "$userresources"
37
39
-    else
38
 
-        XRDB -nocpp -merge $userresources
 
40
-        XRDB -nocpp -merge "$userresources"
39
41
-    fi
40
42
-#else
41
 
-    XRDB -merge $userresources
 
43
-    XRDB -merge "$userresources"
42
44
-#endif
43
45
-fi
44
46
-
45
 
-if [ -f $usermodmap ]; then
46
 
-    XMODMAP $usermodmap
 
47
-if [ -f "$usermodmap" ]; then
 
48
-    XMODMAP "$usermodmap"
47
49
-fi
48
50
-
49
51
-XCOMM start some nice programs