← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/02_startx_hostname.diff

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau
  • Date: 2008-03-19 00:32:09 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20080319003209-1r0a2jsvokgswbis
Tags: 1.0.8-1
* New upstream release
* Update our patches:
  + 001_debian_xinitrc.diff: fixup
  + 02_startx_hostname.diff: fixup
  + 04_startx_paths.diff: refresh
  + 06_move_serverauthfile_into_tmp.diff: fixup
* Don't build-depend on packages with a -1 debian revision.
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.
* Don't pre-depend on x11-common, that's not needed as we don't install
  anything under /usr/{lib,include}/X11.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_startx_hostname.diff
1
 
Index: xbase-clients/xinit/startx.cpp
2
 
===================================================================
3
 
--- xbase-clients.orig/xinit/startx.cpp 2006-02-18 14:56:27.000000000 -0500
4
 
+++ xbase-clients/xinit/startx.cpp      2006-02-26 19:11:55.000000000 -0500
5
 
@@ -172,18 +172,17 @@
6
 
 
 
1
--- xinit.orig/startx.cpp
 
2
+++ xinit/startx.cpp
 
3
@@ -226,18 +226,17 @@
 
4
     removelist=
 
5
 
 
6
     XCOMM set up default Xauth info for this machine
 
7
-    case `uname` in
 
8
-    Linux*)
 
9
+
 
10
+    XCOMM check for GNU hostname
 
11
+    if hostname --version > /dev/null 2>&1; then
 
12
         if [ -z "`hostname --version 2>&1 | grep GNU`" ]; then
 
13
             hostname=`hostname -f`
 
14
-        else
 
15
-            hostname=`hostname`
 
16
         fi
 
17
-        ;;
 
18
-    *)
 
19
+    fi
 
20
+
 
21
+    if [ -z "$hostname" ]; then
 
22
         hostname=`hostname`
 
23
-        ;;
 
24
-    esac
 
25
+    fi
 
26
 
 
27
     authdisplay=${display:-:0}
7
28
 #if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE)
8
 
 XCOMM set up default Xauth info for this machine
9
 
-case `uname` in
10
 
-Linux*)
11
 
-       if [ -z "`hostname --version 2>&1 | grep GNU`" ]; then
12
 
+
13
 
+XCOMM check for GNU hostname
14
 
+if hostname --version > /dev/null 2>&1; then
15
 
+       if [ -z "`hostname --version 2>&1 | grep GNU`" ]; then
16
 
                hostname=`hostname -f`
17
 
-       else
18
 
-               hostname=`hostname`
19
 
-       fi
20
 
-       ;;
21
 
-*)
22
 
+       fi
23
 
+fi
24
 
+
25
 
+if [ -z "$hostname" ]; then
26
 
        hostname=`hostname`
27
 
-       ;;
28
 
-esac
29
 
+fi
30
 
 
31
 
 authdisplay=${display:-:0}
32
 
 mcookie=`MK_COOKIE`