.gitignore | 13 ChangeLog | 137 + Makefile.am | 14 Makefile.in | 464 ----- README | 24 aclocal.m4 | 647 ------ configure | 3423 ------------------------------------- configure.ac | 27 debian/changelog | 13 debian/control | 9 debian/rules | 11 debian/xfonts-scalable.postinst.in | 26 debian/xfonts-scalable.postrm.in | 34 debian/xsfbs/xsfbs.mk | 21 debian/xsfbs/xsfbs.sh | 233 -- install-sh | 294 --- missing | 336 --- mkinstalldirs | 111 - 18 files changed, 211 insertions(+), 5626 deletions(-)
New commits: commit d05ff40869846bda2c7f67d4e784c8ea1afde6d8 Author: Julien Cristau <jcris...@debian.org> Date: Sat Jan 2 09:19:36 2010 +0000 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index dbbb834..57072cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xfonts-scalable (1:1.0.1-1) UNRELEASED; urgency=low +xfonts-scalable (1:1.0.1-1) unstable; urgency=low * Move package to the 'fonts' section. * Drop maintainer scripts. They were duplicating work done by @@ -9,7 +9,7 @@ xfonts-scalable (1:1.0.1-1) UNRELEASED; urgency=low * Bump Standards-Version to 3.8.3. * Don't pass --with-fontdir to configure, unneeded with new fontutil. - -- Julien Cristau <jcris...@debian.org> Sat, 02 Jan 2010 09:11:37 +0000 + -- Julien Cristau <jcris...@debian.org> Sat, 02 Jan 2010 09:19:19 +0000 xfonts-scalable (1:1.0.0-7) unstable; urgency=low commit a8be9203e16a246d2971edc5ca7e54b6d4265186 Author: Julien Cristau <jcris...@debian.org> Date: Sat Jan 2 09:14:38 2010 +0000 Don't pass --with-fontdir to configure, unneeded with new fontutil. diff --git a/debian/changelog b/debian/changelog index a82ad0f..dbbb834 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ xfonts-scalable (1:1.0.1-1) UNRELEASED; urgency=low * New upstream release. * Bump xfonts-utils and xutils-dev build-deps. * Bump Standards-Version to 3.8.3. + * Don't pass --with-fontdir to configure, unneeded with new fontutil. -- Julien Cristau <jcris...@debian.org> Sat, 02 Jan 2010 09:11:37 +0000 diff --git a/debian/rules b/debian/rules index 62a2451..20a007a 100755 --- a/debian/rules +++ b/debian/rules @@ -41,7 +41,6 @@ build-stamp: $(STAMP_DIR)/prepare cd obj-$(DEB_BUILD_GNU_TYPE) && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ - --with-fontdir=/usr/share/fonts/X11/Type1 \ CFLAGS="$(CFLAGS)" FCCACHE=/bin/true cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) >$@ commit efb167f85cfc1771465b52aa5e48aa02e6e5edff Author: Julien Cristau <jcris...@debian.org> Date: Sat Jan 2 09:14:02 2010 +0000 Bump Standards-Version to 3.8.3. diff --git a/debian/changelog b/debian/changelog index e97eb07..a82ad0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ xfonts-scalable (1:1.0.1-1) UNRELEASED; urgency=low * Run autoreconf on build. * New upstream release. * Bump xfonts-utils and xutils-dev build-deps. + * Bump Standards-Version to 3.8.3. -- Julien Cristau <jcris...@debian.org> Sat, 02 Jan 2010 09:11:37 +0000 diff --git a/debian/control b/debian/control index cdb2592..063974b 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: automake, autoconf, xutils-dev (>= 1:7.5~), -Standards-Version: 3.8.2 +Standards-Version: 3.8.3 Package: xfonts-scalable Architecture: all commit cc8ec5823a9df8c8a39ae561a508e8a8451a3d7a Author: Julien Cristau <jcris...@debian.org> Date: Sat Jan 2 09:13:45 2010 +0000 Bump xfonts-utils and xutils-dev build-deps. diff --git a/debian/changelog b/debian/changelog index 6ea3968..e97eb07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ xfonts-scalable (1:1.0.1-1) UNRELEASED; urgency=low dh_installxfonts. * Run autoreconf on build. * New upstream release. + * Bump xfonts-utils and xutils-dev build-deps. -- Julien Cristau <jcris...@debian.org> Sat, 02 Jan 2010 09:11:37 +0000 diff --git a/debian/control b/debian/control index ccbfb5b..cdb2592 100644 --- a/debian/control +++ b/debian/control @@ -5,10 +5,10 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: David Nusinow <dnusi...@debian.org> Build-Depends: debhelper (>= 5.0.31), - xfonts-utils, + xfonts-utils (>= 1:7.5), automake, autoconf, - xutils-dev, + xutils-dev (>= 1:7.5~), Standards-Version: 3.8.2 Package: xfonts-scalable commit d362cc88325b4f57881f934e94bfb705147aebc6 Author: Julien Cristau <jcris...@debian.org> Date: Sat Jan 2 09:11:55 2010 +0000 Bump changelogs diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..97f16f8 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,130 @@ +commit 442d80e6990cfb4d0c4cbc8673bc62d63cc35458 +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Sat Oct 10 17:33:43 2009 -0700 + + font-bitstream-type1 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> + +commit 43a8529507b903e9b80fd896ac9b5ad512c3e620 +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Wed Oct 7 15:17:49 2009 -0700 + + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> + +commit 72527a36fa191284f940c9cf66953861dbf6fe4a +Author: Alan Coopersmith <alan.coopersm...@sun.com> +Date: Tue Oct 6 19:14:27 2009 -0700 + + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> + +commit dbca5ca974d6cec77357082a6f86a2e0259e451a +Author: Ryan Hill <dirtye...@gentoo.org> +Date: Sun Aug 16 14:48:15 2009 -0600 + + bitstream-type1: Skip fc-cache with DESTDIR. + + Fontconfig-2.7.0 runs chmod on the cachedir, causing access violations + when installing into a sandboxed environment. + + Signed-off-by: Ryan Hill <dirtye...@gentoo.org> + Signed-off-by: RĂ©mi Cardona <r...@gentoo.org> + +commit fca975ffcac8a4455c24300396e652e646c8476c +Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br> +Date: Tue Jan 27 19:11:07 2009 -0200 + + Janitor: Correct make distcheck and configure.ac simplification + +commit aee9204788007ebb2fbe842108735e36672c9215 +Author: Andres Salomon <dilin...@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 + + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcris...@debian.org> + +commit 59ef1c711cc8382ee603d10b90709f6357c9df92 +Author: James Cloos <cl...@jhcloos.com> +Date: Thu Dec 6 16:37:52 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit b90e48819b0a52139f290116fac44a533e566b25 +Author: James Cloos <cl...@jhcloos.com> +Date: Mon Sep 3 05:53:06 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit f90da3ecb3f344922f48218eef0603a2069b1e13 +Author: James Cloos <cl...@jhcloos.com> +Date: Thu Aug 23 19:26:26 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 790a52d9740fc6772caa5d9a2db1c3faa72639c2 +Author: Kevin E Martin <k...@kem.org> +Date: Thu Dec 15 00:24:23 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 2cadeab4c3d6b5490f697959ed5ddd897d344f09 +Author: Kevin E Martin <k...@kem.org> +Date: Sat Dec 3 17:08:52 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit 2f6d282826cf3746c0611eeb442ad7c9482a050e +Author: Kevin E Martin <k...@kem.org> +Date: Sat Dec 3 05:49:39 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 3fcfbaa507cdfe59a0caec80d2d7ebd65b6ce118 +Author: Eric Anholt <anh...@freebsd.org> +Date: Tue Nov 22 02:00:19 2005 +0000 + + Add .cvsignores for fonts. + +commit 8224335cc21ebb6a3e68dd634ff0846f2fecd834 +Author: Kevin E Martin <k...@kem.org> +Date: Tue Nov 15 08:29:17 2005 +0000 + + Add configure option to change the installed font dir. + +commit 28e98a4f2d36a508243df045d496a51b6f7509cd +Author: Kevin E Martin <k...@kem.org> +Date: Fri Jul 29 21:22:47 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 45cc6669398ada16c81cea99464a7accf753434b +Author: Kevin E Martin <k...@kem.org> +Date: Thu Jun 30 22:28:07 2005 +0000 + + Initial build system files for font module + +commit 86efdda71cba55dc91f8c3e4d6d21656d7c6f520 +Author: Kaleb Keithley <ka...@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit c9c05992f6d2e2df72f642b2e3aa18de69d9c439 +Author: Kaleb Keithley <ka...@freedesktop.org> +Date: Fri Nov 14 15:54:35 2003 +0000 + + R6.6 is the Xorg base-line diff --git a/debian/changelog b/debian/changelog index 7c5aab6..6ea3968 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ -xfonts-scalable (1:1.0.0-8) UNRELEASED; urgency=low +xfonts-scalable (1:1.0.1-1) UNRELEASED; urgency=low * Move package to the 'fonts' section. * Drop maintainer scripts. They were duplicating work done by dh_installxfonts. * Run autoreconf on build. + * New upstream release. - -- Julien Cristau <jcris...@debian.org> Thu, 25 Jun 2009 15:37:34 +0200 + -- Julien Cristau <jcris...@debian.org> Sat, 02 Jan 2010 09:11:37 +0000 xfonts-scalable (1:1.0.0-7) unstable; urgency=low commit b513b9d0f0f672bb9bb0226fa45dfeaab2e84c1e Author: Julien Cristau <jcris...@debian.org> Date: Sat Jan 2 09:09:59 2010 +0000 Delete generated files diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index b2bfb70..0000000 --- a/Makefile.in +++ /dev/null @@ -1,464 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -...@set_make@ - -# Copyright 2005 Red Hat, Inc. -# -# Permission to use, copy, modify, distribute, and sell this software -# and its documentation for any purpose is hereby granted without -# fee, provided that the above copyright notice appear in all copies -# and that both that copyright notice and this permission notice -# appear in supporting documentation, and that the name of Red Hat -# not be used in advertising or publicity pertaining to distribution -# of the software without specific, written prior permission. Red -# Hat makes no representations about the suitability of this software -# for any purpose. It is provided "as is" without express or implied -# warranty. -# -# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN -# NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR -# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS -# OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS install-sh missing mkinstalldirs -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -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 -CONFIG_CLEAN_FILES = -SOURCES = -DIST_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 = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(fontdir)" -fontDATA_INSTALL = $(INSTALL_DATA) -DATA = $(font_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -FCCACHE = @FCCACHE@ -FONTDIR = @FONTDIR@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -MKFONTDIR = @MKFONTDIR@ -MKFONTSCALE = @MKFONTSCALE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -am__leading_dot = @am__leading_dot@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build_alias = @build_alias@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -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@ -FONT_FILES = \ - c0419bt_.afm \ - c0419bt_.pfb \ - c0582bt_.afm \ - c0582bt_.pfb \ - c0583bt_.afm \ - c0583bt_.pfb \ - c0611bt_.afm \ - c0611bt_.pfb \ - c0632bt_.afm \ - c0632bt_.pfb \ - c0633bt_.afm \ - c0633bt_.pfb \ - c0648bt_.afm \ - c0648bt_.pfb \ - c0649bt_.afm \ - c0649bt_.pfb - -fontdir = @FONTDIR@ -font_DATA = $(FONT_FILES) -EXTRA_DIST = $(FONT_FILES) Copyright autogen.sh -all: all-am - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ - cd $(srcdir) && $(AUTOMAKE) --foreign \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -uninstall-info-am: -install-fontDATA: $(font_DATA) - @$(NORMAL_INSTALL) - test -z "$(fontdir)" || $(mkdir_p) "$(DESTDIR)$(fontdir)" - @list='$(font_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(fontDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(fontdir)/$$f'"; \ - $(fontDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(fontdir)/$$f"; \ - done - -uninstall-fontDATA: - @$(NORMAL_UNINSTALL) - @list='$(font_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(fontdir)/$$f'"; \ - rm -f "$(DESTDIR)$(fontdir)/$$f"; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - -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 \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(fontdir)"; 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-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-fontDATA - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-fontDATA uninstall-info-am - -.PHONY: all all-am am--refresh check check-am clean clean-generic dist \ - dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \ - distcheck distclean distclean-generic distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-hook install-exec install-exec-am \ - install-fontDATA install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-fontDATA uninstall-info-am - - -install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) - @rm -f $(DESTDIR)$(fontdir)/font.dir - $(MKFONTDIR) $(DESTDIR)$(fontdir) - $(FCCACHE) $(DESTDIR)$(fontdir) - -distuninstallcheck: - @: -# 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/aclocal.m4 b/aclocal.m4 deleted file mode 100644 index c7524a9..0000000 --- a/aclocal.m4 +++ /dev/null @@ -1,647 +0,0 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -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. -dnl - -# XORG_RELEASE_VERSION -# -------------------- -# Adds --with/without-release-string and changes the PACKAGE and -# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If -# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. - -AC_DEFUN([XORG_RELEASE_VERSION],[ - AC_ARG_WITH(release-version, - AC_HELP_STRING([--with-release-version=STRING], - [Use release version string in package name]), - [RELEASE_VERSION="$withval"], - [RELEASE_VERSION=""]) - if test "x$RELEASE_VERSION" != "x"; then - PACKAGE="$PACKAGE-$RELEASE_VERSION" - PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" - AC_MSG_NOTICE([Building with package name set to $PACKAGE]) - fi -]) - -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 7 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 12 - -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org