bitmap/ChangeLog | 176 bitmap/INSTALL | 291 bitmap/Makefile.am | 96 bitmap/Makefile.in | 386 bitmap/aclocal.m4 | 833 + bitmap/bitmap.icon | 14 bitmap/bitmap.man | 654 - bitmap/compile | 6 bitmap/config.guess | 210 bitmap/config.h.in | 3 bitmap/config.sub | 115 bitmap/configure | 5222 ++++---- bitmap/configure.ac | 41 bitmap/man/Makefile.am | 38 bitmap/man/Makefile.in | 443 bitmap/man/atobm.man | 1 bitmap/man/bitmap.man | 654 + bitmap/man/bmtoa.man | 1 debian/changelog | 65 debian/control | 9 debian/copyright | 268 debian/patches/01_xedit_mkdir_races.diff | 2588 ---- debian/patches/02_xedit_manpage_typos.diff | 22 debian/patches/03_xconsole_implicit_pointer_conversion.diff | 16 debian/patches/05_xmore_fix_segv_without_xprint.diff | 34 debian/patches/series | 4 debian/rules | 5 ico/ChangeLog | 160 ico/INSTALL | 291 ico/Makefile.am | 37 ico/Makefile.in | 322 ico/README | 28 ico/aclocal.m4 | 1378 +- ico/config.guess | 299 ico/config.h.in | 33 ico/config.sub | 211 ico/configure | 5402 +++++--- ico/configure.ac | 21 ico/depcomp | 116 ico/ico.c | 67 ico/ico.man | 2 ico/install-sh | 231 ico/missing | 49 ico/polyinfo.h | 1 oclock/COPYING | 49 oclock/ChangeLog | 366 oclock/Clock-color.ad | 6 oclock/Clock.c | 72 oclock/INSTALL | 143 oclock/Makefile.am | 56 oclock/Makefile.in | 515 oclock/README | 26 oclock/aclocal.m4 | 2446 ++-- oclock/app-defaults/Clock-color | 6 oclock/compile | 142 oclock/config.guess | 291 oclock/config.h.in | 42 oclock/config.sub | 161 oclock/configure | 5715 +++++---- oclock/configure.ac | 28 oclock/depcomp | 172 oclock/install-sh | 517 oclock/missing | 104 oclock/mkinstalldirs | 158 oclock/oclock.c | 16 oclock/transform.c | 39 x11perf/COPYING | 35 x11perf/ChangeLog | 232 x11perf/INSTALL | 291 x11perf/Makefile.am | 28 x11perf/Makefile.in | 62 x11perf/Xmark | 4 x11perf/Xmark.man | 1 x11perf/aclocal.m4 | 877 + x11perf/bitmaps.c | 1 x11perf/bitmaps.h | 2 x11perf/config.guess | 210 x11perf/config.h.in | 3 x11perf/config.sub | 115 x11perf/configure | 4309 +++---- x11perf/configure.ac | 39 x11perf/do_arcs.c | 2 x11perf/do_blt.c | 2 x11perf/do_complex.c | 2 x11perf/do_dots.c | 2 x11perf/do_lines.c | 2 x11perf/do_movewin.c | 2 x11perf/do_rects.c | 2 x11perf/do_segs.c | 2 x11perf/do_simple.c | 2 x11perf/do_tests.c | 4 x11perf/do_text.c | 2 x11perf/do_traps.c | 4 x11perf/do_tris.c | 2 x11perf/do_valgc.c | 2 x11perf/do_windows.c | 2 x11perf/x11pcomp.cpp | 1 x11perf/x11perf.c | 23 x11perf/x11perf.h | 4 x11perf/x11perf.man | 4 x11perf/x11perfcomp.man | 2 xbiff/ChangeLog | 127 xbiff/MailboxP.h | 26 xbiff/Makefile.am | 35 xbiff/Makefile.in | 316 xbiff/aclocal.m4 | 851 + xbiff/config.guess | 18 xbiff/config.h.in | 6 xbiff/config.sub | 76 xbiff/configure | 1288 +- xbiff/configure.ac | 47 xbiff/man/Makefile.am | 12 xbiff/man/Makefile.in | 412 xbiff/man/xbiff.man | 216 xbiff/xbiff.man | 216 xcalc/ChangeLog | 116 xcalc/Makefile.am | 22 xcalc/Makefile.in | 24 xcalc/aclocal.m4 | 837 + xcalc/actions.c | 1 xcalc/app-defaults/XCalc | 2 xcalc/config.guess | 18 xcalc/config.sub | 76 xcalc/configure | 1711 -- xcalc/configure.ac | 31 xcalc/math.c | 6 xcalc/xcalc.c | 4 xcalc/xcalc.h | 2 xcalc/xcalc.man | 3 xclipboard/COPYING | 25 xclipboard/ChangeLog | 146 xclipboard/INSTALL | 291 xclipboard/Makefile.am | 30 xclipboard/Makefile.in | 64 xclipboard/aclocal.m4 | 863 + xclipboard/app-defaults/XClipboard | 1 xclipboard/config.guess | 210 xclipboard/config.h.in | 3 xclipboard/config.sub | 115 xclipboard/configure | 4113 ++---- xclipboard/configure.ac | 30 xclipboard/xclipboard.c | 9 xclipboard/xclipboard.man | 2 xclipboard/xcutsel.c | 9 xclipboard/xcutsel.man | 2 xclock/COPYING | 46 xclock/ChangeLog | 157 xclock/Clock.c | 50 xclock/INSTALL | 17 xclock/Makefile.am | 32 xclock/Makefile.in | 70 xclock/aclocal.m4 | 833 + xclock/config.guess | 210 xclock/config.h.in | 3 xclock/config.sub | 115 xclock/configure | 5171 ++++---- xclock/configure.ac | 25 xclock/xclock.c | 2 xconsole/COPYING | 25 xconsole/ChangeLog | 326 xconsole/INSTALL | 143 xconsole/Makefile.am | 59 xconsole/Makefile.in | 458 xconsole/README | 26 xconsole/XConsole.ad | 28 xconsole/aclocal.m4 | 2530 ++-- xconsole/app-defaults/XConsole | 28 xconsole/config.guess | 279 xconsole/config.h.in | 3 xconsole/config.sub | 201 xconsole/configure | 6570 +++++----- xconsole/configure.ac | 30 xconsole/depcomp | 172 xconsole/install-sh | 517 xconsole/missing | 104 xconsole/xconsole.c | 6 xcursorgen/ChangeLog | 113 xcursorgen/INSTALL | 157 xcursorgen/Makefile.am | 22 xcursorgen/Makefile.in | 51 xcursorgen/aclocal.m4 | 833 + xcursorgen/config.guess | 210 xcursorgen/config.h.in | 3 xcursorgen/config.sub | 115 xcursorgen/configure | 3944 ++---- xcursorgen/configure.ac | 22 xcursorgen/xcursorgen.c | 2 xditview/COPYING | 29 xditview/ChangeLog | 382 xditview/Dvi.c | 72 xditview/DviChar.c | 481 xditview/INSTALL | 143 xditview/Makefile.am | 58 xditview/Makefile.in | 649 - xditview/README | 25 xditview/XFontName.c | 20 xditview/Xditview-chrtr.ad | 25 xditview/Xditview.ad | 96 xditview/aclocal.m4 | 2511 ++-- xditview/app-defaults/Xditview | 96 xditview/app-defaults/Xditview-chrtr | 25 xditview/compile | 142 xditview/config.guess | 291 xditview/config.h.in | 44 xditview/config.sub | 161 xditview/configure | 5860 +++++---- xditview/configure.ac | 30 xditview/depcomp | 172 xditview/draw.c | 66 xditview/font.c | 72 xditview/install-sh | 517 xditview/lex.c | 17 xditview/missing | 104 xditview/mkinstalldirs | 158 xditview/page.c | 20 xditview/parse.c | 21 xditview/xditview.c | 62 xedit/ChangeLog | 249 xedit/INSTALL | 291 xedit/Makefile.am | 94 xedit/Makefile.in | 625 - xedit/aclocal.m4 | 2287 ++- xedit/app-defaults/Xedit | 468 xedit/app-defaults/Xedit-color | 195 xedit/app-defaults/Xedit-color.ad | 195 xedit/app-defaults/Xedit-noxprint.ad | 468 xedit/app-defaults/Xedit-xprint.ad | 565 xedit/commands.c | 118 xedit/config.guess | 11 xedit/config.h.in | 30 xedit/config.sub | 61 xedit/configure | 2299 ++- xedit/configure.ac | 37 xedit/lisp/io.c | 14 xedit/lisp/modules/progmodes/auto.lsp | 13 xedit/print.c | 435 xedit/print.h | 56 xedit/printdialog.c | 1396 -- xedit/printdialog.h | 70 xedit/printdialogprivates.h | 182 xedit/tags.c | 20 xedit/xedit.c | 46 xedit/xedit.h | 6 xedit/xedit.man | 4 xeyes/COPYING | 29 xeyes/ChangeLog | 195 xeyes/Eyes.c | 2 xeyes/Eyes.h | 3 xeyes/EyesP.h | 3 xeyes/INSTALL | 291 xeyes/Makefile.am | 30 xeyes/Makefile.in | 48 xeyes/aclocal.m4 | 2128 ++- xeyes/config.guess | 213 xeyes/config.h.in | 3 xeyes/config.sub | 112 xeyes/configure | 4533 ++----- xeyes/configure.ac | 31 xeyes/transform.c | 1 xeyes/transform.h | 1 xeyes/xeyes.c | 35 xeyes/xeyes.man | 4 xgc/COPYING | 43 xgc/ChangeLog | 172 xgc/INSTALL | 291 xgc/Makefile.am | 32 xgc/Makefile.in | 65 xgc/aclocal.m4 | 851 + xgc/choice.c | 1 xgc/config.guess | 210 xgc/config.h.in | 3 xgc/config.sub | 115 xgc/configure | 4988 ++------ xgc/configure.ac | 27 xgc/dashlist.c | 1 xgc/getfile.c | 1 xgc/gram.c | 52 xgc/gram.h | 2 xgc/gram.y | 1 xgc/interpret.c | 1 xgc/lex.c | 158 xgc/lex.l | 2 xgc/main.c | 2 xgc/planemask.c | 1 xgc/record.c | 1 xgc/testfrac.c | 1 xgc/tests.c | 2 xgc/text.c | 1 xgc/tile | 1 xgc/xgc.h | 6 xgc/xgc.man | 38 xload/COPYING | 85 xload/ChangeLog | 545 xload/INSTALL | 291 xload/Makefile.am | 63 xload/Makefile.in | 535 xload/README | 25 xload/XLoad.ad | 6 xload/aclocal.m4 | 1773 ++ xload/app-defaults/XLoad | 6 xload/compile | 142 xload/config.guess | 210 xload/config.h.in | 39 xload/config.sub | 115 xload/configure | 7327 +++++++----- xload/configure.ac | 49 xload/depcomp | 172 xload/get_load.c | 61 xload/get_rload.c | 25 xload/install-sh | 517 xload/m4/ax_define_dir.m4 | 49 xload/missing | 104 xload/mkinstalldirs | 111 xload/xload.c | 127 xload/xload.h | 13 xload/xload.man | 12 xlogo/COPYING | 28 xlogo/ChangeLog | 102 xlogo/Makefile.am | 22 xlogo/Makefile.in | 30 xlogo/aclocal.m4 | 828 + xlogo/config.guess | 18 xlogo/config.sub | 76 xlogo/configure | 2016 --- xlogo/configure.ac | 34 xmag/COPYING | 52 xmag/ChangeLog | 152 xmag/CutPaste.c | 2 xmag/CutPaste.h | 1 xmag/INSTALL | 291 xmag/Makefile.am | 34 xmag/Makefile.in | 341 xmag/README | 25 xmag/RootWin.c | 2 xmag/RootWin.h | 1 xmag/RootWinP.h | 1 xmag/Scale.c | 2 xmag/Scale.h | 2 xmag/ScaleP.h | 1 xmag/aclocal.m4 | 1857 +-- xmag/app-defaults/Xmag | 2 xmag/config.guess | 299 xmag/config.h.in | 3 xmag/config.sub | 211 xmag/configure | 5844 ++++----- xmag/configure.ac | 31 xmag/depcomp | 116 xmag/install-sh | 231 xmag/missing | 49 xmag/xmag.c | 2 xmag/xmag.man | 2 xman/COPYING | 51 xman/ChangeLog | 141 xman/INSTALL | 291 xman/Makefile.am | 33 xman/Makefile.in | 67 xman/aclocal.m4 | 851 + xman/config.guess | 210 xman/config.h.in | 6 xman/config.sub | 115 xman/configure | 4376 +++---- xman/configure.ac | 30 xman/handler.c | 9 xman/man.h | 1 xman/version.h | 32 xmore/ChangeLog | 489 xmore/INSTALL | 143 xmore/Makefile.am | 68 xmore/Makefile.in | 534 xmore/README | 25 xmore/XMore.ad | 130 xmore/aclocal.m4 | 2511 ++-- xmore/app-defaults/XMore | 33 xmore/compile | 142 xmore/config.guess | 291 xmore/config.h.in | 42 xmore/config.sub | 161 xmore/configure | 5800 +++++---- xmore/configure.ac | 35 xmore/depcomp | 172 xmore/install-sh | 517 xmore/missing | 104 xmore/mkinstalldirs | 158 xmore/print.c | 435 xmore/print.h | 56 xmore/printdialog.c | 1396 -- xmore/printdialog.h | 70 xmore/printdialogprivates.h | 182 xmore/xmore.c | 145 xmore/xmore.man | 7 xmore/xmore.sgml | 19 xwd/ChangeLog | 130 xwd/INSTALL | 291 xwd/Makefile.am | 30 xwd/Makefile.in | 62 xwd/aclocal.m4 | 863 + xwd/config.guess | 210 xwd/config.h.in | 3 xwd/config.sub | 115 xwd/configure | 3936 ++---- xwd/configure.ac | 26 xwd/dsimple.c | 2 xwd/dsimple.h | 2 xwd/list.c | 2 xwd/list.h | 2 xwd/multiVis.c | 2 xwd/multiVis.h | 2 xwd/wsutils.h | 2 xwd/xwd.c | 3 xwd/xwd.man | 3 xwud/ChangeLog | 130 xwud/INSTALL | 291 xwud/Makefile.am | 30 xwud/Makefile.in | 62 xwud/aclocal.m4 | 863 + xwud/config.guess | 210 xwud/config.h.in | 3 xwud/config.sub | 115 xwud/configure | 3936 ++---- xwud/configure.ac | 26 xwud/xwud.c | 2 xwud/xwud.man | 3 422 files changed, 91767 insertions(+), 76203 deletions(-)
New commits: commit 2ab529482dc822937170a0a1cd0581940b6005b7 Author: Julien Cristau <[email protected]> Date: Wed Feb 9 18:13:13 2011 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index e0d532a..d361c50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11-apps (7.6+4) UNRELEASED; urgency=low +x11-apps (7.6+4) unstable; urgency=low * debian/rules::get-tarballs: pass "--destdir ." to uscan * xbiff 1.0.3. @@ -6,8 +6,9 @@ x11-apps (7.6+4) UNRELEASED; urgency=low work! * Drop Pre-Depends on x11-common. * Bump Standards-Version to 3.9.1. + * Upload to unstable. - -- Julien Cristau <[email protected]> Wed, 09 Feb 2011 17:53:21 +0100 + -- Julien Cristau <[email protected]> Wed, 09 Feb 2011 18:15:58 +0100 x11-apps (7.6+3) experimental; urgency=low commit a53b41390fb26bea90d6d09384e227224b3b4e67 Author: Julien Cristau <[email protected]> Date: Wed Feb 9 18:13:05 2011 +0100 Bump Standards-Version to 3.9.1. diff --git a/debian/changelog b/debian/changelog index 4149f34..e0d532a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x11-apps (7.6+4) UNRELEASED; urgency=low * Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your work! * Drop Pre-Depends on x11-common. + * Bump Standards-Version to 3.9.1. -- Julien Cristau <[email protected]> Wed, 09 Feb 2011 17:53:21 +0100 diff --git a/debian/control b/debian/control index a8c1331..305a1c4 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libpng12-dev, # xmore: libxaw7-dev, libxt-dev # xwd: libx11-dev # xwud: libx11-dev -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-apps Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-apps.git commit 3d54844dd08607029c9b9993628ec8ce3c28c400 Author: Julien Cristau <[email protected]> Date: Wed Feb 9 18:08:19 2011 +0100 Drop Pre-Depends on x11-common. diff --git a/debian/changelog b/debian/changelog index 0144c1d..4149f34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ x11-apps (7.6+4) UNRELEASED; urgency=low * xbiff 1.0.3. * Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your work! + * Drop Pre-Depends on x11-common. -- Julien Cristau <[email protected]> Wed, 09 Feb 2011 17:53:21 +0100 diff --git a/debian/control b/debian/control index edd50bf..a8c1331 100644 --- a/debian/control +++ b/debian/control @@ -42,7 +42,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-apps.git Package: x11-apps Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, cpp -Pre-Depends: x11-common (>= 1:7.0.0) Suggests: mesa-utils Conflicts: bitmap, oclock, x11perf, xbiff, xcalc, xclipboard, xclock, xconsole, xcursorgen, xditview, xeyes, xgc, xload, xlogo, xmag, xman, xmore, xwd, commit 7e1732ff5967111d6240292069d240df8e98ed1a Author: Julien Cristau <[email protected]> Date: Wed Feb 9 18:06:21 2011 +0100 Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your work! diff --git a/debian/changelog b/debian/changelog index d6afedc..0144c1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ x11-apps (7.6+4) UNRELEASED; urgency=low * debian/rules::get-tarballs: pass "--destdir ." to uscan * xbiff 1.0.3. + * Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your + work! -- Julien Cristau <[email protected]> Wed, 09 Feb 2011 17:53:21 +0100 diff --git a/debian/control b/debian/control index 2fa6e2f..edd50bf 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: x11-apps 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, libpng12-dev, libx11-dev (>= 2:1.0.0), libxaw7-dev (>= 1:1.0.1), libxcursor-dev (>= 1.1.5.2), libxext-dev (>= 1:1.0.0), commit fc72eeeb8882466f0841ca0c68351890a0829dec Author: Julien Cristau <[email protected]> Date: Wed Feb 9 17:58:56 2011 +0100 xbiff 1.0.3. diff --git a/debian/changelog b/debian/changelog index 2aedb93..d6afedc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ x11-apps (7.6+4) UNRELEASED; urgency=low * debian/rules::get-tarballs: pass "--destdir ." to uscan + * xbiff 1.0.3. -- Julien Cristau <[email protected]> Wed, 09 Feb 2011 17:53:21 +0100 diff --git a/xbiff/ChangeLog b/xbiff/ChangeLog index 9cf2a39..4bcba68 100644 --- a/xbiff/ChangeLog +++ b/xbiff/ChangeLog @@ -1,3 +1,130 @@ +commit 3d9d486dfbd40dedc328943fc39041874bb15a25 +Author: Alan Coopersmith <[email protected]> +Date: Tue Jan 25 12:43:26 2011 -0800 + + xbiff 1.0.3 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 2493d94686bfb758428c4479114f47b99db04456 +Author: Gaetan Nadon <[email protected]> +Date: Wed Jan 19 10:06:55 2011 -0500 + + config: move man pages into their own directory + + Use services provided by XORG_MANPAGE_SECTIONS. + Use standard Makefile for man pages. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 9bf1cbbd49fbb11707e3bc30429e1fbedd5abec8 +Author: Alan Coopersmith <[email protected]> +Date: Fri Jan 7 17:13:49 2011 -0800 + + Add --with-mailbox-directory=PATH option to configure + + Lets builders set a specific path for mailboxes when the defaults + don't match the system setup + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Dan Nicholson <[email protected]> + +commit dc963f6d676d1735144ff3997c0ab5bf7cc3889f +Author: Alan Coopersmith <[email protected]> +Date: Fri Jan 7 16:06:40 2011 -0800 + + Use <paths.h> and _PATH_MAILDIR to find mailboxes if present + + Use autoconf to check for paths.h on all systems, instead of + only including it #ifdef CSRG_BASED + + Makes _PATH_MAILDIR the preferred mail directory path on all systems + if it's defined, falls back to old per-system hardcoded paths if not. + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Mark Kettenis <[email protected]> + Reviewed-by: Dan Nicholson <[email protected]> + +commit 6cabab62873999d56a6cca6452c0cbe84dbacd9a +Author: Gaetan Nadon <[email protected]> +Date: Thu Jan 13 17:15:36 2011 -0500 + + man: replace hard coded man page section with substitution strings + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit ef54b28477afbe2e059f5d399513716a86d6e1d0 +Author: Gaetan Nadon <[email protected]> +Date: Thu Jan 13 11:15:47 2011 -0500 + + man: remove trailing spaces and tabs + + Using s/[ \t]*$// + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 478f979bce3426af3efdb97f8cf40610ed8f9076 +Author: Alan Coopersmith <[email protected]> +Date: Sun Oct 31 12:17:10 2010 -0700 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Regroup AC statements under the Autoconf initialization section. + Regroup AM sttaements under the Automake initialization section. + Add missing AC_CONFIG_SRCDIR + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit b4bc572dede7e2433bc368faf572b49ad852dd8c +Author: Gaetan Nadon <[email protected]> +Date: Sun Oct 31 12:06:15 2010 -0700 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 5f5d8495455e806ea66f021f49efb1fa3d3f5221 +Author: Alan Coopersmith <[email protected]> +Date: Sun Oct 31 12:05:38 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 070c9d45cc0678708d5766804d0c529bc6f8bee3 +Author: Alan Coopersmith <[email protected]> +Date: Thu Jul 1 16:38:53 2010 -0700 + + Xmu functions are called directly, so include it in PKG_CHECK_MODULES + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 3fb1f51edec3e4b599d8e8b42e8220bf526bc3b4 +Author: Alan Coopersmith <[email protected]> +Date: Wed Jun 30 23:25:03 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use XORG_DEFAULT_OPTIONS provided $(SED) + Use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <[email protected]> + commit 6b546577aadec95c09da148936dbfd55b9cd0216 Author: Alan Coopersmith <[email protected]> Date: Thu Dec 17 08:32:12 2009 -0800 diff --git a/xbiff/MailboxP.h b/xbiff/MailboxP.h index 937f895..f21d62a 100644 --- a/xbiff/MailboxP.h +++ b/xbiff/MailboxP.h @@ -33,24 +33,26 @@ from the X Consortium. #ifndef _XawMailboxP_h #define _XawMailboxP_h +#include "config.h" #include "Mailbox.h" #include <X11/Xaw/SimpleP.h> -#if defined(SYSV) -#define MAILBOX_DIRECTORY "/usr/mail" -#elif defined(SVR4) -#define MAILBOX_DIRECTORY "/var/mail" -#elif defined(CSRG_BASED) -#include <paths.h> -#ifdef _PATH_MAILDIR -#define MAILBOX_DIRECTORY _PATH_MAILDIR -#endif -#elif defined(__linux__) -#define MAILBOX_DIRECTORY "/var/spool/mail" +#ifdef HAVE_PATHS_H +# include <paths.h> #endif #ifndef MAILBOX_DIRECTORY -#define MAILBOX_DIRECTORY "/usr/spool/mail" +# ifdef _PATH_MAILDIR +# define MAILBOX_DIRECTORY _PATH_MAILDIR +# elif defined(SYSV) +# define MAILBOX_DIRECTORY "/usr/mail" +# elif defined(SVR4) +# define MAILBOX_DIRECTORY "/var/mail" +# elif defined(__linux__) +# define MAILBOX_DIRECTORY "/var/spool/mail" +# else +# define MAILBOX_DIRECTORY "/usr/spool/mail" +# endif #endif typedef struct { /* new fields for mailbox widget */ diff --git a/xbiff/Makefile.am b/xbiff/Makefile.am index b49c553..dcf3d90 100644 --- a/xbiff/Makefile.am +++ b/xbiff/Makefile.am @@ -19,6 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xbiff AM_CFLAGS = $(CWARNFLAGS) $(XBIFF_CFLAGS) -D_BSD_SOURCE @@ -30,43 +31,9 @@ xbiff_SOURCES = \ MailboxP.h \ xbiff.c -appman_PRE = \ - xbiff.man - EXTRA_DIST = bitmaps/mail-down bitmaps/mail-up bitmaps/mail-down-mask bitmaps/mail-up-mask -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST += $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - .PHONY: ChangeLog INSTALL diff --git a/xbiff/Makefile.in b/xbiff/Makefile.in index 69764ba..5fb3a23 100644 --- a/xbiff/Makefile.in +++ b/xbiff/Makefile.in @@ -36,7 +36,6 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -72,7 +71,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" +am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_xbiff_OBJECTS = Mailbox.$(OBJEXT) xbiff.$(OBJEXT) xbiff_OBJECTS = $(am_xbiff_OBJECTS) @@ -100,30 +99,21 @@ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(xbiff_SOURCES) DIST_SOURCES = $(xbiff_SOURCES) -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -DATA = $(appman_DATA) +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -131,6 +121,31 @@ am__remove_distdir = \ { test ! -d "$(distdir)" \ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ && rm -fr "$(distdir)"; }; } +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print @@ -180,6 +195,7 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MAN_SUBSTS = @MAN_SUBSTS@ MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MKDIR_P = @MKDIR_P@ @@ -193,12 +209,14 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ XBIFF_CFLAGS = @XBIFF_CFLAGS@ XBIFF_LIBS = @XBIFF_LIBS@ +XORG_MAN_PAGE = @XORG_MAN_PAGE@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -249,6 +267,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +SUBDIRS = man AM_CFLAGS = $(CWARNFLAGS) $(XBIFF_CFLAGS) -D_BSD_SOURCE xbiff_LDADD = $(XBIFF_LIBS) xbiff_SOURCES = \ @@ -257,39 +276,13 @@ xbiff_SOURCES = \ MailboxP.h \ xbiff.c -appman_PRE = \ - xbiff.man - -EXTRA_DIST = bitmaps/mail-down bitmaps/mail-up bitmaps/mail-down-mask \ - bitmaps/mail-up-mask $(appman_PRE) -appmandir = $(APP_MAN_DIR) -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) +EXTRA_DIST = bitmaps/mail-down bitmaps/mail-up bitmaps/mail-down-mask bitmaps/mail-up-mask MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ -XORGMANNAME = X Version 11 -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - -SUFFIXES = .$(APP_MAN_SUFFIX) .man all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-am + $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -.SUFFIXES: .$(APP_MAN_SUFFIX) .man .c .o .obj +.SUFFIXES: .c .o .obj am--refresh: @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @@ -406,26 +399,76 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -install-appmanDATA: $(appman_DATA) - @$(NORMAL_INSTALL) - test -z "$(appmandir)" || $(MKDIR_P) "$(DESTDIR)$(appmandir)" - @list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appmandir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(appmandir)" || exit $$?; \ - done -uninstall-appmanDATA: - @$(NORMAL_UNINSTALL) - @list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(appmandir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appmandir)" && rm -f $$files +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
