Author: julien
Date: 2007-01-12 12:19:31 -0500 (Fri, 12 Jan 2007)
New Revision: 4201

Modified:
   trunk/app/xbase-clients/debian/changelog
   trunk/app/xbase-clients/debian/control
   trunk/app/xbase-clients/debian/rules
Log:
Revert removal of openssh-client from the build-deps, because xsm's configure
script unsets the RSH variable before checking for it, and I don't want to
bloat the diff by having to rerun autoconf at this point.


Modified: trunk/app/xbase-clients/debian/changelog
===================================================================
--- trunk/app/xbase-clients/debian/changelog    2007-01-12 17:00:24 UTC (rev 
4200)
+++ trunk/app/xbase-clients/debian/changelog    2007-01-12 17:19:31 UTC (rev 
4201)
@@ -1,8 +1,6 @@
 xbase-clients (1:7.1.ds1-2) unstable; urgency=low
 
   * Add patch by Eugene Konev to fix xdbedizzy crash (closes: #365291).
-  * Drop build-dep on openssh-client | ssh, and set RSH=/usr/bin/ssh when
-    running configure so xsm knows where to find it (closes: #362787).
 
  -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 12 Jan 2007 17:54:07 +0100
 

Modified: trunk/app/xbase-clients/debian/control
===================================================================
--- trunk/app/xbase-clients/debian/control      2007-01-12 17:00:24 UTC (rev 
4200)
+++ trunk/app/xbase-clients/debian/control      2007-01-12 17:19:31 UTC (rev 
4201)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian X Strike Force <[email protected]>
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, libfs-dev (>= 2:1.0.0-1), 
libpng-dev, libx11-dev (>= 2:1.0.0-1), libxaw7-dev (>= 1:1.0.1-1), 
libxcursor-dev (>= 1.1.5.2-1), libxext-dev (>= 1:1.0.0-1), libxft-dev (>= 
2.1.8.2-6), libxi-dev (>= 1:1.0.0-3), libxkbfile-dev (>= 1:1.0.1-1), 
libxmuu-dev (>= 1:1.0.1-1), libxrandr-dev (>= 2:1.1.0.2-1), libxrender-dev (>= 
1:0.9.0.2-2), libxss-dev (>= 1:1.0.1-1), libxt-dev (>= 1:1.0.0-1), libxtrap-dev 
(>= 1:1.0.0-1), libxtst-dev (>= 1:1.0.1-1), libxxf86dga-dev (>= 1:1.0.1-1), 
libxv-dev (>= 1:1.0.1-1), libxxf86vm-dev (>= 1:1.0.0-1), x11proto-gl-dev, 
libgl1-mesa-dev, xbitmaps, quilt
+Build-Depends: debhelper (>= 5.0.0), pkg-config, libfs-dev (>= 2:1.0.0-1), 
libpng-dev, libx11-dev (>= 2:1.0.0-1), libxaw7-dev (>= 1:1.0.1-1), 
libxcursor-dev (>= 1.1.5.2-1), libxext-dev (>= 1:1.0.0-1), libxft-dev (>= 
2.1.8.2-6), libxi-dev (>= 1:1.0.0-3), libxkbfile-dev (>= 1:1.0.1-1), 
libxmuu-dev (>= 1:1.0.1-1), libxrandr-dev (>= 2:1.1.0.2-1), libxrender-dev (>= 
1:0.9.0.2-2), libxss-dev (>= 1:1.0.1-1), libxt-dev (>= 1:1.0.0-1), libxtrap-dev 
(>= 1:1.0.0-1), libxtst-dev (>= 1:1.0.1-1), libxxf86dga-dev (>= 1:1.0.1-1), 
libxv-dev (>= 1:1.0.1-1), libxxf86vm-dev (>= 1:1.0.0-1), x11proto-gl-dev, 
libgl1-mesa-dev, xbitmaps, quilt, openssh-client | ssh
 Standards-Version: 3.7.2.0
 
 Package: xbase-clients

Modified: trunk/app/xbase-clients/debian/rules
===================================================================
--- trunk/app/xbase-clients/debian/rules        2007-01-12 17:00:24 UTC (rev 
4200)
+++ trunk/app/xbase-clients/debian/rules        2007-01-12 17:19:31 UTC (rev 
4201)
@@ -49,8 +49,7 @@
                             --infodir=\$${prefix}/share/info $(confflags) \
                             --disable-xprint \
                             CFLAGS="$(CFLAGS)" \
-                            MANCONF="/etc/manpath.config" \
-                            RSH=/usr/bin/ssh && \
+                            MANCONF="/etc/manpath.config" && \
                $(MAKE)) || exit 1; \
        done
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to