debian/changelog | 29 debian/control | 7 debian/rules | 2 debian/watch.bitmap | 1 debian/watch.ico | 1 debian/watch.oclock | 1 debian/watch.x11perf | 1 debian/watch.xbiff | 1 debian/watch.xcalc | 1 debian/watch.xclipboard | 1 debian/watch.xclock | 1 debian/watch.xconsole | 1 debian/watch.xcursorgen | 1 debian/watch.xditview | 1 debian/watch.xedit | 1 debian/watch.xeyes | 1 debian/watch.xgc | 1 debian/watch.xload | 1 debian/watch.xlogo | 1 debian/watch.xmag | 1 debian/watch.xman | 1 debian/watch.xmore | 1 debian/watch.xwd | 1 debian/watch.xwud | 1 x11perf/ChangeLog | 73 x11perf/aclocal.m4 | 134 - x11perf/config.guess | 18 x11perf/config.sub | 76 x11perf/configure | 211 +- x11perf/configure.ac | 18 x11perf/do_tests.c | 2 x11perf/do_traps.c | 2 x11perf/x11perf.c | 11 x11perf/x11perf.h | 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 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 80 files changed, 8089 insertions(+), 6678 deletions(-)
New commits: commit 1dd5b3c0d5f29a31cd257e1f987a26ef82292435 Author: Timo Aaltonen <[email protected]> Date: Tue Feb 22 18:38:47 2011 +0200 releasing version 7.6+4ubuntu1 diff --git a/debian/changelog b/debian/changelog index 2895ca0..63b44fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -x11-apps (7.6+4ubuntu1) UNRELEASED; urgency=low +x11-apps (7.6+4ubuntu1) natty; urgency=low * Merge from Debian unstable, remaining changes: - debian/patches/100-no-add-needed.patch: Fix linking with no-add-needed, fixes ftbs on natty. - -- Timo Aaltonen <[email protected]> Tue, 22 Feb 2011 18:19:48 +0200 + -- Timo Aaltonen <[email protected]> Tue, 22 Feb 2011 18:38:36 +0200 x11-apps (7.6+4) unstable; urgency=low 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 change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -437,10 +480,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) set x; \ here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ @@ -459,7 +515,7 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ fi; \ fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -511,6 +567,34 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook @@ -630,21 +714,22 @@ distcleancheck: distclean $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) $(DATA) config.h -installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"; do \ +check: check-recursive +all-am: Makefile $(PROGRAMS) config.h +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(bindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-am +installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ @@ -653,7 +738,6 @@ install-strip: mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -663,100 +747,98 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-am +clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic mostlyclean-am -distclean: distclean-am +distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-tags -dvi: dvi-am +dvi: dvi-recursive dvi-am: -html: html-am +html: html-recursive html-am: -info: info-am +info: info-recursive info-am: -install-data-am: install-appmanDATA +install-data-am: -install-dvi: install-dvi-am +install-dvi: install-dvi-recursive install-dvi-am: install-exec-am: install-binPROGRAMS -install-html: install-html-am +install-html: install-html-recursive install-html-am: -install-info: install-info-am +install-info: install-info-recursive install-info-am: install-man: -install-pdf: install-pdf-am +install-pdf: install-pdf-recursive install-pdf-am: -install-ps: install-ps-am +install-ps: install-ps-recursive install-ps-am: installcheck-am: -maintainer-clean: maintainer-clean-am +maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-compile mostlyclean-generic -pdf: pdf-am +pdf: pdf-recursive pdf-am: -ps: ps-am +ps: ps-recursive ps-am: -uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS +uninstall-am: uninstall-binPROGRAMS -.MAKE: all install-am install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ + ctags-recursive install-am install-strip tags-recursive -.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-binPROGRAMS \ + clean-generic ctags ctags-recursive dist dist-all dist-bzip2 \ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \ dist-zip distcheck distclean distclean-compile \ distclean-generic distclean-hdr distclean-tags distcleancheck \ distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-appmanDATA \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-appmanDATA \ - uninstall-binPROGRAMS - - -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + info-am install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-binPROGRAMS + .PHONY: ChangeLog INSTALL diff --git a/xbiff/aclocal.m4 b/xbiff/aclocal.m4 index ce9e7c0..b2cf5c5 100644 --- a/xbiff/aclocal.m4 +++ b/xbiff/aclocal.m4 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
