debian/changelog | 45 debian/control | 30 debian/copyright | 86 debian/copyright.head | 4 debian/patches/18_xsm_build_without_ssh.diff | 12 debian/patches/series | 1 debian/rules | 23 rstart/COPYING | 29 rstart/ChangeLog | 125 rstart/INSTALL | 291 + rstart/Makefile.am | 39 rstart/Makefile.in | 375 + rstart/README | 30 rstart/aclocal.m4 | 2400 +++++++--- rstart/config.guess | 210 rstart/config.h.in | 3 rstart/config.sub | 115 rstart/configure | 5134 +++++++++------------- rstart/configure.ac | 32 rstart/depcomp | 87 rstart/install-sh | 5 rstart/missing | 49 rstart/specs/fix.awk | 23 rstart/specs/fix.nawk | 24 rstart/specs/fix.sed | 12 rstart/specs/rstart.ms | 841 +++ rstart/specs/rstartd.txt | 229 + rstart/specs/tmac.rfc | 81 smproxy/COPYING | 25 smproxy/ChangeLog | 151 smproxy/INSTALL | 291 + smproxy/Makefile.am | 30 smproxy/Makefile.in | 62 smproxy/aclocal.m4 | 833 +++ smproxy/config.guess | 210 smproxy/config.h.in | 9 smproxy/config.sub | 115 smproxy/configure | 4153 ++++++++---------- smproxy/configure.ac | 23 smproxy/save.c | 14 smproxy/smproxy.c | 2 smproxy/smproxy.h | 3 smproxy/smproxy.man | 4 xsm/ChangeLog | 458 +- xsm/INSTALL | 143 xsm/Makefile.am | 55 xsm/Makefile.in | 794 +-- xsm/README | 34 xsm/XSm.ad | 119 xsm/aclocal.m4 | 2530 +++++++---- xsm/app-defaults/XSm | 119 xsm/auth.c | 23 xsm/choose.c | 30 xsm/compile | 142 xsm/config.guess | 279 - xsm/config.h.in | 37 xsm/config.sub | 201 xsm/configure | 6078 ++++++++++++++------------- xsm/configure.ac | 63 xsm/depcomp | 172 xsm/globals.c | 91 xsm/info.c | 87 xsm/info.h | 6 xsm/install-sh | 517 +- xsm/list.c | 32 xsm/lock.c | 41 xsm/lock.h | 10 xsm/log.c | 10 xsm/mainwin.c | 14 xsm/misc.c | 1 xsm/missing | 104 xsm/mkinstalldirs | 158 xsm/popup.c | 4 xsm/printhex.c | 9 xsm/prop.c | 2 xsm/remote.c | 25 xsm/restart.c | 28 xsm/save.c | 94 xsm/saveutil.c | 18 xsm/signals.c | 24 xsm/xsm.c | 89 xsm/xsm.h | 25 82 files changed, 16419 insertions(+), 12507 deletions(-)
New commits: commit e6dbab500e640b6c3dcada9468bc14ed82b13d00 Author: Julien Cristau <[email protected]> Date: Wed Feb 9 19:00:29 2011 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index ca3805b..f7fdaf9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11-session-utils (7.6~2) UNRELEASED; urgency=low +x11-session-utils (7.6+1) unstable; urgency=low * Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your work! @@ -6,8 +6,9 @@ x11-session-utils (7.6~2) UNRELEASED; urgency=low * Drop XS prefix from Vcs-* control fields. * Drop Pre-Depends on x11-common. * Bump Standards-Version to 3.9.1. + * Upload to unstable. - -- Julien Cristau <[email protected]> Wed, 09 Feb 2011 18:52:20 +0100 + -- Julien Cristau <[email protected]> Wed, 09 Feb 2011 19:00:24 +0100 x11-session-utils (7.6~1) experimental; urgency=low commit 2e4ade81cc93b0116601bab6ff16552c16e3b960 Author: Julien Cristau <[email protected]> Date: Wed Feb 9 18:58:24 2011 +0100 Bump Standards-Version to 3.9.1. diff --git a/debian/changelog b/debian/changelog index 18e6d7f..ca3805b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x11-session-utils (7.6~2) UNRELEASED; urgency=low * Pass "--destdir ." to uscan when downloading tarballs. * Drop XS prefix from Vcs-* control fields. * Drop Pre-Depends on x11-common. + * Bump Standards-Version to 3.9.1. -- Julien Cristau <[email protected]> Wed, 09 Feb 2011 18:52:20 +0100 diff --git a/debian/control b/debian/control index 95634de..c560b04 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: # smproxy: libxt-dev, libxmuu-dev, libsm-dev # xsm: openssh-client | ssh, libxaw7-dev, libxt-dev, libsm-dev # libice-dev, libx11-dev -Standards-Version: 3.8.3 +Standards-Version: 3.9.1 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-session-utils Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-session-utils.git commit 815612c7efc05382f707ef30e08be71f78d90cc5 Author: Julien Cristau <[email protected]> Date: Wed Feb 9 18:55:07 2011 +0100 Drop Pre-Depends on x11-common. diff --git a/debian/changelog b/debian/changelog index beac723..18e6d7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ x11-session-utils (7.6~2) UNRELEASED; urgency=low work! * Pass "--destdir ." to uscan when downloading tarballs. * Drop XS prefix from Vcs-* control fields. + * Drop Pre-Depends on x11-common. -- Julien Cristau <[email protected]> Wed, 09 Feb 2011 18:52:20 +0100 diff --git a/debian/control b/debian/control index ef96b79..95634de 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-session-utils.git Package: x11-session-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, cpp -Pre-Depends: x11-common (>= 1:7.0.0) Conflicts: smproxy, xsm (<= 1:1.0.1-1) Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1), smproxy, xsm (<= 1:1.0.1-1) Description: X session utilities commit 09b37ec4b8722dcf881d5e7a06e81123f9624850 Author: Julien Cristau <[email protected]> Date: Wed Feb 9 18:54:43 2011 +0100 Drop XS prefix from Vcs-* control fields. diff --git a/debian/changelog b/debian/changelog index d56d12d..beac723 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x11-session-utils (7.6~2) UNRELEASED; urgency=low * Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your work! * Pass "--destdir ." to uscan when downloading tarballs. + * Drop XS prefix from Vcs-* control fields. -- Julien Cristau <[email protected]> Wed, 09 Feb 2011 18:52:20 +0100 diff --git a/debian/control b/debian/control index 172b7e1..ef96b79 100644 --- a/debian/control +++ b/debian/control @@ -24,8 +24,8 @@ Build-Depends: # xsm: openssh-client | ssh, libxaw7-dev, libxt-dev, libsm-dev # libice-dev, libx11-dev Standards-Version: 3.8.3 -XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-session-utils -XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-session-utils.git +Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-session-utils +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-session-utils.git Package: x11-session-utils Architecture: any commit c4bf895852cad601e294c278b036b5782cdcdee1 Author: Julien Cristau <[email protected]> Date: Wed Feb 9 18:53:23 2011 +0100 Pass "--destdir ." to uscan when downloading tarballs. diff --git a/debian/changelog b/debian/changelog index 675c988..d56d12d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x11-session-utils (7.6~2) UNRELEASED; urgency=low * Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your work! + * Pass "--destdir ." to uscan when downloading tarballs. -- Julien Cristau <[email protected]> Wed, 09 Feb 2011 18:52:20 +0100 diff --git a/debian/rules b/debian/rules index 4db9217..6ddfdc7 100755 --- a/debian/rules +++ b/debian/rules @@ -111,7 +111,7 @@ get-tarballs: $(addprefix get-tarball-,$(SUBDIRS)) .PHONY: get-tarball-% get-tarball-%: - uscan --no-conf --download --no-symlink --package $* --upstream-version $(shell awk -F = '/^PACKAGE_VERSION=/ { print $$2 }' < $*/configure ) --watchfile debian/watch.$* || test $$? = 1 + uscan --no-conf --destdir . --download --no-symlink --package $* --upstream-version $(shell awk -F = '/^PACKAGE_VERSION=/ { print $$2 }' < $*/configure ) --watchfile debian/watch.$* || test $$? = 1 .PHONY: update-copyright update-copyright: $(addsuffix /COPYING, $(SUBDIRS)) debian/copyright.head commit 1626f98e8dec37770809d09120cf399944367abe Author: Julien Cristau <[email protected]> Date: Wed Feb 9 18:52:36 2011 +0100 Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your work! diff --git a/debian/changelog b/debian/changelog index dc9c088..675c988 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x11-session-utils (7.6~2) UNRELEASED; urgency=low + + * Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your + work! + + -- Julien Cristau <[email protected]> Wed, 09 Feb 2011 18:52:20 +0100 + x11-session-utils (7.6~1) experimental; urgency=low [ Julien Cristau ] diff --git a/debian/control b/debian/control index efd6b41..172b7e1 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: x11-session-utils Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected]>, Cyril Brulebois <[email protected]> +Uploaders: Cyril Brulebois <[email protected]> Build-Depends: debhelper (>= 5.0.0), pkg-config, commit 423ad06fbc589fda3ffeca5679b63904304b09e9 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 13 00:53:42 2010 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index d69417d..dc9c088 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11-session-utils (7.6~1) UNRELEASED; urgency=low +x11-session-utils (7.6~1) experimental; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no @@ -34,7 +34,7 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low - Remove dash-revision in build-deps. - Fix dh_{makeshlibs,installdeb,shlibdeps} order. - -- Cyril Brulebois <[email protected]> Fri, 12 Nov 2010 23:36:13 +0100 + -- Cyril Brulebois <[email protected]> Sat, 13 Nov 2010 00:53:29 +0100 x11-session-utils (7.5+1) unstable; urgency=low commit 366c14a04ecec284c87e91adc0b585cf8c2be2e7 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 13 00:52:29 2010 +0100 rsh is sufficient, execlp() is used. diff --git a/debian/changelog b/debian/changelog index d5a923c..d69417d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,8 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low * Refresh debian/copyright accordingly. * Pass $(confflags_$*) to configure so as to be able to specify an extra confflags_foo variable, specific to the foo package. - * Set confflags_xsm = --with-rsh=/usr/bin/rsh. + * Set confflags_xsm = --with-rsh=rsh (no need for a full path, execlp() + is used). * Drop 18_xsm_build_without_ssh.diff accordingly. * Stop passing RSH=rsh accordingly. * Stop passing MANCONF="/etc/manpath.config", that was for xman, which diff --git a/debian/rules b/debian/rules index cebae9d..4db9217 100755 --- a/debian/rules +++ b/debian/rules @@ -39,7 +39,7 @@ else endif # target-specific confflags: -confflags_xsm = --with-rsh=/usr/bin/rsh +confflags_xsm = --with-rsh=rsh build: build-stamp build-stamp: $(BUILD_STAMPS) commit 396cc9b682331b839306f56dcee8bc114593bd57 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 13 00:30:54 2010 +0100 Thanks to lintian: Fix dh_{makeshlibs,installdeb,shlibdeps} order. diff --git a/debian/changelog b/debian/changelog index 5368d83..d5a923c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low * Add myself to Uploaders. * Thanks to lintian: - Remove dash-revision in build-deps. + - Fix dh_{makeshlibs,installdeb,shlibdeps} order. -- Cyril Brulebois <[email protected]> Fri, 12 Nov 2010 23:36:13 +0100 diff --git a/debian/rules b/debian/rules index 6a3daf6..cebae9d 100755 --- a/debian/rules +++ b/debian/rules @@ -92,9 +92,9 @@ binary-arch: build install dh_strip dh_compress dh_fixperms + dh_makeshlibs dh_installdeb dh_shlibdeps - dh_makeshlibs dh_gencontrol dh_md5sums dh_builddeb commit a01189d16b416262de6c97af4e19bb2a9b3aa465 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 13 00:26:51 2010 +0100 Thanks to lintian: Remove dash-revision in build-deps. diff --git a/debian/changelog b/debian/changelog index a0a069e..5368d83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,8 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low * Add libxmuu-dev and libsm-dev build-dep, drop libxmu-dev, for smproxy. * Add libice-dev and libx11-dev buil-dep for xsm. * Add myself to Uploaders. + * Thanks to lintian: + - Remove dash-revision in build-deps. -- Cyril Brulebois <[email protected]> Fri, 12 Nov 2010 23:36:13 +0100 diff --git a/debian/control b/debian/control index 7c95034..efd6b41 100644 --- a/debian/control +++ b/debian/control @@ -8,9 +8,9 @@ Build-Depends: pkg-config, libice-dev, libsm-dev, - libxaw7-dev (>= 1:1.0.1-1), + libxaw7-dev (>= 1:1.0.1), libxmuu-dev, - libxt-dev (>= 1:1.0.0-1), + libxt-dev (>= 1:1.0.0), libx11-dev, x11proto-core-dev, quilt, commit 175fc9eb54184d0bbb5480546e220091dd4c9922 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 13 00:19:56 2010 +0100 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index bed02ea..a0a069e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,7 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low * Add x11proto-core-dev build-dep for rstart. * Add libxmuu-dev and libsm-dev build-dep, drop libxmu-dev, for smproxy. * Add libice-dev and libx11-dev buil-dep for xsm. + * Add myself to Uploaders. -- Cyril Brulebois <[email protected]> Fri, 12 Nov 2010 23:36:13 +0100 diff --git a/debian/control b/debian/control index d96db9e..7c95034 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: x11-session-utils Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected]> +Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected]>, Cyril Brulebois <[email protected]> Build-Depends: debhelper (>= 5.0.0), pkg-config, commit 3cb460b3203aaf4f65fd60a5eb86a5ff6a7d7240 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 13 00:19:06 2010 +0100 Add libice-dev and libx11-dev buil-dep for xsm. diff --git a/debian/changelog b/debian/changelog index 0bd4a6d..bed02ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,7 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low * Add xutils-dev build-dep for new macros. * Add x11proto-core-dev build-dep for rstart. * Add libxmuu-dev and libsm-dev build-dep, drop libxmu-dev, for smproxy. + * Add libice-dev and libx11-dev buil-dep for xsm. -- Cyril Brulebois <[email protected]> Fri, 12 Nov 2010 23:36:13 +0100 diff --git a/debian/control b/debian/control index f91f334..d96db9e 100644 --- a/debian/control +++ b/debian/control @@ -6,10 +6,12 @@ Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected] Build-Depends: debhelper (>= 5.0.0), pkg-config, + libice-dev, libsm-dev, libxaw7-dev (>= 1:1.0.1-1), libxmuu-dev, libxt-dev (>= 1:1.0.0-1), + libx11-dev, x11proto-core-dev, quilt, xutils-dev (>= 1:7.5+4), @@ -19,7 +21,8 @@ Build-Depends: # Individual apps: # rstart: x11proto-core-dev # smproxy: libxt-dev, libxmuu-dev, libsm-dev -# xsm: openssh-client | ssh, libxaw7-dev, libxt-dev +# xsm: openssh-client | ssh, libxaw7-dev, libxt-dev, libsm-dev +# libice-dev, libx11-dev Standards-Version: 3.8.3 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-session-utils XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-session-utils.git commit 7382fbdf52d70ba4956aef52e7bd7590150fcf91 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 13 00:17:35 2010 +0100 Add libxmuu-dev and libsm-dev build-dep, drop libxmu-dev, for smproxy. diff --git a/debian/changelog b/debian/changelog index ca54533..0bd4a6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low * Wrap build-deps. * Add xutils-dev build-dep for new macros. * Add x11proto-core-dev build-dep for rstart. + * Add libxmuu-dev and libsm-dev build-dep, drop libxmu-dev, for smproxy. -- Cyril Brulebois <[email protected]> Fri, 12 Nov 2010 23:36:13 +0100 diff --git a/debian/control b/debian/control index 987c78f..f91f334 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,9 @@ Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected] Build-Depends: debhelper (>= 5.0.0), pkg-config, + libsm-dev, libxaw7-dev (>= 1:1.0.1-1), - libxmu-dev (>= 1:1.0.1-1), + libxmuu-dev, libxt-dev (>= 1:1.0.0-1), x11proto-core-dev, quilt, @@ -17,7 +18,7 @@ Build-Depends: # xutils-dev for common xorg macros # Individual apps: # rstart: x11proto-core-dev -# smproxy: libxt-dev, libxmu-dev +# smproxy: libxt-dev, libxmuu-dev, libsm-dev # xsm: openssh-client | ssh, libxaw7-dev, libxt-dev Standards-Version: 3.8.3 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-session-utils commit b706a4b4e636994f5430234a5711de5a8a15c236 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 13 00:11:41 2010 +0100 Add x11proto-core-dev build-dep for rstart. diff --git a/debian/changelog b/debian/changelog index b168344..ca54533 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low * Switch from --list-missing to --fail-missing for additional safety. * Wrap build-deps. * Add xutils-dev build-dep for new macros. + * Add x11proto-core-dev build-dep for rstart. -- Cyril Brulebois <[email protected]> Fri, 12 Nov 2010 23:36:13 +0100 diff --git a/debian/control b/debian/control index 04c6871..987c78f 100644 --- a/debian/control +++ b/debian/control @@ -9,13 +9,14 @@ Build-Depends: libxaw7-dev (>= 1:1.0.1-1), libxmu-dev (>= 1:1.0.1-1), libxt-dev (>= 1:1.0.0-1), + x11proto-core-dev, quilt, xutils-dev (>= 1:7.5+4), # Reasons for build-depends: # debhelper for the packaging, pkg-config needed by configure scripts # xutils-dev for common xorg macros # Individual apps: -# rstart: +# rstart: x11proto-core-dev # smproxy: libxt-dev, libxmu-dev # xsm: openssh-client | ssh, libxaw7-dev, libxt-dev Standards-Version: 3.8.3 commit 54f71786f739f1282afd7ffa870032c9adfa12ad Author: Cyril Brulebois <[email protected]> Date: Sat Nov 13 00:10:25 2010 +0100 Add xutils-dev build-dep for new macros. diff --git a/debian/changelog b/debian/changelog index 8800743..b168344 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low * Stop passing --disable-xprint, it's gone. * Switch from --list-missing to --fail-missing for additional safety. * Wrap build-deps. + * Add xutils-dev build-dep for new macros. -- Cyril Brulebois <[email protected]> Fri, 12 Nov 2010 23:36:13 +0100 diff --git a/debian/control b/debian/control index 923b25a..04c6871 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,10 @@ Build-Depends: libxmu-dev (>= 1:1.0.1-1), libxt-dev (>= 1:1.0.0-1), quilt, + xutils-dev (>= 1:7.5+4), # Reasons for build-depends: # debhelper for the packaging, pkg-config needed by configure scripts +# xutils-dev for common xorg macros # Individual apps: # rstart: # smproxy: libxt-dev, libxmu-dev commit 7926798118e6241b9459c14d71ba6a9f15524d40 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 13 00:09:10 2010 +0100 Wrap build-deps. diff --git a/debian/changelog b/debian/changelog index f564a54..8800743 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low is now in x11-apps. * Stop passing --disable-xprint, it's gone. * Switch from --list-missing to --fail-missing for additional safety. + * Wrap build-deps. -- Cyril Brulebois <[email protected]> Fri, 12 Nov 2010 23:36:13 +0100 diff --git a/debian/control b/debian/control index 151f233..923b25a 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,13 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected]> -Build-Depends: debhelper (>= 5.0.0), pkg-config, libxaw7-dev (>= 1:1.0.1-1), libxmu-dev (>= 1:1.0.1-1), libxt-dev (>= 1:1.0.0-1), quilt +Build-Depends: + debhelper (>= 5.0.0), + pkg-config, + libxaw7-dev (>= 1:1.0.1-1), + libxmu-dev (>= 1:1.0.1-1), + libxt-dev (>= 1:1.0.0-1), + quilt, # Reasons for build-depends: # debhelper for the packaging, pkg-config needed by configure scripts # Individual apps: commit 388ef092f6829930f709beef062a46b1d5a0792a Author: Cyril Brulebois <[email protected]> Date: Sat Nov 13 00:06:23 2010 +0100 Switch from --list-missing to --fail-missing for additional safety. diff --git a/debian/changelog b/debian/changelog index 6b4c355..f564a54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low * Stop passing MANCONF="/etc/manpath.config", that was for xman, which is now in x11-apps. * Stop passing --disable-xprint, it's gone. + * Switch from --list-missing to --fail-missing for additional safety. -- Cyril Brulebois <[email protected]> Fri, 12 Nov 2010 23:36:13 +0100 diff --git a/debian/rules b/debian/rules index fdee81c..6a3daf6 100755 --- a/debian/rules +++ b/debian/rules @@ -86,7 +86,7 @@ binary-arch: build install dh_testroot dh_installdocs - dh_install --sourcedir=debian/tmp --list-missing + dh_install --sourcedir=debian/tmp --fail-missing dh_installchangelogs dh_link dh_strip commit 5a2e77dd2a7987cc28ca25461e20a201d058d79a Author: Cyril Brulebois <[email protected]> Date: Sat Nov 13 00:06:14 2010 +0100 Stop passing --disable-xprint, it's gone. diff --git a/debian/changelog b/debian/changelog index 2e3ddc1..6b4c355 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low * Stop passing RSH=rsh accordingly. * Stop passing MANCONF="/etc/manpath.config", that was for xman, which is now in x11-apps. + * Stop passing --disable-xprint, it's gone. -- Cyril Brulebois <[email protected]> Fri, 12 Nov 2010 23:36:13 +0100 diff --git a/debian/rules b/debian/rules index 98c97c9..fdee81c 100755 --- a/debian/rules +++ b/debian/rules @@ -52,7 +52,6 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch ../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ $(confflags_$*) \ - --disable-xprint \ CFLAGS="$(CFLAGS)" cd $*-build && $(MAKE) >$@ commit e671d747c3067be09ecba754e39f749cc13a88c6 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 13 00:05:48 2010 +0100 Stop passing MANCONF="/etc/manpath.config", that was for xman, which is now in x11-apps. diff --git a/debian/changelog b/debian/changelog index 25b5d13..2e3ddc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low * Set confflags_xsm = --with-rsh=/usr/bin/rsh. * Drop 18_xsm_build_without_ssh.diff accordingly. * Stop passing RSH=rsh accordingly. + * Stop passing MANCONF="/etc/manpath.config", that was for xman, which + is now in x11-apps. -- Cyril Brulebois <[email protected]> Fri, 12 Nov 2010 23:36:13 +0100 diff --git a/debian/rules b/debian/rules index 4308b94..98c97c9 100755 --- a/debian/rules +++ b/debian/rules @@ -53,8 +53,7 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch --infodir=\$${prefix}/share/info $(confflags) \ $(confflags_$*) \ --disable-xprint \ - CFLAGS="$(CFLAGS)" \ - MANCONF="/etc/manpath.config" + CFLAGS="$(CFLAGS)" cd $*-build && $(MAKE) >$@ commit 7a1dbf0125994838040d8beb96c2b42b80a03549 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 13 00:05:16 2010 +0100 Stop passing RSH accordingly. diff --git a/debian/changelog b/debian/changelog index a55dbc8..25b5d13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low confflags_foo variable, specific to the foo package. * Set confflags_xsm = --with-rsh=/usr/bin/rsh. * Drop 18_xsm_build_without_ssh.diff accordingly. + * Stop passing RSH=rsh accordingly. -- Cyril Brulebois <[email protected]> Fri, 12 Nov 2010 23:36:13 +0100 diff --git a/debian/rules b/debian/rules index 5cd9651..4308b94 100755 --- a/debian/rules +++ b/debian/rules @@ -54,7 +54,6 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch $(confflags_$*) \ --disable-xprint \ CFLAGS="$(CFLAGS)" \ - RSH=rsh \ MANCONF="/etc/manpath.config" cd $*-build && $(MAKE) >$@ commit 07b933005e1585a07d6723da8d7a91470fe016d7 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 13 00:03:26 2010 +0100 Drop 18_xsm_build_without_ssh.diff accordingly. diff --git a/debian/changelog b/debian/changelog index c51b8d2..a55dbc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low * Pass $(confflags_$*) to configure so as to be able to specify an extra confflags_foo variable, specific to the foo package. * Set confflags_xsm = --with-rsh=/usr/bin/rsh. + * Drop 18_xsm_build_without_ssh.diff accordingly. -- Cyril Brulebois <[email protected]> Fri, 12 Nov 2010 23:36:13 +0100 diff --git a/debian/patches/18_xsm_build_without_ssh.diff b/debian/patches/18_xsm_build_without_ssh.diff deleted file mode 100644 index bba3b9a..0000000 --- a/debian/patches/18_xsm_build_without_ssh.diff +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index e2d8d5d..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -18_xsm_build_without_ssh.diff commit e5c91764a0b6fae82581449384f3c48c6b579978 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 13 00:03:07 2010 +0100 Set confflags_xsm = --with-rsh=/usr/bin/rsh. diff --git a/debian/changelog b/debian/changelog index 6e8a1cb..c51b8d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low * Refresh debian/copyright accordingly. * Pass $(confflags_$*) to configure so as to be able to specify an extra confflags_foo variable, specific to the foo package. + * Set confflags_xsm = --with-rsh=/usr/bin/rsh. -- Cyril Brulebois <[email protected]> Fri, 12 Nov 2010 23:36:13 +0100 diff --git a/debian/rules b/debian/rules index 79af2a9..5cd9651 100755 --- a/debian/rules +++ b/debian/rules @@ -38,6 +38,8 @@ else confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) endif +# target-specific confflags: +confflags_xsm = --with-rsh=/usr/bin/rsh build: build-stamp build-stamp: $(BUILD_STAMPS) commit 2cf52e0aea042f560f4287c9f87e1b2ff9bf690d Author: Cyril Brulebois <[email protected]> Date: Sat Nov 13 00:02:17 2010 +0100 Pass $(confflags_$*) to configure so as to be able to specify an extra confflags_foo variable, specific to the foo package. diff --git a/debian/changelog b/debian/changelog index 08f0c4d..6e8a1cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low * Add an update-copyright target to refresh debian/copyright using upstream's COPYING files, thanks to Julien Cristau. * Refresh debian/copyright accordingly. + * Pass $(confflags_$*) to configure so as to be able to specify an extra + confflags_foo variable, specific to the foo package. -- Cyril Brulebois <[email protected]> Fri, 12 Nov 2010 23:36:13 +0100 diff --git a/debian/rules b/debian/rules index cc99516..79af2a9 100755 --- a/debian/rules +++ b/debian/rules @@ -49,6 +49,7 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch cd $*-build && \ ../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ + $(confflags_$*) \ --disable-xprint \ CFLAGS="$(CFLAGS)" \ RSH=rsh \ commit 1685477b3b80aaceb07805b4c7662ac7a573f130 Author: Cyril Brulebois <[email protected]> Date: Fri Nov 12 23:49:30 2010 +0100 Refresh debian/copyright accordingly. diff --git a/debian/changelog b/debian/changelog index 9bb302f..08f0c4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ x11-session-utils (7.6~1) UNRELEASED; urgency=low * xsm 1.0.2 * Add an update-copyright target to refresh debian/copyright using upstream's COPYING files, thanks to Julien Cristau. + * Refresh debian/copyright accordingly. -- Cyril Brulebois <[email protected]> Fri, 12 Nov 2010 23:36:13 +0100 diff --git a/debian/copyright b/debian/copyright index 257e287..4df8f4a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,78 +1,64 @@ The applications bundled in this package were downloaded from http://xorg.freedesktop.org/releases/individual/app/ + It contains the rstart, smproxy and xsm applications. +rstart: + Copyright (c) 1993 Quarterdeck Office Systems + + Permission to use, copy, modify, distribute, and sell this software + and software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in all + copies and that both that copyright notice and this permission + notice appear in supporting documentation, and that the name + Quarterdeck Office Systems, Inc. not be used in advertising or + publicity pertaining to distribution of this software without + specific, written prior permission. + + THIS SOFTWARE IS PROVIDED `AS-IS'. QUARTERDECK OFFICE SYSTEMS, + INC., DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING WITHOUT LIMITATION ALL IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR + NONINFRINGEMENT. IN NO EVENT SHALL QUARTERDECK OFFICE SYSTEMS, + INC., BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING SPECIAL, + INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS OF USE, DATA, OR + PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND REGARDLESS + OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT + OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + smproxy: Copyright 1994, 1998 The Open Group - + Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation. - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - + Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. - - Author: Ralph Mor, X Consortium xsm: - Copyright 1993, 1998 The Open Group - - Permission to use, copy, modify, distribute, and sell this software and its - documentation for any purpose is hereby granted without fee, provided that - the above copyright notice appear in all copies and that both that - copyright notice and this permission notice appear in supporting - documentation. - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name of The Open Group shall not be - used in advertising or otherwise to promote the sale, use or other dealings - in this Software without prior written authorization from The Open Group. - * Authors: - * Ralph Mor, X Consortium - * Jordan Brown, Quarterdeck Office Systems + This is a stub file. This package has not yet had its complete licensing + information compiled. Please see the individual source files for details on + your rights to use and modify this software. -rstart: - Copyright (c) 1993 Quarterdeck Office Systems + Please submit updated COPYING files to the Xorg bugzilla: - Permission to use, copy, modify, distribute, and sell this software - and software and its documentation for any purpose is hereby granted - without fee, provided that the above copyright notice appear in all - copies and that both that copyright notice and this permission - notice appear in supporting documentation, and that the name - Quarterdeck Office Systems, Inc. not be used in advertising or - publicity pertaining to distribution of this software without - specific, written prior permission. + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
