debian/changelog | 15 debian/copyright | 43 debian/patches/02_xmodmap_manpage.diff | 8 iceauth/ChangeLog | 283 ++ iceauth/INSTALL | 236 - iceauth/Makefile.am | 20 iceauth/Makefile.in | 171 - iceauth/aclocal.m4 | 1430 +++++------ iceauth/autogen.sh | 13 iceauth/compile | 142 - iceauth/config.guess | 32 iceauth/config.sub | 16 iceauth/configure | 292 +- iceauth/configure.ac | 7 iceauth/depcomp | 64 iceauth/iceauth.c | 46 iceauth/iceauth.h | 6 iceauth/iceauth.man | 1 iceauth/install-sh | 348 ++ iceauth/missing | 61 iceauth/mkinstalldirs | 158 - iceauth/process.c | 384 +-- xgamma/COPYING | 50 xgamma/ChangeLog | 199 + xgamma/INSTALL | 236 - xgamma/Makefile.am | 14 xgamma/Makefile.in | 147 - xgamma/aclocal.m4 | 1430 +++++------ xgamma/compile | 142 - xgamma/config.guess | 32 xgamma/config.sub | 16 xgamma/configure | 202 - xgamma/configure.ac | 2 xgamma/depcomp | 64 xgamma/install-sh | 348 ++ xgamma/missing | 61 xgamma/mkinstalldirs | 158 - xgamma/xgamma.man | 13 xmodmap/ChangeLog | 285 ++ xmodmap/INSTALL | 236 - xmodmap/Makefile.am | 21 xmodmap/Makefile.in | 202 - xmodmap/aclocal.m4 | 1430 +++++------ xmodmap/autogen.sh | 13 xmodmap/compile | 142 - xmodmap/config.guess | 32 xmodmap/config.h.in | 3 xmodmap/config.sub | 16 xmodmap/configure | 364 ++ xmodmap/configure.ac | 7 xmodmap/depcomp | 64 xmodmap/handle.c | 72 xmodmap/install-sh | 348 ++ xmodmap/missing | 61 xmodmap/pf.c | 8 xmodmap/xmodmap.c | 80 xmodmap/xmodmap.h | 6 xmodmap/xmodmap.man | 3 xsetroot/ChangeLog | 205 + xsetroot/Makefile.am | 20 xsetroot/Makefile.in | 61 xsetroot/aclocal.m4 | 970 +++---- xsetroot/autogen.sh | 13 xsetroot/compile | 142 - xsetroot/config.guess | 83 xsetroot/config.sub | 109 xsetroot/configure | 4186 +++++++++++++++------------------ xsetroot/configure.ac | 7 xsetroot/mkinstalldirs | 158 - xsetroot/xsetroot.man | 2 70 files changed, 7902 insertions(+), 8337 deletions(-)
New commits: commit c16b35a4326a8f2036ebedc946924148cb9bb407 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Mon Aug 13 15:37:12 2007 +0200 xsetroot 1.0.2. diff --git a/debian/changelog b/debian/changelog index d6295de..0ec4e96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,10 +7,11 @@ x11-xserver-utils (7.2+4) UNRELEASED; urgency=low * xgamma 1.0.2. + the manpage now explains how to print the gamma value more clearly (closes: #296021). + * xsetroot 1.0.2. * Add upstream URL to debian/copyright, and update it from xgamma's COPYING file. - -- Julien Cristau <[EMAIL PROTECTED]> Mon, 13 Aug 2007 15:29:22 +0200 + -- Julien Cristau <[EMAIL PROTECTED]> Mon, 13 Aug 2007 15:36:32 +0200 x11-xserver-utils (7.2+3) experimental; urgency=low diff --git a/xsetroot/ChangeLog b/xsetroot/ChangeLog index a7722ec..943f56e 100644 --- a/xsetroot/ChangeLog +++ b/xsetroot/ChangeLog @@ -1,31 +1,198 @@ -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit ba9fbd14258ab44c794bb1a6dd9af51c5f4c01ff +Author: Matthieu Herrb <[EMAIL PROTECTED]> +Date: Fri Aug 10 10:45:46 2007 +0200 - * configure.ac: - Update package version for X11R7 release. + Bump version for release -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit d1658d389d7fbad0c2ec2ea5e8563c3d06ed2a47 +Author: Matthieu Herrb <[EMAIL PROTECTED]> +Date: Mon Jul 30 21:17:42 2007 +0200 - * configure.ac: - Update package version number for final X11R7 release candidate. + Add option to check code with lint/sparse/etc. -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 9282a4aa79b3cb4ae091a594de61dfc2ecfd9ea3 +Author: Matthieu Herrb <[EMAIL PROTECTED]> +Date: Mon Jul 30 21:11:20 2007 +0200 - * Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + Change xsetroot_CFLAGS to AM_CFLAGS to avoid automake-1.10 warning -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit fe4a33713aca2ce32053f2c8356423efd1f534e1 +Author: Matthieu Herrb <[EMAIL PROTECTED]> +Date: Mon Jul 30 21:08:00 2007 +0200 - * configure.ac: - Update package version number for X11R7 RC3 release. + - Replace static ChangeLog with disthook to generate from git log + - generate INSTALL -2005-11-20 Alan Coopersmith <[EMAIL PROTECTED]> +commit f479fd29a876d445291d7e55de9e9a22bac419b6 +Author: Matthieu Herrb <[EMAIL PROTECTED]> +Date: Mon Jul 30 21:07:05 2007 +0200 - * configure.ac: - Change dependency from xmu to xmuu since the full xmu - (with all its baggage like Xt) is not needed here. + - renamed .cvsignore -> .gitignore + - Replace static ChangeLog with disthook to generate from git log -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 382e52e07a110628efa0784b64088f6f64ae3112 +Author: Marc Balmer <[EMAIL PROTECTED]> +Date: Mon Jul 30 20:47:53 2007 +0200 - * configure.ac: - Update package version number for RC1 release. + Typo, it's xsetroot, not setroot. +commit e43e2cc868cff003d3e69c17a69bb7440393c359 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Dec 21 02:29:54 2005 +0000 + + Update package version for X11R7 release. + +commit 3c3dc25e901fe4a93d308a4456d00783d6fff252 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Mon Dec 19 16:22:47 2005 +0000 + + Stub COPYING files + +commit 4e633038f484b9955fe6aa80fdbbcc4d827fa4f3 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Thu Dec 15 00:24:11 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit aa60171a0cf04a787a29e1af3551976652d8ce84 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Tue Dec 6 22:48:26 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit a3844b7b2f68e295f69e9a8dbf45f311b717362b +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Sat Dec 3 05:49:28 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit a5056d61df9bc78b10ad200a7fc250842f034204 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Nov 28 22:01:47 2005 +0000 + + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) + +commit bfc05c358c4c8698292e40729ede000939cfe4a8 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Mon Nov 21 10:35:08 2005 +0000 + + Another pass at .cvsignores for apps. + +commit 9826f19633f549f2282702f19e33f7e51c4c5e9e +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Nov 21 03:14:16 2005 +0000 + + Change dependency from xmu to xmuu since the full xmu (with all its baggage + like Xt) is not needed here. + +commit d6817bf87bfcd2be3215ea9e28e6d13b1d438657 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Sun Nov 20 22:08:55 2005 +0000 + + Add/improve .cvsignore files for apps. + +commit 86145da43db031adc122f8bf9baacd45be5e7d84 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Oct 19 02:47:57 2005 +0000 + + Update package version number for RC1 release. + +commit cb52055c08c845309c126a2763bacaba5798ed65 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Oct 17 23:56:25 2005 +0000 + + Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to + work better with BSD make + +commit a10e876217a9354dd26935fd013cae57882369fa +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Fri Oct 14 00:25:48 2005 +0000 + + Use sed to fill in variables in man page + +commit 7b3f04619ecaec58e16a68037c435363ab27f447 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Aug 1 20:25:32 2005 +0000 + + Install man pages to section 1 instead of section m (Patch from Donnie + Berkholz) + +commit 63dc3c29b9f7af53efe466a7ed1476b4f4f17228 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Fri Jul 29 21:22:38 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit d5e74073175fbfb70a6f859d565262af09938642 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Wed Jul 20 19:32:04 2005 +0000 + + Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global + configure cache, you cache it, and the cached value is probably wrong. + +commit 0cc65bf4e9e0522422a9bd5824dc21dd05bf0368 +Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]> +Date: Fri Jul 15 16:49:26 2005 +0000 + + Add dependency on xbitmaps + +commit 2f3ed0d66595b15a2893098d0c0b05a568fb01e7 +Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]> +Date: Fri Jul 1 20:09:06 2005 +0000 + + xtrap.pc.in: s/Xfixes/XTrap/ xi.pc.in: s/Xt/Xi/ Xv/src/Makefile.am: remove + whitespace after backslash modularizeapp.sh: s/destkop/desktop/ + modular/symlink.sh: Add bitmaps for xeyes, system.xsm for xsm, and + Xvidtune.cpp for xvidtune. Also comment out non-existing mga_bios.h + Check in buildsystems for xsetroot, xsm, xstdcmap, xtrap, and xvinfo + +commit da9e01ac6c7199ea2d7cac40af7587192c23aff2 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Fri Apr 23 19:55:06 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 7cc5582a833e643be56bc5154e86eea988d537a9 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Sun Mar 14 08:35:45 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit cb915ca7ff57ceabc129556e9771c2fd2c401a76 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Wed Mar 3 12:13:18 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 10edd9087ebd46ca19500b987054d11f1c8e53fe +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Thu Feb 26 13:36:26 2004 +0000 + + readding XFree86's cvs IDs + +commit 0976043e2f31f6bad969c3f996961c59fc953d84 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Thu Feb 26 09:24:17 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 133f2a1c164a945366816cb4a71419ebe5c575ea +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Fri Nov 14 16:49:23 2003 +0000 + + XFree86 4.3.0.1 + +commit 500a078602d5db1e420a07c81dada5a676e0cc90 +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Fri Nov 14 15:54:55 2003 +0000 + + R6.6 is the Xorg base-line diff --git a/xsetroot/Makefile.am b/xsetroot/Makefile.am index 5ff96b7..6cbb67e 100644 --- a/xsetroot/Makefile.am +++ b/xsetroot/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xsetroot -xsetroot_CFLAGS = $(XSETROOT_CFLAGS) +AM_CFLAGS = $(XSETROOT_CFLAGS) xsetroot_LDADD = $(XSETROOT_LIBS) xsetroot_SOURCES = \ @@ -35,9 +35,18 @@ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:[EMAIL PROTECTED]@) -EXTRA_DIST = $(appman_PRE) +EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh CLEANFILES = $(appman_DATA) +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog + SED = sed # Strings to replace in man pages @@ -61,3 +70,10 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): sed $(MAN_SUBSTS) < $< > $@ + +if LINT +ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) +lint: + $(LINT) $(ALL_LINT_FLAGS) $(xsetroot_SOURCES) +endif LINT diff --git a/xsetroot/Makefile.in b/xsetroot/Makefile.in index aaa3ee8..d0b7bf0 100644 --- a/xsetroot/Makefile.in +++ b/xsetroot/Makefile.in @@ -62,8 +62,7 @@ bin_PROGRAMS = xsetroot$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - compile config.guess config.sub depcomp install-sh missing \ - mkinstalldirs + config.guess config.sub depcomp install-sh missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -71,13 +70,13 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(SHELL) $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_xsetroot_OBJECTS = xsetroot-xsetroot.$(OBJEXT) +am_xsetroot_OBJECTS = xsetroot.$(OBJEXT) xsetroot_OBJECTS = $(am_xsetroot_OBJECTS) am__DEPENDENCIES_1 = xsetroot_DEPENDENCIES = $(am__DEPENDENCIES_1) @@ -147,6 +146,10 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +LINT = @LINT@ +LINT_FALSE = @LINT_FALSE@ +LINT_FLAGS = @LINT_FLAGS@ +LINT_TRUE = @LINT_TRUE@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ @@ -170,6 +173,8 @@ VERSION = @VERSION@ XSETROOT_CFLAGS = @XSETROOT_CFLAGS@ XSETROOT_LIBS = @XSETROOT_LIBS@ ac_ct_CC = @ac_ct_CC@ +ac_ct_STRIP = @ac_ct_STRIP@ +ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ @@ -184,35 +189,28 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ -localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ -psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -xsetroot_CFLAGS = $(XSETROOT_CFLAGS) +AM_CFLAGS = $(XSETROOT_CFLAGS) xsetroot_LDADD = $(XSETROOT_LIBS) xsetroot_SOURCES = \ xsetroot.c @@ -222,8 +220,9 @@ appman_PRE = \ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:[EMAIL PROTECTED]@) -EXTRA_DIST = $(appman_PRE) +EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh CLEANFILES = $(appman_DATA) +MAINTAINERCLEANFILES = ChangeLog SED = sed # Strings to replace in man pages @@ -243,6 +242,9 @@ MAN_SUBSTS = \ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' SUFFIXES = .$(APP_MAN_SUFFIX) .man [EMAIL PROTECTED]@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ [EMAIL PROTECTED]@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) + all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -331,7 +333,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c [EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ [EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @@ -346,20 +348,6 @@ 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) '$<'` - -xsetroot-xsetroot.o: xsetroot.c [EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsetroot_CFLAGS) $(CFLAGS) -MT xsetroot-xsetroot.o -MD -MP -MF "$(DEPDIR)/xsetroot-xsetroot.Tpo" -c -o xsetroot-xsetroot.o `test -f 'xsetroot.c' || echo '$(srcdir)/'`xsetroot.c; \ [EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/xsetroot-xsetroot.Tpo" "$(DEPDIR)/xsetroot-xsetroot.Po"; else rm -f "$(DEPDIR)/xsetroot-xsetroot.Tpo"; exit 1; fi [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='xsetroot.c' object='xsetroot-xsetroot.o' libtool=no @AMDEPBACKSLASH@ [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ [EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsetroot_CFLAGS) $(CFLAGS) -c -o xsetroot-xsetroot.o `test -f 'xsetroot.c' || echo '$(srcdir)/'`xsetroot.c - -xsetroot-xsetroot.obj: xsetroot.c [EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsetroot_CFLAGS) $(CFLAGS) -MT xsetroot-xsetroot.obj -MD -MP -MF "$(DEPDIR)/xsetroot-xsetroot.Tpo" -c -o xsetroot-xsetroot.obj `if test -f 'xsetroot.c'; then $(CYGPATH_W) 'xsetroot.c'; else $(CYGPATH_W) '$(srcdir)/xsetroot.c'; fi`; \ [EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/xsetroot-xsetroot.Tpo" "$(DEPDIR)/xsetroot-xsetroot.Po"; else rm -f "$(DEPDIR)/xsetroot-xsetroot.Tpo"; exit 1; fi [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='xsetroot.c' object='xsetroot-xsetroot.obj' libtool=no @AMDEPBACKSLASH@ [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ [EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsetroot_CFLAGS) $(CFLAGS) -c -o xsetroot-xsetroot.obj `if test -f 'xsetroot.c'; then $(CYGPATH_W) 'xsetroot.c'; else $(CYGPATH_W) '$(srcdir)/xsetroot.c'; fi` uninstall-info-am: install-appmanDATA: $(appman_DATA) @$(NORMAL_INSTALL) @@ -456,6 +444,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ @@ -585,6 +576,7 @@ distclean-generic: 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-am: clean-binPROGRAMS clean-generic mostlyclean-am @@ -640,8 +632,8 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \ .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \ - dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-compile distclean-generic distclean-hdr \ + dist-gzip dist-hook dist-shar dist-tarZ 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 \ @@ -654,8 +646,17 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \ uninstall-info-am +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog + .man.$(APP_MAN_SUFFIX): sed $(MAN_SUBSTS) < $< > $@ [EMAIL PROTECTED]@lint: [EMAIL PROTECTED]@ $(LINT) $(ALL_LINT_FLAGS) $(xsetroot_SOURCES) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/xsetroot/aclocal.m4 b/xsetroot/aclocal.m4 index f17e720..b511cb7 100644 --- a/xsetroot/aclocal.m4 +++ b/xsetroot/aclocal.m4 @@ -169,490 +169,6 @@ else fi[]dnl ])# PKG_CHECK_MODULES -dnl -dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. -dnl -dnl Permission is hereby granted, free of charge, to any person obtaining a -dnl copy of this software and associated documentation files (the -dnl "Software"), to deal in the Software without restriction, including -dnl without limitation the rights to use, copy, modify, merge, publish, -dnl distribute, and/or sell copies of the Software, and to permit persons -dnl to whom the Software is furnished to do so, provided that the above -dnl copyright notice(s) and this permission notice appear in all copies of -dnl the Software and that both the above copyright notice(s) and this -dnl permission notice appear in supporting documentation. -dnl -dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -dnl -dnl Except as contained in this notice, the name of a copyright holder -dnl shall not be used in advertising or otherwise to promote the sale, use -dnl or other dealings in this Software without prior written authorization -dnl of the copyright holder. - -# XORG_MACROS_VERSION(required-version) -# ------------------------------------- -# Minimum version: 1.1.0 -# -# If you're using a macro added in Version 1.1 or newer, include this in -# your configure.ac with the minimum required version, such as: -# XORG_MACROS_VERSION(1.1) -# -# To force at least a version with this macro defined, also add: -# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) -# -# -# See the "minimum version" comment for each macro you use to see what -# version you require. -AC_DEFUN([XORG_MACROS_VERSION],[ - [XORG_MACROS_needed_version=$1 - XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` - XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] - AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}]) - [XORG_MACROS_version=1.1.5 - XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` - XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] - if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then - AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x]) - fi - if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then - AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer]) - fi - AC_MSG_RESULT([yes, $XORG_MACROS_version]) -]) # XORG_MACROS_VERSION - -# XORG_PROG_RAWCPP() -# ------------------ -# Minimum version: 1.0.0 -# -# Find cpp program and necessary flags for use in pre-processing text files -# such as man pages and config files -AC_DEFUN([XORG_PROG_RAWCPP],[ -AC_REQUIRE([AC_PROG_CPP]) -AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], - [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) - -# Check for flag to avoid builtin definitions - assumes unix is predefined, -# which is not the best choice for supporting other OS'es, but covers most -# of the ones we need for now. -AC_MSG_CHECKING([if $RAWCPP requires -undef]) -AC_LANG_CONFTEST([Does cpp redefine unix ?]) -if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then - AC_MSG_RESULT([no]) -else - if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then - RAWCPPFLAGS=-undef - AC_MSG_RESULT([yes]) - else - AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.]) - fi -fi -rm -f conftest.$ac_ext - -AC_MSG_CHECKING([if $RAWCPP requires -traditional]) -AC_LANG_CONFTEST([Does cpp preserve "whitespace"?]) -if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then - AC_MSG_RESULT([no]) -else - if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then - RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" - AC_MSG_RESULT([yes]) - else - AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.]) - fi -fi -rm -f conftest.$ac_ext -AC_SUBST(RAWCPPFLAGS) -]) # XORG_PROG_RAWCPP - -# XORG_MANPAGE_SECTIONS() -# ----------------------- -# Minimum version: 1.0.0 -# -# Determine which sections man pages go in for the different man page types -# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files. -# Not sure if there's any better way than just hardcoding by OS name. -# Override default settings by setting environment variables - -AC_DEFUN([XORG_MANPAGE_SECTIONS],[ -AC_REQUIRE([AC_CANONICAL_HOST]) - -if test x$APP_MAN_SUFFIX = x ; then - APP_MAN_SUFFIX=1 -fi -if test x$APP_MAN_DIR = x ; then - APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' -fi - -if test x$LIB_MAN_SUFFIX = x ; then - LIB_MAN_SUFFIX=3 -fi -if test x$LIB_MAN_DIR = x ; then - LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' -fi - -if test x$FILE_MAN_SUFFIX = x ; then - case $host_os in - solaris*) FILE_MAN_SUFFIX=4 ;; - *) FILE_MAN_SUFFIX=5 ;; - esac -fi -if test x$FILE_MAN_DIR = x ; then - FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' -fi - -if test x$MISC_MAN_SUFFIX = x ; then - case $host_os in - solaris*) MISC_MAN_SUFFIX=5 ;; - *) MISC_MAN_SUFFIX=7 ;; - esac -fi -if test x$MISC_MAN_DIR = x ; then - MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' -fi - -if test x$DRIVER_MAN_SUFFIX = x ; then - case $host_os in - solaris*) DRIVER_MAN_SUFFIX=7 ;; - *) DRIVER_MAN_SUFFIX=4 ;; - esac -fi -if test x$DRIVER_MAN_DIR = x ; then - DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' -fi - -if test x$ADMIN_MAN_SUFFIX = x ; then - case $host_os in - solaris*) ADMIN_MAN_SUFFIX=1m ;; - *) ADMIN_MAN_SUFFIX=8 ;; - esac -fi -if test x$ADMIN_MAN_DIR = x ; then - ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)' -fi - - -AC_SUBST([APP_MAN_SUFFIX]) -AC_SUBST([LIB_MAN_SUFFIX]) -AC_SUBST([FILE_MAN_SUFFIX]) -AC_SUBST([MISC_MAN_SUFFIX]) -AC_SUBST([DRIVER_MAN_SUFFIX]) -AC_SUBST([ADMIN_MAN_SUFFIX]) -AC_SUBST([APP_MAN_DIR]) -AC_SUBST([LIB_MAN_DIR]) -AC_SUBST([FILE_MAN_DIR]) -AC_SUBST([MISC_MAN_DIR]) -AC_SUBST([DRIVER_MAN_DIR]) -AC_SUBST([ADMIN_MAN_DIR]) -]) # XORG_MANPAGE_SECTIONS - -# XORG_CHECK_LINUXDOC -# ------------------- -# Minimum version: 1.0.0 -# -# Defines the variable MAKE_TEXT if the necessary tools and -# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt. -# Whether or not the necessary tools and files are found can be checked -# with the AM_CONDITIONAL "BUILD_LINUXDOC" -AC_DEFUN([XORG_CHECK_LINUXDOC],[ -XORG_SGML_PATH=$prefix/share/sgml -HAVE_DEFS_ENT= - -AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) - -AC_PATH_PROG(LINUXDOC, linuxdoc) -AC_PATH_PROG(PS2PDF, ps2pdf) - -AC_MSG_CHECKING([Whether to build documentation]) - -if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then - BUILDDOC=yes -else - BUILDDOC=no -fi - -AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes]) - -AC_MSG_RESULT([$BUILDDOC]) - -AC_MSG_CHECKING([Whether to build pdf documentation]) - -if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then - BUILDPDFDOC=yes -else - BUILDPDFDOC=no -fi - -AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) - -AC_MSG_RESULT([$BUILDPDFDOC]) - -MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" -MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps" -MAKE_PDF="$PS2PDF" -MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0" - -AC_SUBST(MAKE_TEXT) -AC_SUBST(MAKE_PS) -AC_SUBST(MAKE_PDF) -AC_SUBST(MAKE_HTML) -]) # XORG_CHECK_LINUXDOC - -# XORG_CHECK_DOCBOOK -# ------------------- -# Minimum version: 1.0.0 -# -# Checks for the ability to build output formats from SGML DocBook source. -# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC" -# indicates whether the necessary tools and files are found and, if set, -# $(MAKE_XXX) blah.sgml will produce blah.xxx. -AC_DEFUN([XORG_CHECK_DOCBOOK],[ -XORG_SGML_PATH=$prefix/share/sgml -HAVE_DEFS_ENT= -BUILDTXTDOC=no -BUILDPDFDOC=no -BUILDPSDOC=no -BUILDHTMLDOC=no - -AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) - -AC_PATH_PROG(DOCBOOKPS, docbook2ps) -AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) -AC_PATH_PROG(DOCBOOKHTML, docbook2html) -AC_PATH_PROG(DOCBOOKTXT, docbook2txt) - -AC_MSG_CHECKING([Whether to build text documentation]) -if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x && - test x$BUILD_TXTDOC != xno; then - BUILDTXTDOC=yes -fi -AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes]) -AC_MSG_RESULT([$BUILDTXTDOC]) - -AC_MSG_CHECKING([Whether to build PDF documentation]) -if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x && - test x$BUILD_PDFDOC != xno; then - BUILDPDFDOC=yes -fi -AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) -AC_MSG_RESULT([$BUILDPDFDOC]) - -AC_MSG_CHECKING([Whether to build PostScript documentation]) -if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x && - test x$BUILD_PSDOC != xno; then - BUILDPSDOC=yes -fi -AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes]) -AC_MSG_RESULT([$BUILDPSDOC]) - -AC_MSG_CHECKING([Whether to build HTML documentation]) -if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x && - test x$BUILD_HTMLDOC != xno; then - BUILDHTMLDOC=yes -fi -AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes]) -AC_MSG_RESULT([$BUILDHTMLDOC]) - -MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT" -MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS" -MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF" -MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML" - -AC_SUBST(MAKE_TEXT) -AC_SUBST(MAKE_PS) -AC_SUBST(MAKE_PDF) -AC_SUBST(MAKE_HTML) -]) # XORG_CHECK_DOCBOOK - -# XORG_CHECK_MALLOC_ZERO -# ---------------------- -# Minimum version: 1.0.0 -# -# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if -# malloc(0) returns NULL. Packages should add one of these cflags to -# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them. -AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[ -AC_ARG_ENABLE(malloc0returnsnull, - AC_HELP_STRING([--enable-malloc0returnsnull], - [malloc(0) returns NULL (default: auto)]), - [MALLOC_ZERO_RETURNS_NULL=$enableval], - [MALLOC_ZERO_RETURNS_NULL=auto]) - -AC_MSG_CHECKING([whether malloc(0) returns NULL]) -if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then - AC_RUN_IFELSE([ -char *malloc(); -char *realloc(); -char *calloc(); -main() { - char *m0, *r0, *c0, *p; - m0 = malloc(0); - p = malloc(10); - r0 = realloc(p,0); - c0 = calloc(0); - exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1); -}], - [MALLOC_ZERO_RETURNS_NULL=yes], - [MALLOC_ZERO_RETURNS_NULL=no]) -fi -AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL]) - -if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then - MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL" - XMALLOC_ZERO_CFLAGS=$MALLOC_ZERO_CFLAGS - XTMALLOC_ZERO_CFLAGS="$MALLOC_ZERO_CFLAGS -DXTMALLOC_BC" -else - MALLOC_ZERO_CFLAGS="" - XMALLOC_ZERO_CFLAGS="" - XTMALLOC_ZERO_CFLAGS="" -fi - -AC_SUBST([MALLOC_ZERO_CFLAGS]) -AC_SUBST([XMALLOC_ZERO_CFLAGS]) -AC_SUBST([XTMALLOC_ZERO_CFLAGS]) -]) # XORG_CHECK_MALLOC_ZERO - -# XORG_WITH_LINT() -# ---------------- -# Minimum version: 1.1.0 -# -# Sets up flags for source checkers such as lint and sparse if --with-lint -# is specified. (Use --with-lint=sparse for sparse.) -# Sets $LINT to name of source checker passed with --with-lint (default: lint) -# Sets $LINT_FLAGS to flags to pass to source checker -# Sets LINT automake conditional if enabled (default: disabled) -# -AC_DEFUN([XORG_WITH_LINT],[ - -# Allow checking code with lint, sparse, etc. -AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint], - [Use a lint-style source code checker (default: disabled)])], - [use_lint=$withval], [use_lint=no]) -if test "x$use_lint" = "xyes" ; then - LINT="lint" -else - LINT="$use_lint" -fi -if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then - case $LINT in - lint|*/lint) - case $host_os in - solaris*) - LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" - ;; - esac - ;; - esac -fi - -AC_SUBST(LINT) -AC_SUBST(LINT_FLAGS) -AM_CONDITIONAL(LINT, [test x$LINT != xno]) - -]) # XORG_WITH_LINT - -# XORG_LINT_LIBRARY(LIBNAME) -# -------------------------- -# Minimum version: 1.1.0 -# -# Sets up flags for building lint libraries for checking programs that call -# functions in the library. -# Disabled by default, enable with --enable-lint-library -# Sets: -# @LINTLIB@ - name of lint library file to make -# MAKE_LINT_LIB - automake conditional -# - -AC_DEFUN([XORG_LINT_LIBRARY],[ -AC_REQUIRE([XORG_WITH_LINT]) -# Build lint "library" for more indepth checks of programs calling this library -AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library], - [Create lint library (default: disabled)])], - [make_lint_lib=$enableval], [make_lint_lib=no]) -if test "x$make_lint_lib" != "xno" ; then - if test "x$LINT" = "xno" ; then - AC_MSG_ERROR([Cannot make lint library without --with-lint]) - fi - if test "x$make_lint_lib" = "xyes" ; then - LINTLIB=llib-l$1.ln - else - LINTLIB=$make_lint_lib - fi -fi -AC_SUBST(LINTLIB) -AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) - -]) # XORG_LINT_LIBRARY - -dnl Copyright 2005 Red Hat, Inc -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation. -dnl -dnl The above copyright notice and this permission notice shall be included -dnl in all copies or substantial portions of the Software. -dnl -dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -dnl OTHER DEALINGS IN THE SOFTWARE. -dnl -dnl Except as contained in this notice, the name of the copyright holders shall -dnl not be used in advertising or otherwise to promote the sale, use or -dnl other dealings in this Software without prior written authorization -dnl from the copyright holders. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]