appres/ChangeLog | 170 appres/INSTALL | 143 appres/Makefile.am | 37 appres/Makefile.in | 416 appres/README | 24 appres/aclocal.m4 | 2494 ++- appres/appres.c | 8 appres/appres.man | 3 appres/compile | 142 appres/config.guess | 279 appres/config.h.in | 33 appres/config.sub | 201 appres/configure | 5506 ++++--- appres/configure.ac | 26 appres/depcomp | 172 appres/install-sh | 517 appres/missing | 104 debian/README.source | 73 debian/changelog | 150 debian/control | 58 debian/copyright | 418 debian/copyright.head | 6 debian/patches/01_luit_fix_race_condition.diff | 146 debian/patches/02_xev_flush_standard_output.diff | 20 debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff | 54 debian/patches/series | 3 debian/rules | 60 debian/watch.appres | 2 debian/watch.editres | 2 debian/watch.listres | 2 debian/watch.luit | 2 debian/watch.viewres | 2 debian/watch.xdpyinfo | 2 debian/watch.xdriinfo | 2 debian/watch.xev | 2 debian/watch.xfd | 2 debian/watch.xfontsel | 2 debian/watch.xkill | 2 debian/watch.xlsatoms | 2 debian/watch.xlsclients | 2 debian/watch.xlsfonts | 2 debian/watch.xmessage | 2 debian/watch.xprop | 2 debian/watch.xvinfo | 2 debian/watch.xwininfo | 2 debian/xsfbs/repack.sh | 32 debian/xsfbs/xsfbs-autoreconf.mk | 150 debian/xsfbs/xsfbs.mk | 167 debian/xsfbs/xsfbs.sh | 533 editres/AUTHORS | 1 editres/ChangeLog | 201 editres/Editres-color.ad | 91 editres/Editres.ad | 292 editres/INSTALL | 143 editres/Makefile.am | 54 editres/Makefile.in | 628 editres/README | 25 editres/aclocal.m4 | 2548 ++- editres/actions.c | 44 editres/app-defaults/Editres | 292 editres/app-defaults/Editres-color | 91 editres/comm.c | 58 editres/compile | 142 editres/config.guess | 279 editres/config.h.in | 33 editres/config.sub | 201 editres/configure | 5902 ++++--- editres/configure.ac | 35 editres/depcomp | 172 editres/editres.c | 10 editres/editresP.h | 48 editres/geometry.c | 46 editres/handler.c | 107 editres/install-sh | 517 editres/missing | 104 editres/setvalues.c | 7 editres/svpopup.c | 25 editres/utils.c | 98 editres/widgets.c | 62 editres/wtree.c | 59 listres/COPYING | 26 listres/ChangeLog | 282 listres/INSTALL | 143 listres/Makefile.am | 16 listres/Makefile.in | 399 listres/README | 26 listres/aclocal.m4 | 1948 +- listres/compile | 142 listres/config.guess | 271 listres/config.h.in | 33 listres/config.sub | 139 listres/configure | 6182 ++++---- listres/configure.ac | 18 listres/depcomp | 172 listres/install-sh | 517 listres/listres.c | 45 listres/missing | 104 listres/mkinstalldirs | 158 luit/COPYING | 26 luit/ChangeLog | 626 luit/INSTALL | 143 luit/Makefile.am | 71 luit/Makefile.in | 741 luit/README | 28 luit/acinclude.m4 | 116 luit/aclocal.m4 | 2465 ++- luit/charset.c | 630 luit/charset.h | 53 luit/compile | 142 luit/config.guess | 279 luit/config.h.in | 87 luit/config.sub | 201 luit/configure | 6178 ++++---- luit/configure.ac | 68 luit/depcomp | 172 luit/install-sh | 517 luit/iso2022.c | 1507 + luit/iso2022.h | 79 luit/luit.c | 932 - luit/luit.h | 7 luit/luit.man | 224 luit/man/Makefile.am | 35 luit/man/Makefile.in | 438 luit/man/luit.man | 246 luit/missing | 104 luit/mkinstalldirs | 158 luit/other.c | 446 luit/other.h | 39 luit/parser.c | 207 luit/parser.h | 7 luit/sys.c | 519 luit/sys.h | 26 viewres/COPYING | 26 viewres/ChangeLog | 408 viewres/INSTALL | 143 viewres/Makefile.am | 59 viewres/Makefile.in | 486 viewres/README | 26 viewres/Viewres.ad | 95 viewres/aclocal.m4 | 2548 ++- viewres/app-defaults/Viewres | 95 viewres/app-defaults/Viewres-color | 24 viewres/compile | 142 viewres/config.guess | 279 viewres/config.h.in | 33 viewres/config.sub | 201 viewres/configure | 5740 ++++--- viewres/configure.ac | 30 viewres/depcomp | 172 viewres/install-sh | 517 viewres/missing | 104 viewres/mkinstalldirs | 158 viewres/viewres.c | 8 xdpyinfo/COPYING | 26 xdpyinfo/ChangeLog | 690 xdpyinfo/INSTALL | 143 xdpyinfo/Makefile.am | 48 xdpyinfo/Makefile.in | 415 xdpyinfo/README | 30 xdpyinfo/aclocal.m4 | 2464 ++- xdpyinfo/config.guess | 279 xdpyinfo/config.h.in | 48 xdpyinfo/config.sub | 201 xdpyinfo/configure | 7300 +++++---- xdpyinfo/configure.ac | 103 xdpyinfo/depcomp | 172 xdpyinfo/install-sh | 517 xdpyinfo/missing | 104 xdpyinfo/mkinstalldirs | 158 xdpyinfo/xdpyinfo.c | 393 xdpyinfo/xdpyinfo.man | 8 xdriinfo/ChangeLog | 144 xdriinfo/INSTALL | 143 xdriinfo/Makefile.am | 35 xdriinfo/Makefile.in | 399 xdriinfo/README | 29 xdriinfo/aclocal.m4 | 2494 ++- xdriinfo/autogen.sh | 13 xdriinfo/config.guess | 279 xdriinfo/config.h.in | 34 xdriinfo/config.sub | 201 xdriinfo/configure | 5724 ++++--- xdriinfo/configure.ac | 29 xdriinfo/depcomp | 172 xdriinfo/install-sh | 517 xdriinfo/missing | 104 xdriinfo/xdriinfo.c | 4 xev/COPYING | 29 xev/ChangeLog | 399 xev/INSTALL | 143 xev/Makefile.am | 37 xev/Makefile.in | 418 xev/README | 31 xev/aclocal.m4 | 2482 ++- xev/compile | 142 xev/config.guess | 279 xev/config.h.in | 33 xev/config.sub | 201 xev/configure | 5502 ++++--- xev/configure.ac | 21 xev/depcomp | 172 xev/install-sh | 517 xev/missing | 104 xev/xev.c | 45 xev/xev.man | 10 xfd/COPYING | 25 xfd/ChangeLog | 478 xfd/INSTALL | 143 xfd/Makefile.am | 62 xfd/Makefile.in | 511 xfd/README | 26 xfd/Xfd.ad | 40 xfd/aclocal.m4 | 2531 ++- xfd/app-defaults/Xfd | 40 xfd/compile | 142 xfd/config.guess | 279 xfd/config.h.in | 39 xfd/config.sub | 201 xfd/configure | 6093 ++++--- xfd/configure.ac | 53 xfd/depcomp | 172 xfd/grid.c | 18 xfd/install-sh | 517 xfd/m4/ax_define_dir.m4 | 49 xfd/missing | 104 xfd/mkinstalldirs | 158 xfd/xfd.c | 80 xfd/xfd.man | 13 xfontsel/ChangeLog | 199 xfontsel/INSTALL | 143 xfontsel/Makefile.am | 59 xfontsel/Makefile.in | 494 xfontsel/README | 27 xfontsel/ULabel.c | 92 xfontsel/XFontSel.ad | 148 xfontsel/aclocal.m4 | 2530 ++- xfontsel/app-defaults/XFontSel | 148 xfontsel/autogen.sh | 13 xfontsel/compile | 142 xfontsel/config.guess | 279 xfontsel/config.h.in | 33 xfontsel/config.sub | 201 xfontsel/configure | 5822 ++++--- xfontsel/configure.ac | 29 xfontsel/depcomp | 172 xfontsel/install-sh | 517 xfontsel/missing | 104 xfontsel/xfontsel.c | 205 xkill/COPYING | 27 xkill/ChangeLog | 389 xkill/INSTALL | 143 xkill/Makefile.am | 36 xkill/Makefile.in | 419 xkill/README | 27 xkill/aclocal.m4 | 2494 ++- xkill/compile | 142 xkill/config.guess | 279 xkill/config.h.in | 33 xkill/config.sub | 201 xkill/configure | 5506 ++++--- xkill/configure.ac | 26 xkill/depcomp | 172 xkill/install-sh | 517 xkill/missing | 104 xkill/mkinstalldirs | 158 xkill/xkill.c | 35 xkill/xkill.man | 3 xlsatoms/COPYING | 25 xlsatoms/ChangeLog | 301 xlsatoms/INSTALL | 143 xlsatoms/Makefile.am | 16 xlsatoms/Makefile.in | 422 xlsatoms/README | 28 xlsatoms/aclocal.m4 | 2394 ++- xlsatoms/compile | 142 xlsatoms/config.guess | 271 xlsatoms/config.h.in | 33 xlsatoms/config.sub | 139 xlsatoms/configure | 5247 +++--- xlsatoms/configure.ac | 18 xlsatoms/depcomp | 172 xlsatoms/install-sh | 517 xlsatoms/missing | 104 xlsatoms/mkinstalldirs | 158 xlsatoms/xlsatoms.c | 137 xlsclients/COPYING | 46 xlsclients/ChangeLog | 416 xlsclients/INSTALL | 143 xlsclients/Makefile.am | 40 xlsclients/Makefile.in | 430 xlsclients/README | 29 xlsclients/aclocal.m4 | 2464 ++- xlsclients/compile | 142 xlsclients/config.guess | 279 xlsclients/config.h.in | 68 xlsclients/config.sub | 201 xlsclients/configure | 5750 ++++--- xlsclients/configure.ac | 30 xlsclients/depcomp | 172 xlsclients/install-sh | 517 xlsclients/missing | 104 xlsclients/mkinstalldirs | 158 xlsclients/strnlen.c | 37 xlsclients/strnlen.h | 32 xlsclients/xlsclients.c | 545 xlsfonts/ChangeLog | 158 xlsfonts/INSTALL | 143 xlsfonts/Makefile.am | 15 xlsfonts/Makefile.in | 409 xlsfonts/README | 25 xlsfonts/aclocal.m4 | 1280 + xlsfonts/compile | 142 xlsfonts/config.guess | 272 xlsfonts/config.h.in | 33 xlsfonts/config.sub | 146 xlsfonts/configure | 5994 ++++--- xlsfonts/configure.ac | 13 xlsfonts/depcomp | 172 xlsfonts/dsimple.c | 457 xlsfonts/dsimple.h | 36 xlsfonts/install-sh | 517 xlsfonts/missing | 104 xlsfonts/xlsfonts.c | 232 xlsfonts/xlsfonts.man | 88 xlsfonts/xlsfonts.sgml | 218 xmessage/COPYING | 57 xmessage/ChangeLog | 152 xmessage/INSTALL | 143 xmessage/Makefile.am | 43 xmessage/Makefile.in | 501 xmessage/Tests | 15 xmessage/Xmessage-color.ad | 44 xmessage/Xmessage.ad | 6 xmessage/aclocal.m4 | 1224 + xmessage/app-defaults/Xmessage | 6 xmessage/app-defaults/Xmessage-color | 44 xmessage/compile | 142 xmessage/config.guess | 302 xmessage/config.h.in | 33 xmessage/config.sub | 232 xmessage/configure | 7658 ++++++---- xmessage/configure.ac | 24 xmessage/depcomp | 172 xmessage/install-sh | 517 xmessage/makeform.c | 3 xmessage/missing | 104 xmessage/xmessage.c | 10 xprop/COPYING | 48 xprop/ChangeLog | 280 xprop/INSTALL | 291 xprop/Makefile.am | 39 xprop/Makefile.in | 325 xprop/README | 25 xprop/aclocal.m4 | 1378 + xprop/autogen.sh | 13 xprop/clientwin.c | 216 xprop/clientwin.h | 29 xprop/config.guess | 299 xprop/config.h.in | 6 xprop/config.sub | 211 xprop/configure | 5878 +++---- xprop/configure.ac | 27 xprop/depcomp | 116 xprop/dsimple.c | 25 xprop/dsimple.h | 5 xprop/install-sh | 231 xprop/missing | 49 xprop/xprop.c | 324 xprop/xprop.man | 17 xvinfo/COPYING | 30 xvinfo/ChangeLog | 161 xvinfo/INSTALL | 143 xvinfo/Makefile.am | 37 xvinfo/Makefile.in | 401 xvinfo/README | 26 xvinfo/aclocal.m4 | 2482 ++- xvinfo/config.guess | 279 xvinfo/config.h.in | 33 xvinfo/config.sub | 201 xvinfo/configure | 5502 ++++--- xvinfo/configure.ac | 20 xvinfo/depcomp | 172 xvinfo/install-sh | 517 xvinfo/missing | 104 xvinfo/xvinfo.c | 95 xvinfo/xvinfo.man | 6 xwininfo/COPYING | 71 xwininfo/ChangeLog | 420 xwininfo/INSTALL | 143 xwininfo/Makefile.am | 41 xwininfo/Makefile.in | 418 xwininfo/README | 26 xwininfo/aclocal.m4 | 2482 ++- xwininfo/autogen.sh | 13 xwininfo/clientwin.c | 246 xwininfo/clientwin.h | 31 xwininfo/compile | 142 xwininfo/config.guess | 275 xwininfo/config.h.in | 75 xwininfo/config.sub | 193 xwininfo/configure | 6058 ++++--- xwininfo/configure.ac | 50 xwininfo/depcomp | 172 xwininfo/dsimple.c | 764 xwininfo/dsimple.h | 64 xwininfo/install-sh | 517 xwininfo/missing | 104 xwininfo/mkinstalldirs | 158 xwininfo/strnlen.c | 37 xwininfo/strnlen.h | 32 xwininfo/xwininfo.c | 2431 ++- xwininfo/xwininfo.man | 7 412 files changed, 128720 insertions(+), 81802 deletions(-)
New commits: commit 29fdf2d6cc01f1011bff8d55520b543d75557fef Author: Cyril Brulebois <k...@debian.org> Date: Fri Nov 12 23:30:06 2010 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 8c78529..8ddda9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11-utils (7.6~1) UNRELEASED; urgency=low +x11-utils (7.6~1) experimental; urgency=low [ Robert Hooker ] * Add libxcomposite-dev to the build deps to enable Composite support @@ -35,7 +35,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low * Switch from --list-missing to --fail-missing for additional safety. * Add myself to Uploaders. - -- Cyril Brulebois <k...@debian.org> Fri, 12 Nov 2010 22:22:56 +0100 + -- Cyril Brulebois <k...@debian.org> Fri, 12 Nov 2010 23:21:32 +0100 x11-utils (7.5+4) unstable; urgency=low commit b0cbc690f437eae5e09d5a4ffc6027e202644ae6 Author: Cyril Brulebois <k...@debian.org> Date: Fri Nov 12 23:21:31 2010 +0100 Add x11proto-core-dev build-dep accordingly. diff --git a/debian/changelog b/debian/changelog index 26ce3d0..8c78529 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low * xprop 1.2.0 * xvinfo 1.1.1 * xwininfo 1.1.1 + * Add x11proto-core-dev build-dep accordingly. * Add libxcb-shape0-dev build-dep accordingly. * Bump lixcb1-dev build-dep accordingly. * Add an update-copyright target to refresh debian/copyright using diff --git a/debian/control b/debian/control index 5e50b00..e0a3fc9 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,7 @@ Build-Depends: x11proto-gl-dev, libgl1-mesa-dev, quilt, + x11proto-core-dev (>= 7.0.17), x11proto-input-dev (>= 1.4), libxinerama-dev (>= 1:1.0.1), libfontenc-dev, @@ -53,7 +54,8 @@ Build-Depends: # xmessage: libxaw7-dev, libxt-dev # xprop: libxmuu-dev, libx11-dev # xvinfo: libxv-dev, libx11-dev -# xwininfo: libxmuu-dev, libxext-dev, libx11-dev, libxcb-shape0-dev +# xwininfo: libxmuu-dev, libxext-dev, libx11-dev, libxcb-shape0-dev, +# x11proto-core-dev Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-utils Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-utils.git commit b153789cdd266c8db111d96fdf9c06141946e1f0 Author: Cyril Brulebois <k...@debian.org> Date: Fri Nov 12 23:07:42 2010 +0100 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index b24058b..26ce3d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low * Stop passing MANCONF="/etc/manpath.config", that was for xman, which is now in x11-apps. * Switch from --list-missing to --fail-missing for additional safety. + * Add myself to Uploaders. -- Cyril Brulebois <k...@debian.org> Fri, 12 Nov 2010 22:22:56 +0100 diff --git a/debian/control b/debian/control index ad0061a..5e50b00 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: x11-utils Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin <bgog...@debian.org> +Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin <bgog...@debian.org>, Cyril Brulebois <k...@debian.org> Build-Depends: debhelper (>= 5.0.0), xutils-dev (>= 1:7.5+4), commit 0abe8b0c5ba0c558f773859801947c701f4873bc Author: Cyril Brulebois <k...@debian.org> Date: Fri Nov 12 23:06:25 2010 +0100 Switch from --list-missing to --fail-missing for additional safety. diff --git a/debian/changelog b/debian/changelog index d1b1cf3..b24058b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low * Stop passing RSH=rsh, not used anymore. * Stop passing MANCONF="/etc/manpath.config", that was for xman, which is now in x11-apps. + * Switch from --list-missing to --fail-missing for additional safety. -- Cyril Brulebois <k...@debian.org> Fri, 12 Nov 2010 22:22:56 +0100 diff --git a/debian/rules b/debian/rules index fa8c771..cc5e74e 100755 --- a/debian/rules +++ b/debian/rules @@ -83,7 +83,7 @@ binary-arch: build install dh_testroot dh_installdocs - dh_install --sourcedir=debian/tmp --list-missing + dh_install --sourcedir=debian/tmp --fail-missing dh_installmenu dh_installchangelogs dh_link commit 64e54c73508df160ef22ba1a552a5659178d46fd Author: Cyril Brulebois <k...@debian.org> Date: Fri Nov 12 23:04:58 2010 +0100 Bump lixcb1-dev build-dep accordingly. diff --git a/debian/changelog b/debian/changelog index e1b7b9d..d1b1cf3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low * xvinfo 1.1.1 * xwininfo 1.1.1 * Add libxcb-shape0-dev build-dep accordingly. + * Bump lixcb1-dev build-dep accordingly. * Add an update-copyright target to refresh debian/copyright using upstream's COPYING files, thanks to Julien Cristau. * Refresh debian/copyright accordingly. diff --git a/debian/control b/debian/control index b456849..ad0061a 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Build-Depends: x11proto-input-dev (>= 1.4), libxinerama-dev (>= 1:1.0.1), libfontenc-dev, - libxcb1-dev, + libxcb1-dev (>= 1.6), libxcb-atom1-dev, libxcb-shape0-dev, gettext, commit 6c6cb16cee6694db4d6d7cb87d269f66044771c9 Author: Cyril Brulebois <k...@debian.org> Date: Fri Nov 12 23:04:24 2010 +0100 Add libxcb-shape0-dev build-dep accordingly. diff --git a/debian/changelog b/debian/changelog index 857fca9..e1b7b9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low * xprop 1.2.0 * xvinfo 1.1.1 * xwininfo 1.1.1 + * Add libxcb-shape0-dev build-dep accordingly. * Add an update-copyright target to refresh debian/copyright using upstream's COPYING files, thanks to Julien Cristau. * Refresh debian/copyright accordingly. diff --git a/debian/control b/debian/control index 20ef534..b456849 100644 --- a/debian/control +++ b/debian/control @@ -28,6 +28,7 @@ Build-Depends: libfontenc-dev, libxcb1-dev, libxcb-atom1-dev, + libxcb-shape0-dev, gettext, # Reasons for build-depends: # debhelper for the packaging, pkg-config needed by configure scripts @@ -52,7 +53,7 @@ Build-Depends: # xmessage: libxaw7-dev, libxt-dev # xprop: libxmuu-dev, libx11-dev # xvinfo: libxv-dev, libx11-dev -# xwininfo: libxmuu-dev, libxext-dev, libx11-dev +# xwininfo: libxmuu-dev, libxext-dev, libx11-dev, libxcb-shape0-dev Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-utils Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-utils.git commit 50e4bfa20ff05cf2891053469aa4d372e367692d Author: Cyril Brulebois <k...@debian.org> Date: Fri Nov 12 22:57:07 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 7c528e0..857fca9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ x11-utils (7.6~1) UNRELEASED; urgency=low * Refresh debian/copyright accordingly. * Stop passing --disable-xprint, it's gone. * Stop passing RSH=rsh, not used anymore. + * Stop passing MANCONF="/etc/manpath.config", that was for xman, which + is now in x11-apps. -- Cyril Brulebois <k...@debian.org> Fri, 12 Nov 2010 22:22:56 +0100 diff --git a/debian/rules b/debian/rules index 5368c7c..fa8c771 100755 --- a/debian/rules +++ b/debian/rules @@ -49,8 +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) \ - CFLAGS="$(CFLAGS)" \ - MANCONF="/etc/manpath.config" + CFLAGS="$(CFLAGS)" cd $*-build && $(MAKE) >$@ commit be70be34fc8bc9294b22b21e762cff1a2bddbce8 Author: Cyril Brulebois <k...@debian.org> Date: Fri Nov 12 22:55:14 2010 +0100 Stop passing RSH=rsh, not used anymore. diff --git a/debian/changelog b/debian/changelog index 2702314..7c528e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low upstream's COPYING files, thanks to Julien Cristau. * Refresh debian/copyright accordingly. * Stop passing --disable-xprint, it's gone. + * Stop passing RSH=rsh, not used anymore. -- Cyril Brulebois <k...@debian.org> Fri, 12 Nov 2010 22:22:56 +0100 diff --git a/debian/rules b/debian/rules index 29a2017..5368c7c 100755 --- a/debian/rules +++ b/debian/rules @@ -50,7 +50,6 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch ../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ CFLAGS="$(CFLAGS)" \ - RSH=rsh \ MANCONF="/etc/manpath.config" cd $*-build && $(MAKE) >$@ commit f49978e19a6a0d30e8ae3c0aa75732b0b1ada94c Author: Cyril Brulebois <k...@debian.org> Date: Fri Nov 12 22:54:21 2010 +0100 Stop passing --disable-xprint, it's gone. diff --git a/debian/changelog b/debian/changelog index c1410f9..2702314 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ x11-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. + * Stop passing --disable-xprint, it's gone. -- Cyril Brulebois <k...@debian.org> Fri, 12 Nov 2010 22:22:56 +0100 diff --git a/debian/rules b/debian/rules index ba02c40..29a2017 100755 --- a/debian/rules +++ b/debian/rules @@ -49,7 +49,6 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch cd $*-build && \ ../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ - --disable-xprint \ CFLAGS="$(CFLAGS)" \ RSH=rsh \ MANCONF="/etc/manpath.config" commit f7190079761b424cfc54c8425ba69e23aa023814 Author: Cyril Brulebois <k...@debian.org> Date: Fri Nov 12 22:50:34 2010 +0100 Add xutils-dev build-dep for new macros. diff --git a/debian/changelog b/debian/changelog index 033e719..c1410f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low [ Cyril Brulebois ] * New upstream release candidate: X11R7.6 RC1. + * Add xutils-dev build-dep for new macros. * appres 1.0.3 * editres 1.0.5 * luit 1.1.0 diff --git a/debian/control b/debian/control index 79c1a8a..20ef534 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin <bgog...@debian.org> Build-Depends: debhelper (>= 5.0.0), + xutils-dev (>= 1:7.5+4), pkg-config, libx11-dev (>= 2:1.0.0), libxaw7-dev (>= 1:1.0.1), commit 6caf4908e031ceab501e32c50d2fc3990f3c8be0 Author: Cyril Brulebois <k...@debian.org> Date: Fri Nov 12 22:41:13 2010 +0100 Add gettext build-dep accordingly. diff --git a/debian/changelog b/debian/changelog index 5f8bef1..033e719 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low * xdriinfo 1.0.4 * xev 1.1.0 * xfd 1.1.0 + * Add gettext build-dep accordingly. * xfontsel 1.0.3 * xkill 1.0.3 * xlsclients 1.1.1 diff --git a/debian/control b/debian/control index 44a7df6..79c1a8a 100644 --- a/debian/control +++ b/debian/control @@ -27,6 +27,7 @@ Build-Depends: libfontenc-dev, libxcb1-dev, libxcb-atom1-dev, + gettext, # Reasons for build-depends: # debhelper for the packaging, pkg-config needed by configure scripts # Individual apps: @@ -40,7 +41,8 @@ Build-Depends: # libxinerama-dev, libdmx-dev, libxcomposite-dev # xdriinfo: libx11-dev, x11proto-gl-dev, libgl1-mesa-dev # xev: libx11-dev -# xfd: libxaw7-dev, libfreetype2-dev, libfontconfig-dev, libxft-dev, libxt-dev +# xfd: libxaw7-dev, libfreetype2-dev, libfontconfig-dev, libxft-dev, libxt-dev, +# gettext # xfontsel: libxaw7-dev, libxt-dev # xkill: libx11-dev, libxmuu-dev # xlsatoms: libxcb1-dev commit 0c3201c69c6c1efb90ea3444614024413f8e04a1 Author: Cyril Brulebois <k...@debian.org> Date: Fri Nov 12 22:29:43 2010 +0100 Refresh debian/copyright accordingly. diff --git a/debian/changelog b/debian/changelog index 6e6331d..5f8bef1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ x11-utils (7.6~1) UNRELEASED; urgency=low * xwininfo 1.1.1 * Add an update-copyright target to refresh debian/copyright using upstream's COPYING files, thanks to Julien Cristau. + * Refresh debian/copyright accordingly. -- Cyril Brulebois <k...@debian.org> Fri, 12 Nov 2010 22:22:56 +0100 diff --git a/debian/copyright b/debian/copyright index 05be090..f5df658 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,73 +1,94 @@ The contents of this package were downloaded from http://xorg.freedesktop.org/releases/individual/app/ + It contains the appres, editres, listres, luit, viewres, xdpyinfo, xdriinfo, xev, xfd, xfontsel, xkill, xlsatoms, xlsclients, xlsfonts, xmessage, xprop, xvinfo and xwininfo applications. -editres: +appres: Copyright 1989, 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. + +editres: + Copyright 1989, 1990, 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. listres: - Copyright (c) 1989 X Consortium - + Copyright (c) 1989, 1994 X Consortium + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + 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 X CONSORTIUM 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 X Consortium 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 X Consortium. - * * - * Author: Jim Fulton, MIT X Consortium - */ luit: Copyright (c) 2001 by Juliusz Chroboczek Copyright (c) 2002 by Tomohiro KUBOTA - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + 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 @@ -77,62 +98,78 @@ luit: THE SOFTWARE. viewres: - Copyright (c) 1989 X Consortium - + Copyright (c) 1989, 1994 X Consortium + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + 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 X CONSORTIUM 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 X Consortium 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 X Consortium. - * * - * Author: Jim Fulton, MIT X Consortium - */ xdpyinfo: Copyright 1988, 1998 The Open Group Copyright 2005 Hitachi, Ltd. - + 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: Jim Fulton, MIT X Consortium - */ + +xdriinfo: + Client application for querying drivers' configuration information + Copyright (C) 2003 Felix Kuehling + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + 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 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1ph29e-00075r...@alioth.debian.org