jcarr
/
x11-xserver-utils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix xsm's configure.ac to not require rsh, and drop the openssh build-dep.

This commit is contained in:
Julien Cristau 2007-05-09 16:29:28 +02:00
parent 3f2b543846
commit 710b003820
5 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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 <jcristau@debian.org> Wed, 09 May 2007 16:26:06 +0200
xbase-clients (1:7.2.ds2-2) unstable; urgency=low xbase-clients (1:7.2.ds2-2) unstable; urgency=low
[ Julien Cristau ] [ Julien Cristau ]

2
debian/control vendored
View File

@ -3,7 +3,7 @@ Section: x11
Priority: optional Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Julien Cristau <jcristau@debian.org> Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Julien Cristau <jcristau@debian.org>
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: # Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts # debhelper for the packaging, pkg-config needed by configure scripts
# Individual apps: # Individual apps:

12
debian/patches/18_xsm_build_without_ssh.diff vendored Normal file
View File

@ -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

1
debian/patches/series vendored
View File

@ -14,3 +14,4 @@
15_xmore_fix_segv_without_xprint.diff -p2 15_xmore_fix_segv_without_xprint.diff -p2
16_beforelight_install_app-defaults.diff 16_beforelight_install_app-defaults.diff
17_xmodmap_manpage.diff 17_xmodmap_manpage.diff
18_xsm_build_without_ssh.diff

1
debian/rules vendored
View File

@ -49,6 +49,7 @@ build-stamp:
--infodir=\$${prefix}/share/info $(confflags) \ --infodir=\$${prefix}/share/info $(confflags) \
--disable-xprint \ --disable-xprint \
CFLAGS="$(CFLAGS)" \ CFLAGS="$(CFLAGS)" \
RSH=rsh \
MANCONF="/etc/manpath.config" && \ MANCONF="/etc/manpath.config" && \
$(MAKE)) || exit 1; \ $(MAKE)) || exit 1; \
done done