From 710b00382004e6d028cff06358100e58b7629e69 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Wed, 9 May 2007 16:29:28 +0200 Subject: [PATCH] Fix xsm's configure.ac to not require rsh, and drop the openssh build-dep. --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/patches/18_xsm_build_without_ssh.diff | 12 ++++++++++++ debian/patches/series | 1 + debian/rules | 1 + 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 debian/patches/18_xsm_build_without_ssh.diff diff --git a/debian/changelog b/debian/changelog index 7583137..2b0c7bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xbase-clients (1:7.2.ds2-3) unstable; urgency=low + + * Add patch to xsm's configure.ac to not override the user-provided RSH + variable, so we can drop the openssh build-dep (closes: #362787). + + -- Julien Cristau Wed, 09 May 2007 16:26:06 +0200 + xbase-clients (1:7.2.ds2-2) unstable; urgency=low [ Julien Cristau ] diff --git a/debian/control b/debian/control index 9eacebe..fb37226 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force Uploaders: David Nusinow , Branden Robinson , Julien Cristau -Build-Depends: debhelper (>= 5.0.0), pkg-config, libfs-dev (>= 2:1.0.0-1), libpng12-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.2.0-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, x11proto-input-dev (>= 1.4), libxinerama-dev (>= 1:1.0.1-1) +Build-Depends: debhelper (>= 5.0.0), pkg-config, libfs-dev (>= 2:1.0.0-1), libpng12-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.2.0-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, x11proto-input-dev (>= 1.4), libxinerama-dev (>= 1:1.0.1-1) # Reasons for build-depends: # debhelper for the packaging, pkg-config needed by configure scripts # Individual apps: diff --git a/debian/patches/18_xsm_build_without_ssh.diff b/debian/patches/18_xsm_build_without_ssh.diff new file mode 100644 index 0000000..bba3b9a --- /dev/null +++ b/debian/patches/18_xsm_build_without_ssh.diff @@ -0,0 +1,12 @@ +Index: xbase-clients/xsm/configure.ac +=================================================================== +--- xbase-clients.orig/xsm/configure.ac 2007-05-09 16:21:05.000000000 +0200 ++++ xbase-clients/xsm/configure.ac 2007-05-09 16:21:58.000000000 +0200 +@@ -31,7 +31,6 @@ + AC_PROG_CC + AC_PROG_INSTALL + +-RSH= + if [[ -z $RSH ]] ; then + AC_PATH_PROG(RSH,rsh) + fi diff --git a/debian/patches/series b/debian/patches/series index 9ef7dd6..2a4cf03 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,3 +14,4 @@ 15_xmore_fix_segv_without_xprint.diff -p2 16_beforelight_install_app-defaults.diff 17_xmodmap_manpage.diff +18_xsm_build_without_ssh.diff diff --git a/debian/rules b/debian/rules index 61ecfc0..e6d8483 100755 --- a/debian/rules +++ b/debian/rules @@ -49,6 +49,7 @@ build-stamp: --infodir=\$${prefix}/share/info $(confflags) \ --disable-xprint \ CFLAGS="$(CFLAGS)" \ + RSH=rsh \ MANCONF="/etc/manpath.config" && \ $(MAKE)) || exit 1; \ done