--- xrestop-0.4.orig/xrestop.c +++ xrestop-0.4/xrestop.c @@ -528,8 +528,8 @@ clear(); - mvprintw(0, 0, "xrestop - Display: %s:%i", - app->dpy_name ? app->dpy_name : "localhost", app->screen); + mvprintw(0, 0, "xrestop - Display: %s", + app->dpy_name); mvprintw(1, 0, " Monitoring %i clients. XErrors: %i", app->n_clients, app->n_xerrors); mvprintw(2, 0, " Pixmaps: %8s total, Other: %8s total, All: %8s total", @@ -695,6 +695,11 @@ usage(argv[0]); } + if (app->dpy_name == NULL) + { + app->dpy_name = getenv("DISPLAY"); + } + if ((app->dpy = XOpenDisplay(app->dpy_name)) == NULL) { fprintf(stderr, "%s: Unable to open display!\n", argv[0]); --- xrestop-0.4.orig/doc/xrestop.1 +++ xrestop-0.4/doc/xrestop.1 @@ -28,7 +28,7 @@ stdout rather than the usual curses interface. This mode is intended for debugging a single client with something like .br - xrestop \-b | grep \-A 14 appname + xrestop \-b | grep \-A 15 appname .TP \fB\-\-max\-samples, \-m\fP Specify number of times to gather and display results. --- xrestop-0.4.orig/debian/README.Debian +++ xrestop-0.4/debian/README.Debian @@ -0,0 +1,11 @@ +xrestop for Debian +------------------ + +Please note that, as the upstream README states, xrestop requires the +X-Resource extension, supported by XFree86 4.3 or above, and by the +freedesktop.org X server. + +This package does not require that an X server which supports this extension +is installed locally, since you may wish to use it with a remote X server. + + -- Moray Allan , Sun, 11 Jan 2004 17:03:28 +0000 --- xrestop-0.4.orig/debian/compat +++ xrestop-0.4/debian/compat @@ -0,0 +1 @@ +5 --- xrestop-0.4.orig/debian/rules +++ xrestop-0.4/debian/rules @@ -0,0 +1,6 @@ +#!/usr/bin/make -f +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk + +clean:: + rm -f config.log config.status --- xrestop-0.4.orig/debian/dirs +++ xrestop-0.4/debian/dirs @@ -0,0 +1 @@ +usr/bin --- xrestop-0.4.orig/debian/copyright +++ xrestop-0.4/debian/copyright @@ -0,0 +1,23 @@ +This package was debianized by Moray Allan on +Sun, 11 Jan 2004 17:03:28 +0000. + +It was downloaded from http://www.freedesktop.org/Software/xrestop + +Upstream Author: Matthew Allum + +Copyright: + + Copyright 2003 Matthew Allum + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +On Debian systems, the complete text of the GNU General Public License +version 2 can be found in `/usr/share/common-licenses/GPL-2'. --- xrestop-0.4.orig/debian/changelog +++ xrestop-0.4/debian/changelog @@ -0,0 +1,63 @@ +xrestop (0.4-4) unstable; urgency=low + + * Update X11 Build-Depends. Closes: #515443. + + -- Moray Allan Sat, 25 Jul 2009 16:26:51 +0200 + +xrestop (0.4-3) unstable; urgency=low + + * Update Debian menu file for new menu policy. + + -- Moray Allan Sun, 16 Mar 2008 20:12:41 +0100 + +xrestop (0.4-2) unstable; urgency=low + + * Show correct display name when -d not used. Closes: #447527. + + -- Moray Allan Fri, 16 Nov 2007 18:54:22 +0000 + +xrestop (0.4-1) unstable; urgency=low + + * New upstream release. + * Can now quit by pressing Q. Closes: #333285. + + -- Moray Allan Sat, 4 Mar 2006 00:45:28 +0000 + +xrestop (0.3-3) unstable; urgency=low + + * Fix man page. Closes: #343547. + + -- Moray Allan Sat, 14 Jan 2006 18:54:37 +0000 + +xrestop (0.3-2) unstable; urgency=low + + * Add libxres-dev to Build-Depends, remove xlibs-static-dev. + Closes: #323992. + * Fix watch file URL. + + -- Moray Allan Sat, 20 Aug 2005 13:12:39 +0100 + +xrestop (0.3-1) unstable; urgency=low + + * New upstream release. + + -- Moray Allan Tue, 7 Jun 2005 00:42:28 +0100 + +xrestop (0.2-3) unstable; urgency=low + + * Upload to unstable. + + -- Moray Allan Thu, 19 Feb 2004 00:15:03 +0000 + +xrestop (0.2-2) experimental; urgency=low + + * Minor changes to manual page. + + -- Moray Allan Fri, 6 Feb 2004 23:56:44 +0000 + +xrestop (0.2-1) experimental; urgency=low + + * Initial release. Closes: #227109. + + -- Moray Allan Sun, 11 Jan 2004 17:03:28 +0000 + --- xrestop-0.4.orig/debian/control +++ xrestop-0.4/debian/control @@ -0,0 +1,18 @@ +Source: xrestop +Section: x11 +Priority: optional +Maintainer: Moray Allan +Build-Depends: cdbs (>= 0.4.14), debhelper (>= 5.0.0), libncurses5-dev, libxext-dev (>= 4.3.0), libx11-dev (>= 4.3.0), x11proto-core-dev, libxres-dev (>= 4.3.0), libice-dev (>= 4.3.0), pkg-config (>= 0.15.0) +Standards-Version: 3.8.2 + +Package: xrestop +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: X11 server resource usage monitor + xrestop uses the X-Resource extension to provide top(1)-like statistics + for each connected X11 client's server-side resource usage. It is intended + as a developer tool to aid more efficient server resource usage and debug + server-side resource leakage. + . + xrestop requires the X-Resource extension, supported by XFree86 4.3 and + above, and by the freedesktop.org X server. --- xrestop-0.4.orig/debian/xrestop.menu +++ xrestop-0.4/debian/xrestop.menu @@ -0,0 +1,6 @@ +?package(xrestop):\ + needs="X11"\ + section="Applications/System/Monitoring"\ + title="xrestop"\ + longtitle="xrestop: monitor X11 server resource usage"\ + command="/usr/bin/xrestop" --- xrestop-0.4.orig/debian/watch +++ xrestop-0.4/debian/watch @@ -0,0 +1,6 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# Site Directory Pattern Version Script +version=2 +http://www.freedesktop.org/software/xrestop/xrestop-(.*)\.tar\.gz debian uupdate