debian/changelog | 10 debian/control | 13 - mkfontscale/ChangeLog | 143 +++++++++++++ mkfontscale/Makefile.am | 15 - mkfontscale/Makefile.in | 293 ++++++++++++++++++--------- mkfontscale/aclocal.m4 | 424 ++++++++++++++++++++++++++++++++++++---- mkfontscale/configure | 112 ++++++---- mkfontscale/configure.ac | 14 - mkfontscale/list.c | 44 +++- mkfontscale/list.h | 9 mkfontscale/man/Makefile.am | 12 + mkfontscale/man/Makefile.in | 417 +++++++++++++++++++++++++++++++++++++++ mkfontscale/man/mkfontscale.man | 156 ++++++++++++++ mkfontscale/mkfontscale.c | 27 +- mkfontscale/mkfontscale.man | 156 -------------- 15 files changed, 1461 insertions(+), 384 deletions(-)
New commits: commit efb5b05b635a8a34ea8a564116d11875591e20de Author: Cyril Brulebois <[email protected]> Date: Thu Jun 30 14:09:13 2011 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index baba412..f3a3ddf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xfonts-utils (1:7.6+1) UNRELEASED; urgency=low +xfonts-utils (1:7.6+1) unstable; urgency=low * mkfontscale 1.0.9 * Update Uploaders list. Thanks, David & Brice! @@ -6,7 +6,7 @@ xfonts-utils (1:7.6+1) UNRELEASED; urgency=low * Remove long obsolete Replaces. * Bump Standards-Version to 3.9.2 (no changes). - -- Cyril Brulebois <[email protected]> Thu, 30 Jun 2011 14:01:58 +0200 + -- Cyril Brulebois <[email protected]> Thu, 30 Jun 2011 14:09:10 +0200 xfonts-utils (1:7.6~1) unstable; urgency=low commit 323a068434e2fbedc2e0f74498bdbbf68daf542a Author: Cyril Brulebois <[email protected]> Date: Thu Jun 30 14:09:06 2011 +0200 Bump Standards-Version to 3.9.2 (no changes). diff --git a/debian/changelog b/debian/changelog index 5a43c75..baba412 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ xfonts-utils (1:7.6+1) UNRELEASED; urgency=low * Update Uploaders list. Thanks, David & Brice! * Wrap Depends/Replaces. * Remove long obsolete Replaces. + * Bump Standards-Version to 3.9.2 (no changes). -- Cyril Brulebois <[email protected]> Thu, 30 Jun 2011 14:01:58 +0200 diff --git a/debian/control b/debian/control index 0dbb164..de91996 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: libfreetype6-dev, libfontenc-dev, xutils-dev (>= 1:7.5+4), -Standards-Version: 3.8.3 +Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/font/xfonts-utils Vcs-Browser: http://git.debian.org/?p=pkg-xorg/font/xfonts-utils.git commit d41d4329b74e844a289f957c84a45b6769929682 Author: Cyril Brulebois <[email protected]> Date: Thu Jun 30 14:08:37 2011 +0200 Remove long obsolete Replaces. diff --git a/debian/changelog b/debian/changelog index 3c5f01f..5a43c75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xfonts-utils (1:7.6+1) UNRELEASED; urgency=low * mkfontscale 1.0.9 * Update Uploaders list. Thanks, David & Brice! * Wrap Depends/Replaces. + * Remove long obsolete Replaces. -- Cyril Brulebois <[email protected]> Thu, 30 Jun 2011 14:01:58 +0200 diff --git a/debian/control b/debian/control index 15372ab..0dbb164 100644 --- a/debian/control +++ b/debian/control @@ -24,9 +24,6 @@ Depends: ${misc:Depends}, x11-common, xfonts-encodings, -Replaces: - xutils (<< 1:1.0.1-1), - fonttosfnt (<< 1.0.4), Description: X Window System font utility programs xfonts-utils provides a set of utility programs shipped with the X Window System that are needed for font management. commit 599081fa1614612047514632b43fa7774afa2248 Author: Cyril Brulebois <[email protected]> Date: Thu Jun 30 14:06:47 2011 +0200 Kill trailing space. diff --git a/debian/control b/debian/control index 788d762..15372ab 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Replaces: xutils (<< 1:1.0.1-1), fonttosfnt (<< 1.0.4), Description: X Window System font utility programs - xfonts-utils provides a set of utility programs shipped with the X Window + xfonts-utils provides a set of utility programs shipped with the X Window System that are needed for font management. . The programs in this package include: commit f61e58fe557ab61fd1e0ea9de944160658bc165d Author: Cyril Brulebois <[email protected]> Date: Thu Jun 30 14:06:08 2011 +0200 Wrap Depends/Replaces. diff --git a/debian/changelog b/debian/changelog index 1fc92e0..3c5f01f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xfonts-utils (1:7.6+1) UNRELEASED; urgency=low * mkfontscale 1.0.9 * Update Uploaders list. Thanks, David & Brice! + * Wrap Depends/Replaces. -- Cyril Brulebois <[email protected]> Thu, 30 Jun 2011 14:01:58 +0200 diff --git a/debian/control b/debian/control index 16de616..788d762 100644 --- a/debian/control +++ b/debian/control @@ -19,8 +19,14 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/font/xfonts-utils.git Package: xfonts-utils Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, xfonts-encodings -Replaces: xutils (<< 1:1.0.1-1), fonttosfnt (<< 1.0.4) +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + x11-common, + xfonts-encodings, +Replaces: + xutils (<< 1:1.0.1-1), + fonttosfnt (<< 1.0.4), Description: X Window System font utility programs xfonts-utils provides a set of utility programs shipped with the X Window System that are needed for font management. commit 643b1ced07c2f3186bf89198fac7736c27cc04a9 Author: Cyril Brulebois <[email protected]> Date: Thu Jun 30 14:05:22 2011 +0200 Update Uploaders list. Thanks, David & Brice! diff --git a/debian/changelog b/debian/changelog index a5717d0..1fc92e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xfonts-utils (1:7.6+1) UNRELEASED; urgency=low * mkfontscale 1.0.9 + * Update Uploaders list. Thanks, David & Brice! -- Cyril Brulebois <[email protected]> Thu, 30 Jun 2011 14:01:58 +0200 diff --git a/debian/control b/debian/control index d415460..16de616 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xfonts-utils 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 (>= 6.0.7~), pkg-config, commit 7e9e9712d0c677d6ba0cc740594244f440eeff17 Author: Cyril Brulebois <[email protected]> Date: Thu Jun 30 14:02:16 2011 +0200 mkfontscale 1.0.9 diff --git a/debian/changelog b/debian/changelog index 427e923..a5717d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xfonts-utils (1:7.6+1) UNRELEASED; urgency=low + + * mkfontscale 1.0.9 + + -- Cyril Brulebois <[email protected]> Thu, 30 Jun 2011 14:01:58 +0200 + xfonts-utils (1:7.6~1) unstable; urgency=low [ Julien Cristau ] diff --git a/mkfontscale/AUTHORS b/mkfontscale/AUTHORS deleted file mode 100644 index e69de29..0000000 diff --git a/mkfontscale/ChangeLog b/mkfontscale/ChangeLog index 1fb76a1..bcf2923 100644 --- a/mkfontscale/ChangeLog +++ b/mkfontscale/ChangeLog @@ -1,3 +1,146 @@ +commit d429321888c335042332d991480095f67c85bb64 +Author: Alan Coopersmith <[email protected]> +Date: Wed Jun 29 20:25:37 2011 -0700 + + mkfontscale 1.0.9 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 82af43b3e142ed8a85f1057bc67fc44baf95cc13 +Author: Alan Coopersmith <[email protected]> +Date: Mon May 23 18:33:53 2011 -0700 + + Add _X_ATTRIBUTE_PRINTF to functions taking printf format arguments + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Jeremy Huddleston <[email protected]> + +commit 3da7640b35c9660944168217c145a1011547712b +Author: Jeremy Huddleston <[email protected]> +Date: Sun May 8 09:36:02 2011 -0700 + + Dead code removal + + have_face is initialized to 0 at the beginning of the loop, so no need to set + it to 0 just before it goes out of scope at the end of the loop. + + mkfontscale.c:945:13: warning: Value stored to 'have_face' is never read + have_face = 0; + ^ ~ + + Found-by: clang static analyzer + Signed-off-by: Jeremy Huddleston <[email protected]> + +commit b8c26cb3d41b18dfcc14a1ae256f6575c7df7593 +Author: Alan Coopersmith <[email protected]> +Date: Thu Feb 24 23:24:17 2011 -0800 + + makeList: free partially allocated list on failure + + Error: Memory leak (CWE 401) + Memory leak of pointer 'first' allocated with malloc(8) + at line 192 of list.c in function 'makeList'. + 'first' allocated at line 181 with malloc(8). + first leaks when next == 0 at line 191. + + [ This bug was found by the Parfait 0.3.6 bug checking tool. + For more information see http://labs.oracle.com/projects/parfait/ ] + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Julien Cristau <[email protected]> + +commit 9d424d79ca56e7e372a286fca478996eeee8ebfe +Author: Alan Coopersmith <[email protected]> +Date: Thu Feb 24 23:15:25 2011 -0800 + + Leave room for null terminator in file & font name arrays + + fscanf %s arguments don't include the trailing \0 byte in their counts. + + Error: Buffer overrun + Buffer overflow (CWE 120): Use of fscanf(%1024[), with buffer 'font' + Array size is 1024 bytes + at line 707 of mkfontscale.c in function 'readFontScale'. + Buffer overflow (CWE 120): Use of fscanf(%1024s), with buffer 'file' + Array size is 1024 bytes + at line 707 of mkfontscale.c in function 'readFontScale'. + + [ This bug was found by the Parfait 0.3.6 bug checking tool. + For more information see http://labs.oracle.com/projects/parfait/ ] + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Julien Cristau <[email protected]> + +commit 45b33b463c8acc2c0ff37e209387d6b664576cc4 +Author: Alan Coopersmith <[email protected]> +Date: Mon Feb 14 23:22:56 2011 -0800 + + Sort contents of encodings.dir + + Allows easier comparison between builds to detect changes. + Helps reduce deltas in packaging systems that compare old & new versions. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 623a620bde1988e105b2fe814a3158da0e7b863c +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 2e2073e358a6d9069dd5b5f3757de769cbc92721 +Author: Alan Coopersmith <[email protected]> +Date: Sun Jan 9 13:44:31 2011 -0800 + + Remove unused NEED_SNPRINTF code to #include non-existent snprintf.c + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 2ad869a51804e5232f10c1c933e2822c205c3265 +Author: Alan Coopersmith <[email protected]> +Date: Sun Jan 9 13:39:00 2011 -0800 + + Make fscanf format string constant so it can be checked at compile time + + Clears gcc warning of: + mkfontscale.c:714: warning: format not a string literal, argument types not checked + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit ed14fe953f8f6fee90fcf28cd6775037b5f6e228 +Author: Alan Coopersmith <[email protected]> +Date: Sun Jan 9 13:24:10 2011 -0800 + + config: Add missing AC_CONFIG_SRCDIR + + Regroup AC statements under the Autoconf initialization section. + Regroup AM statements under the Automake initialization section. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit f27bcd4d366b2c12e658ff018542c4273b36631a +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 fedc022d29297f524d39a2637c1529782edcdceb +Author: Gaetan Nadon <[email protected]> +Date: Wed Jan 12 16:28:02 2011 -0500 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + This silences an Autoconf warning + commit 7a1e1e64c171ae95339bbd327806f892816850d7 Author: Alan Coopersmith <[email protected]> Date: Fri Oct 29 23:03:40 2010 -0700 diff --git a/mkfontscale/Makefile.am b/mkfontscale/Makefile.am index 10489ad..e276fec 100644 --- a/mkfontscale/Makefile.am +++ b/mkfontscale/Makefile.am @@ -19,6 +19,7 @@ # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = mkfontscale AM_CPPFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE @@ -35,21 +36,7 @@ mkfontscale_SOURCES = \ list.h \ mkfontscale.c -appman_PRE = mkfontscale.man - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ .PHONY: ChangeLog INSTALL diff --git a/mkfontscale/Makefile.in b/mkfontscale/Makefile.in index 747882a..317906f 100644 --- a/mkfontscale/Makefile.in +++ b/mkfontscale/Makefile.in @@ -36,7 +36,6 @@ # OTHER 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_mkfontscale_OBJECTS = hash.$(OBJEXT) ident.$(OBJEXT) list.$(OBJEXT) \ mkfontscale.$(OBJEXT) @@ -100,30 +99,21 @@ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(mkfontscale_SOURCES) DIST_SOURCES = $(mkfontscale_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 @@ -201,6 +216,7 @@ PKG_CONFIG = @PKG_CONFIG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ VERSION = @VERSION@ X11_CFLAGS = @X11_CFLAGS@ @@ -256,6 +272,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +SUBDIRS = man AM_CPPFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE AM_CFLAGS = $(CWARNFLAGS) mkfontscale_LDADD = @MKFONTSCALE_LIBS@ @@ -269,21 +286,15 @@ mkfontscale_SOURCES = \ list.h \ mkfontscale.c -appman_PRE = mkfontscale.man -appmandir = $(APP_MAN_DIR) -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) -SUFFIXES = .$(APP_MAN_SUFFIX) .man @LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS) 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) @@ -402,26 +413,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)'; \ @@ -433,10 +494,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; \ @@ -455,7 +529,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 \ @@ -507,6 +581,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 @@ -626,21 +728,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 \ @@ -649,7 +752,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) @@ -659,101 +761,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 - - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.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/mkfontscale/NEWS b/mkfontscale/NEWS deleted file mode 100644 index e69de29..0000000 diff --git a/mkfontscale/aclocal.m4 b/mkfontscale/aclocal.m4 index face861..d82df39 100644 --- a/mkfontscale/aclocal.m4 +++ b/mkfontscale/aclocal.m4 @@ -406,18 +406,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 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. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, @@ -1067,7 +1055,7 @@ dnl DEALINGS IN THE SOFTWARE. # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.11.0]) +m4_define([vers_have], [1.15.0]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -1094,7 +1082,7 @@ AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], # 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 ?]) +AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp redefine unix ?]])]) if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then AC_MSG_RESULT([no]) else @@ -1112,7 +1100,7 @@ fi rm -f conftest.$ac_ext AC_MSG_CHECKING([if $RAWCPP requires -traditional]) -AC_LANG_CONFTEST([Does cpp preserve "whitespace"?]) +AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve "whitespace"?]])]) if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then AC_MSG_RESULT([no]) else @@ -1462,6 +1450,123 @@ AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes]) AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) ]) # XORG_WITH_XMLTO +# XORG_WITH_XSLTPROC([MIN-VERSION], [DEFAULT]) +# -------------------------------------------- +# Minimum version: 1.12.0 +# Minimum version for optional DEFAULT argument: 1.12.0 +# +# XSLT (Extensible Stylesheet Language Transformations) is a declarative, +# XML-based language used for the transformation of XML documents. +# The xsltproc command line tool is for applying XSLT stylesheets to XML documents. +# It is used under the cover by xmlto to generate html files from DocBook/XML. +# The XSLT processor is often used as a standalone tool for transformations. +# It should not be assumed that this tool is used only to work with documnetation. +# When DEFAULT is not specified, --with-xsltproc assumes 'auto'. +# +# Interface to module: +# HAVE_XSLTPROC: used in makefiles to conditionally generate documentation +# XSLTPROC: returns the path of the xsltproc program found +# returns the path set by the user in the environment +# --with-xsltproc: 'yes' user instructs the module to use xsltproc +# 'no' user instructs the module not to use xsltproc +# have_xsltproc: returns yes if xsltproc found in PATH or no +# +# If the user sets the value of XSLTPROC, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_XSLTPROC],[ +AC_ARG_VAR([XSLTPROC], [Path to xsltproc command]) +# Preserves the interface, should it be implemented later +m4_ifval([$1], [m4_warn([syntax], [Checking for xsltproc MIN-VERSION is not implemented])]) +m4_define([_defopt], m4_default([$2], [auto])) +AC_ARG_WITH(xsltproc, + AS_HELP_STRING([--with-xsltproc], + [Use xsltproc for the transformation of XML documents (default: ]_defopt[)]), + [use_xsltproc=$withval], [use_xsltproc=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_xsltproc" = x"auto"; then + AC_PATH_PROG([XSLTPROC], [xsltproc]) + if test "x$XSLTPROC" = "x"; then + AC_MSG_WARN([xsltproc not found - cannot transform XML documents]) + have_xsltproc=no + else + have_xsltproc=yes + fi +elif test "x$use_xsltproc" = x"yes" ; then + AC_PATH_PROG([XSLTPROC], [xsltproc]) + if test "x$XSLTPROC" = "x"; then + AC_MSG_ERROR([--with-xsltproc=yes specified but xsltproc not found in PATH]) + fi + have_xsltproc=yes +elif test "x$use_xsltproc" = x"no" ; then + if test "x$XSLTPROC" != "x"; then + AC_MSG_WARN([ignoring XSLTPROC environment variable since --with-xsltproc=no was specified]) + fi + have_xsltproc=no +else + AC_MSG_ERROR([--with-xsltproc expects 'yes' or 'no']) +fi + +AM_CONDITIONAL([HAVE_XSLTPROC], [test "$have_xsltproc" = yes]) +]) # XORG_WITH_XSLTPROC -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
