Hello community, here is the log from the commit of package xorg-x11-fonts for openSUSE:Factory checked in at Wed Apr 7 13:23:46 CEST 2010. -------- --- xorg-x11-fonts/xorg-x11-fonts.changes 2009-12-24 14:16:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-fonts/xorg-x11-fonts.changes 2010-04-07 12:40:50.000000000 +0200 @@ -1,0 +2,47 @@ +Wed Apr 7 12:39:11 CEST 2010 - sndirsch@suse.de + +- unfuzzed font-misc-cyrillic.diff + +------------------------------------------------------------------- +Sun Apr 4 17:52:14 CEST 2010 - sndirsch@suse.de + +- encodings 1.0.3 +- font-adobe-100dpi 1.0.1 +- font-adobe-75dpi 1.0.1 +- font-adobe-utopia-100dpi 1.0.2 +- font-adobe-utopia-75dpi 1.0.2 +- font-adobe-utopia-type1 1.0.2 +- font-alias 1.0.2 +- font-arabic-misc 1.0.1 +- font-bh-100dpi 1.0.1 +- font-bh-75dpi 1.0.1 +- font-bh-lucidatypewriter-100dpi 1.0.1 +- font-bh-lucidatypewriter-75dpi 1.0.1 +- font-bh-ttf 1.0.1 +- font-bh-type1 1.0.1 +- font-bitstream-100dpi 1.0.1 +- font-bitstream-75dpi 1.0.1 +- font-bitstream-type1 1.0.1 +- font-cronyx-cyrillic 1.0.1 +- font-cursor-misc 1.0.1 +- font-daewoo-misc 1.0.1 +- font-dec-misc 1.0.1 +- font-ibm-type1 1.0.1 +- font-isas-misc 1.0.1 +- font-jis-misc 1.0.1 +- font-micro-misc 1.0.1 +- font-misc-cyrillic 1.0.1 +- font-misc-ethiopic 1.0.1 +- font-misc-meltho 1.0.1 +- font-misc-misc 1.1.0 +- font-mutt-misc 1.0.1 +- font-schumacher-misc 1.1.0 +- font-screen-cyrillic 1.0.2 +- font-sony-misc 1.0.1 +- font-sun-misc 1.0.1 +- font-winitzki-cyrillic 1.0.1 +- font-xfree86-type1 1.0.2 +- adjusted font-misc-ethiopic.diff +- bumped version number to 7.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- encodings-1.0.2.tar.bz2 font-adobe-100dpi-X11R7.0-1.0.0.tar.bz2 font-adobe-75dpi-X11R7.0-1.0.0.tar.bz2 font-adobe-utopia-100dpi-X11R7.0-1.0.1.tar.bz2 font-adobe-utopia-75dpi-X11R7.0-1.0.1.tar.bz2 font-adobe-utopia-type1-X11R7.0-1.0.1.tar.bz2 font-alias-X11R7.0-1.0.1.tar.bz2 font-arabic-misc-X11R7.0-1.0.0.tar.bz2 font-bh-100dpi-X11R7.0-1.0.0.tar.bz2 font-bh-75dpi-X11R7.0-1.0.0.tar.bz2 font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0.tar.bz2 font-bh-lucidatypewriter-75dpi-X11R7.0-1.0.0.tar.bz2 font-bh-ttf-X11R7.0-1.0.0.tar.bz2 font-bh-type1-X11R7.0-1.0.0.tar.bz2 font-bitstream-100dpi-X11R7.0-1.0.0.tar.bz2 font-bitstream-75dpi-X11R7.0-1.0.0.tar.bz2 font-bitstream-type1-X11R7.0-1.0.0.tar.bz2 font-cronyx-cyrillic-X11R7.0-1.0.0.tar.bz2 font-cursor-misc-X11R7.0-1.0.0.tar.bz2 font-daewoo-misc-X11R7.0-1.0.0.tar.bz2 font-dec-misc-X11R7.0-1.0.0.tar.bz2 font-ibm-type1-X11R7.0-1.0.0.tar.bz2 font-isas-misc-X11R7.0-1.0.0.tar.bz2 font-jis-misc-X11R7.0-1.0.0.tar.bz2 font-micro-misc-X11R7.0-1.0.0.tar.bz2 font-misc-cyrillic-X11R7.0-1.0.0.tar.bz2 font-misc-ethiopic-X11R7.0-1.0.0.tar.bz2 font-misc-meltho-X11R7.0-1.0.0.tar.bz2 font-misc-misc-X11R7.0-1.0.0.tar.bz2 font-mutt-misc-X11R7.0-1.0.0.tar.bz2 font-schumacher-misc-X11R7.0-1.0.0.tar.bz2 font-screen-cyrillic-1.0.1.tar.bz2 font-sony-misc-X11R7.0-1.0.0.tar.bz2 font-sun-misc-X11R7.0-1.0.0.tar.bz2 font-winitzki-cyrillic-X11R7.0-1.0.0.tar.bz2 font-xfree86-type1-1.0.1.tar.bz2 New: ---- encodings-1.0.3.tar.bz2 font-adobe-100dpi-1.0.1.tar.bz2 font-adobe-75dpi-1.0.1.tar.bz2 font-adobe-utopia-100dpi-1.0.2.tar.bz2 font-adobe-utopia-75dpi-1.0.2.tar.bz2 font-adobe-utopia-type1-1.0.2.tar.bz2 font-alias-1.0.2.tar.bz2 font-arabic-misc-1.0.1.tar.bz2 font-bh-100dpi-1.0.1.tar.bz2 font-bh-75dpi-1.0.1.tar.bz2 font-bh-lucidatypewriter-100dpi-1.0.1.tar.bz2 font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2 font-bh-ttf-1.0.1.tar.bz2 font-bh-type1-1.0.1.tar.bz2 font-bitstream-100dpi-1.0.1.tar.bz2 font-bitstream-75dpi-1.0.1.tar.bz2 font-bitstream-type1-1.0.1.tar.bz2 font-cronyx-cyrillic-1.0.1.tar.bz2 font-cursor-misc-1.0.1.tar.bz2 font-daewoo-misc-1.0.1.tar.bz2 font-dec-misc-1.0.1.tar.bz2 font-ibm-type1-1.0.1.tar.bz2 font-isas-misc-1.0.1.tar.bz2 font-jis-misc-1.0.1.tar.bz2 font-micro-misc-1.0.1.tar.bz2 font-misc-cyrillic-1.0.1.tar.bz2 font-misc-ethiopic-1.0.1.tar.bz2 font-misc-meltho-1.0.1.tar.bz2 font-misc-misc-1.1.0.tar.bz2 font-mutt-misc-1.0.1.tar.bz2 font-schumacher-misc-1.1.0.tar.bz2 font-screen-cyrillic-1.0.2.tar.bz2 font-sony-misc-1.0.1.tar.bz2 font-sun-misc-1.0.1.tar.bz2 font-winitzki-cyrillic-1.0.1.tar.bz2 font-xfree86-type1-1.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-fonts.spec ++++++ --- /var/tmp/diff_new_pack.gCQ5hd/_old 2010-04-07 13:23:16.000000000 +0200 +++ /var/tmp/diff_new_pack.gCQ5hd/_new 2010-04-07 13:23:16.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package xorg-x11-fonts (Version 7.4) +# spec file for package xorg-x11-fonts (Version 7.5) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,8 +21,8 @@ Name: xorg-x11-fonts BuildRequires: fontconfig freetype2 pkgconfig xorg-x11 xorg-x11-fonts-devel xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXprintUtil xorg-x11-libXrender xorg-x11-libXt xorg-x11-libXv xorg-x11-libfontenc xorg-x11-libs xorg-x11-libxkbfile xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ -Version: 7.4 -Release: 6 +Version: 7.5 +Release: 1 License: MIT License (or similar) BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -32,43 +32,43 @@ Provides: xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-fonts-cyrillic xorg-x11-fonts-scalable xorg-x11-fonts-syriac Obsoletes: xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-fonts-cyrillic xorg-x11-fonts-scalable xorg-x11-fonts-syriac Summary: X.Org fonts -Source0: font-adobe-100dpi-X11R7.0-1.0.0.tar.bz2 -Source1: font-adobe-75dpi-X11R7.0-1.0.0.tar.bz2 -Source2: font-arabic-misc-X11R7.0-1.0.0.tar.bz2 -Source3: font-bh-100dpi-X11R7.0-1.0.0.tar.bz2 -Source4: font-bh-75dpi-X11R7.0-1.0.0.tar.bz2 -Source5: font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0.tar.bz2 -Source6: font-bh-lucidatypewriter-75dpi-X11R7.0-1.0.0.tar.bz2 -Source7: font-bh-ttf-X11R7.0-1.0.0.tar.bz2 -Source8: font-bh-type1-X11R7.0-1.0.0.tar.bz2 -Source9: font-bitstream-100dpi-X11R7.0-1.0.0.tar.bz2 -Source10: font-bitstream-75dpi-X11R7.0-1.0.0.tar.bz2 +Source0: font-adobe-100dpi-1.0.1.tar.bz2 +Source1: font-adobe-75dpi-1.0.1.tar.bz2 +Source2: font-arabic-misc-1.0.1.tar.bz2 +Source3: font-bh-100dpi-1.0.1.tar.bz2 +Source4: font-bh-75dpi-1.0.1.tar.bz2 +Source5: font-bh-lucidatypewriter-100dpi-1.0.1.tar.bz2 +Source6: font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2 +Source7: font-bh-ttf-1.0.1.tar.bz2 +Source8: font-bh-type1-1.0.1.tar.bz2 +Source9: font-bitstream-100dpi-1.0.1.tar.bz2 +Source10: font-bitstream-75dpi-1.0.1.tar.bz2 Source11: font-bitstream-speedo-X11R7.0-1.0.0.tar.bz2 -Source12: font-bitstream-type1-X11R7.0-1.0.0.tar.bz2 -Source13: font-cronyx-cyrillic-X11R7.0-1.0.0.tar.bz2 -Source14: font-cursor-misc-X11R7.0-1.0.0.tar.bz2 -Source15: font-daewoo-misc-X11R7.0-1.0.0.tar.bz2 -Source16: font-dec-misc-X11R7.0-1.0.0.tar.bz2 -Source17: font-ibm-type1-X11R7.0-1.0.0.tar.bz2 -Source18: font-isas-misc-X11R7.0-1.0.0.tar.bz2 -Source19: font-jis-misc-X11R7.0-1.0.0.tar.bz2 -Source20: font-micro-misc-X11R7.0-1.0.0.tar.bz2 -Source21: font-misc-cyrillic-X11R7.0-1.0.0.tar.bz2 -Source22: font-misc-ethiopic-X11R7.0-1.0.0.tar.bz2 -Source23: font-misc-meltho-X11R7.0-1.0.0.tar.bz2 -Source24: font-misc-misc-X11R7.0-1.0.0.tar.bz2 -Source25: font-mutt-misc-X11R7.0-1.0.0.tar.bz2 -Source26: font-schumacher-misc-X11R7.0-1.0.0.tar.bz2 -Source27: font-screen-cyrillic-1.0.1.tar.bz2 -Source28: font-sony-misc-X11R7.0-1.0.0.tar.bz2 -Source29: font-sun-misc-X11R7.0-1.0.0.tar.bz2 -Source30: font-winitzki-cyrillic-X11R7.0-1.0.0.tar.bz2 -Source31: font-xfree86-type1-1.0.1.tar.bz2 -Source32: encodings-1.0.2.tar.bz2 -Source33: font-adobe-utopia-100dpi-X11R7.0-1.0.1.tar.bz2 -Source34: font-adobe-utopia-75dpi-X11R7.0-1.0.1.tar.bz2 -Source35: font-adobe-utopia-type1-X11R7.0-1.0.1.tar.bz2 -Source36: font-alias-X11R7.0-1.0.1.tar.bz2 +Source12: font-bitstream-type1-1.0.1.tar.bz2 +Source13: font-cronyx-cyrillic-1.0.1.tar.bz2 +Source14: font-cursor-misc-1.0.1.tar.bz2 +Source15: font-daewoo-misc-1.0.1.tar.bz2 +Source16: font-dec-misc-1.0.1.tar.bz2 +Source17: font-ibm-type1-1.0.1.tar.bz2 +Source18: font-isas-misc-1.0.1.tar.bz2 +Source19: font-jis-misc-1.0.1.tar.bz2 +Source20: font-micro-misc-1.0.1.tar.bz2 +Source21: font-misc-cyrillic-1.0.1.tar.bz2 +Source22: font-misc-ethiopic-1.0.1.tar.bz2 +Source23: font-misc-meltho-1.0.1.tar.bz2 +Source24: font-misc-misc-1.1.0.tar.bz2 +Source25: font-mutt-misc-1.0.1.tar.bz2 +Source26: font-schumacher-misc-1.1.0.tar.bz2 +Source27: font-screen-cyrillic-1.0.2.tar.bz2 +Source28: font-sony-misc-1.0.1.tar.bz2 +Source29: font-sun-misc-1.0.1.tar.bz2 +Source30: font-winitzki-cyrillic-1.0.1.tar.bz2 +Source31: font-xfree86-type1-1.0.2.tar.bz2 +Source32: encodings-1.0.3.tar.bz2 +Source33: font-adobe-utopia-100dpi-1.0.2.tar.bz2 +Source34: font-adobe-utopia-75dpi-1.0.2.tar.bz2 +Source35: font-adobe-utopia-type1-1.0.2.tar.bz2 +Source36: font-alias-1.0.2.tar.bz2 Patch: encodings.diff Patch1: font-misc-ethiopic.diff Patch2: font-misc-cyrillic.diff @@ -111,7 +111,7 @@ for dir in encodings-* $(ls | grep -v -e encodings -e alias) font-alias-* ; do pushd $dir case $dir in - *alias-*) option="--with-top-fontdir=/usr/share/fonts" ;; + *alias-*) option="--with-fontrootdir=/usr/share/fonts" ;; *encodings-*) option="--with-encodingsdir=/usr/share/fonts/encodings" ;; *100dpi-*) option="--with-fontdir=/usr/share/fonts/100dpi" ;; *75dpi-*) option="--with-fontdir=/usr/share/fonts/75dpi" ;; @@ -165,7 +165,6 @@ %dir /usr/share/fonts/cyrillic %dir /usr/share/fonts/truetype %config /usr/share/fonts/100dpi/fonts.dir -%config /usr/share/fonts/100dpi/fonts.scale /usr/share/fonts/100dpi/fonts.alias /usr/share/fonts/100dpi/*.pcf.gz /usr/share/fonts/75dpi/fonts.alias @@ -179,7 +178,6 @@ /usr/share/fonts/Type1/*.pfa /usr/share/fonts/Type1/*.pfb %config /usr/share/fonts/cyrillic/fonts.dir -%config /usr/share/fonts/cyrillic/fonts.scale /usr/share/fonts/cyrillic/fonts.alias /usr/share/fonts/cyrillic/*.pcf.gz %config /usr/share/fonts/truetype/fonts.dir @@ -198,7 +196,6 @@ %config /usr/share/fonts/encodings/large/encodings.dir /usr/share/fonts/encodings/large/*.enc.gz %config /usr/share/fonts/misc/fonts.dir -%config /usr/share/fonts/misc/fonts.scale /usr/share/fonts/misc/fonts.alias /usr/share/fonts/misc/*.pcf.gz ++++++ encodings-1.0.2.tar.bz2 -> encodings-1.0.3.tar.bz2 ++++++ ++++ 13559 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/encodings-1.0.2/COPYING new/encodings-1.0.3/COPYING --- old/encodings-1.0.2/COPYING 2006-11-08 14:40:32.000000000 +0100 +++ new/encodings-1.0.3/COPYING 2007-08-01 18:47:38.000000000 +0200 @@ -1,28 +1,12 @@ -XFree86 code without an explicit copyright is covered by the following -copyright/license: +The XFree86/Xorg encoding files are in the public domain. -Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. +Most of these encoding files were generated by me in the winter of 1998/1998 +from publicly available sources (notably from data files provided by the +Unicode Consortium) using a throw-away program written in Common Lisp. Over +the years, a number of people have kindly added new encoding files to the +collection. -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +If you want to add a copyright statement to an encoding file, you need +your brain examined. -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES -OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the XFree86 Project -shall not be used in advertising or otherwise to promote the sale, use -or other dealings in this Software without prior written authorization -from the XFree86 Project. + Juliusz Chroboczek diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/encodings-1.0.2/ChangeLog new/encodings-1.0.3/ChangeLog --- old/encodings-1.0.2/ChangeLog 2006-11-08 14:43:04.000000000 +0100 +++ new/encodings-1.0.3/ChangeLog 2009-10-11 03:19:30.000000000 +0200 @@ -1,3 +1,57 @@ +commit 37d2a7c362a330d6aaa4d348a5db81da844ef7a8 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:56:53 2009 -0700 + + encodings 1.0.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit ba904c20fa5e80449d515c8c8f04953db5a64a06 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 16:46:52 2009 -0700 + + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit 8053655dd5714014ecca5182471c96f5223feb29 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:15:31 2009 -0700 + + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit 6a86a2a95a40350ce19a6f5e802452cc28f1b968 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:08 2009 -0200 + + Janitor: Correct make distcheck and configure.ac simplification + +commit 862d94a9b9931361c546d951b7026258d944fdad +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:10:58 2009 -0200 + + Janitor: Correct make distcheck and configure.ac simplification + +commit d1546d162b4fe12c5d01479ded02b00bff5a9c64 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 15:51:13 2007 -0500 + + Add missing PHONY line for automatic ChangeLog generation + +commit 0feb027d6c94a7896c5d2fb861de8c69340998db +Author: Juliusz Chroboczek <jch@pps.jussieu.fr> +Date: Mon Jul 23 22:55:01 2007 +0200 + + Replace generic copyright statement. + +commit 6e799b71a736588a5aeb274851bc8a81323d661e +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Nov 8 16:01:11 2006 +0200 + + bump to 1.0.2 + commit 1963f4ab3ce7625ff687cbd4a94605aef86c7c03 Author: Juliusz Chroboczek <jch@pps.jussieu.fr> Date: Mon Nov 6 19:55:15 2006 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/encodings-1.0.2/Makefile.am new/encodings-1.0.3/Makefile.am --- old/encodings-1.0.2/Makefile.am 2006-11-08 14:40:32.000000000 +0100 +++ new/encodings-1.0.3/Makefile.am 2009-10-08 01:41:58.000000000 +0200 @@ -47,23 +47,25 @@ DATA_FILES = $(COMPRESSED) CLEANFILES += $(COMPRESSED) else -DATA_FILES = $(ENCODING_FILES) encodings.dir +DATA_FILES = $(ENCODING_FILES) endif SUFFIXES = .enc .enc.gz .enc.enc.gz: - @GZIP@ -c < $< > $@ + $(AM_V_GEN)$(GZIP) -c < $< > $@ encodings.dir: $(DATA_FILES) - @MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . -e large . + $(AM_V_GEN)$(MKFONTSCALE) -b -s -l -n -r -p $(encodingsdir) -e . -e large . encodings_DATA = $(DATA_FILES) encodings.dir MAINTAINERCLEANFILES=ChangeLog +.PHONY: ChangeLog + ChangeLog: - git-log > ChangeLog + $(CHANGELOG_CMD) dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/encodings-1.0.2/README new/encodings-1.0.3/README --- old/encodings-1.0.2/README 1970-01-01 01:00:00.000000000 +0100 +++ new/encodings-1.0.3/README 2009-10-07 04:14:28.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/encodings + + http://cgit.freedesktop.org/xorg/font/encodings + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/encodings-1.0.2/configure.ac new/encodings-1.0.3/configure.ac --- old/encodings-1.0.2/configure.ac 2006-11-08 14:42:49.000000000 +0100 +++ new/encodings-1.0.3/configure.ac 2009-10-11 02:56:01.000000000 +0200 @@ -1,29 +1,40 @@ AC_PREREQ([2.57]) -AC_INIT([encodings], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([encodings], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + +AC_PROG_INSTALL + +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) # mkfontscale - -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -if [[ -z $MKFONTSCALE ]]; then - AC_MSG_ERROR([mkfontscale is needed to build fontenc. Please install the app/mkfontscale package from X.Org.]) -fi +XORG_FONT_REQUIRED_PROG(MKFONTSCALE, mkfontscale) # Choose whether or not to compress encodings - default is to compress all +AC_MSG_CHECKING([if small encodings should be compressed]) AC_ARG_ENABLE(gzip-small-encodings, - AS_HELP_STRING([--disable-gzip-small-encodings], + AC_HELP_STRING([--disable-gzip-small-encodings], [Disable compression of small encoding files]), [GZIP_SMALL="$enableval"], [GZIP_SMALL="yes"]) AM_CONDITIONAL(GZIP_SMALL, [test x$GZIP_SMALL = xyes]) +AC_MSG_RESULT([${GZIP_SMALL}]) +AC_MSG_CHECKING([if large encodings should be compressed]) AC_ARG_ENABLE(gzip-large-encodings, - AS_HELP_STRING([--disable-gzip-large-encodings], + AC_HELP_STRING([--disable-gzip-large-encodings], [Disable compression of large encoding files]), [GZIP_LARGE="$enableval"], [GZIP_LARGE="yes"]) AM_CONDITIONAL(GZIP_LARGE, [test x$GZIP_LARGE = xyes]) +AC_MSG_RESULT([${GZIP_LARGE}]) # gzip @@ -34,13 +45,6 @@ fi fi -DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings -AC_ARG_WITH(encodingsdir, - AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to install font encodings]), - [ENCODINGSDIR="$withval"], - [ENCODINGSDIR="$DEFAULT_ENCODINGSDIR"]) -AC_SUBST(ENCODINGSDIR) - -XORG_RELEASE_VERSION +XORG_FONTSUBDIR([ENCODINGSDIR], [encodingsdir], [encodings]) AC_OUTPUT([Makefile large/Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/encodings-1.0.2/large/Makefile.am new/encodings-1.0.3/large/Makefile.am --- old/encodings-1.0.2/large/Makefile.am 2006-11-08 14:40:32.000000000 +0100 +++ new/encodings-1.0.3/large/Makefile.am 2009-10-08 01:41:02.000000000 +0200 @@ -34,9 +34,9 @@ SUFFIXES = .enc .enc.gz .enc.enc.gz: - @GZIP@ -c < $< > $@ + $(AM_V_GEN)$(GZIP) -c < $< > $@ encodings.dir: $(DATA_FILES) - @MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . . + $(AM_V_GEN)$(MKFONTSCALE) -b -s -l -n -r -p $(encodingsdir) -e . . encodings_DATA = $(DATA_FILES) encodings.dir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/encodings-1.0.2/missing new/encodings-1.0.3/missing --- old/encodings-1.0.2/missing 2006-11-08 14:43:02.000000000 +0100 +++ new/encodings-1.0.3/missing 2009-10-11 03:19:23.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +44,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -86,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create `y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + Send bug reports to <bug-automake@gnu.org>." exit $? ;; @@ -103,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). -case "$1" in - lex|yacc) +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: `tar' requires --run" exit 1 @@ -135,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $program in aclocal*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if @@ -145,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the @@ -154,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want @@ -164,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -184,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: `$1' is needed, but is $msg. You might have modified some files without having the @@ -192,8 +203,8 @@ You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -207,80 +218,78 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file @@ -289,11 +298,17 @@ DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -303,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -317,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -356,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: ++++++ font-adobe-100dpi-X11R7.0-1.0.0.tar.bz2 -> font-adobe-100dpi-1.0.1.tar.bz2 ++++++ ++++ 16644 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-adobe-100dpi-X11R7.0-1.0.0/ChangeLog new/font-adobe-100dpi-1.0.1/ChangeLog --- old/font-adobe-100dpi-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:21.000000000 +0100 +++ new/font-adobe-100dpi-1.0.1/ChangeLog 2009-10-11 02:59:28.000000000 +0200 @@ -1,33 +1,152 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit db9920040c4f3a8479137515c8730c85fc724fee +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 16:45:16 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-adobe-100dpi 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 1509b58bc46959bc271f8731fb0e8ddef6ac8349 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 18:51:52 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 7a3b22bf5d102654ea01ff80d264f8b10316f75b +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:24 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit f73f1b58bb027665dfe5b28da9d0b57c5b0639c1 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:06 2009 -0200 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Janitor: Correct make distcheck and configure.ac simplification -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit c0eac451df92feb38a71db01416e3f4c6c54e183 +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure options to change the installed font dir and - disable ISO8859-* fonts. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 6b130967516b10c70beed98798b5031a63de1302 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:37:37 2007 -0500 - * configure.ac: - Update package version number for RC1 release. + Replace static ChangeLog with dist-hook to generate from git log +commit 04593ae98be9ea80d2a37cfbed5f45efc443be34 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:52:53 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 635d1ec0a8438bed97f40f10ffdf829d876d7c57 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:05 2007 -0400 + + Rename .cvsignore to .gitignore + +commit ff4e39f76d70afd63c2a7efe0262097ff48a8896 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:21 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 778b66edb4dc278b60f1d67759e4c8b96226c75b +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:50 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit 985b05a57411e75c9457d796dcbd641a4ad29d2a +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:37 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit bdae83ecb63d0259e372d949a28af3f70b9db5c8 +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:13 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit 4539aee3289f13614ddc0b1d2c4083766b973f99 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:17 2005 +0000 + + Add .cvsignores for fonts. + +commit e3b4d3c2385d28baf6bb0b2246ac611f075c9abb +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:26:46 2005 +0000 + + Add configure options to change the installed font dir and disable + ISO8859-* fonts. + +commit 10b0f7e1585f0621e71881487a9b3848de526ad5 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:48:06 2005 +0000 + + Update package version number for RC1 release. + +commit 174931f1975d5a494211f097e00e1b4155df8eaa +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Sun Oct 2 18:19:53 2005 +0000 + + Add explicit all-local targets so Solaris make can build, since it won't + recursively follow the implicit targets (.bdf -> -ISO-8859-1.bdf -> + pcf.gz) + Fix a couple of remaining GNU-make-isms + +commit 626f8c540e4ff6c09695c053211c89917cf66c23 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:46 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 99d9262e027c60e9c9a58f4cda8908bf87769ef6 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 22 04:13:43 2005 +0000 + + Fix distcheck for fonts with multiple encodings + +commit 422317e65cc1743f7acd58a48f46de50953f0ff4 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:05 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit 8bc392f13970232e5e1bf77c105e8e1a5fad6c52 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:05 2005 +0000 + + Initial build system files for font module + +commit 3811ca1218ed8536e1b6cd082f3bec32083dadc5 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:35 2003 +0000 + + XFree86 4.3.0.1 + +commit 4a251a571b0a64719c25701634aa1ce174a6c18f +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:33 2003 +0000 + + R6.6 is the Xorg base-line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-adobe-100dpi-X11R7.0-1.0.0/Makefile.am new/font-adobe-100dpi-1.0.1/Makefile.am --- old/font-adobe-100dpi-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:13.000000000 +0100 +++ new/font-adobe-100dpi-1.0.1/Makefile.am 2009-10-07 04:59:33.000000000 +0200 @@ -126,56 +126,56 @@ FONT_FILES = $(BDF2UCS_FONT_FILES) $(EXTRA_FONT_FILES) BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) if ISO8859_1 ISO8859_1_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.bdf) -ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.pcf.gz) +ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_2 ISO8859_2_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.bdf) -ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.pcf.gz) +ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_3 ISO8859_3_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.bdf) -ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.pcf.gz) +ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_4 ISO8859_4_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.bdf) -ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.pcf.gz) +ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_9 ISO8859_9_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.bdf) -ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.pcf.gz) +ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_10 ISO8859_10_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.bdf) -ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.pcf.gz) +ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_13 ISO8859_13_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.bdf) -ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.pcf.gz) +ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_14 ISO8859_14_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.bdf) -ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.pcf.gz) +ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_15 ISO8859_15_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.bdf) -ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.pcf.gz) +ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.pcf$(COMPRESS_SUFFIX)) endif UTIL_DIR = @MAPFILES_PATH@ -SUFFIXES = .bdf .pcf.gz \ +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) \ -ISO8859-1.bdf \ -ISO8859-2.bdf \ -ISO8859-3.bdf \ @@ -186,45 +186,45 @@ -ISO8859-14.bdf \ -ISO8859-15.bdf -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ .bdf-ISO8859-1.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-1 ISO8859-1 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-1 ISO8859-1 .bdf-ISO8859-2.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-2 ISO8859-2 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-2 ISO8859-2 .bdf-ISO8859-3.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-3 ISO8859-3 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-3 ISO8859-3 .bdf-ISO8859-4.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-4 ISO8859-4 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-4 ISO8859-4 .bdf-ISO8859-9.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-9 ISO8859-9 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-9 ISO8859-9 .bdf-ISO8859-10.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-10 ISO8859-10 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-10 ISO8859-10 .bdf-ISO8859-13.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-13 ISO8859-13 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-13 ISO8859-13 .bdf-ISO8859-14.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-14 ISO8859-14 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-14 ISO8859-14 .bdf-ISO8859-15.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-15 ISO8859-15 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-15 ISO8859-15 fontdir = @FONTDIR@ font_DATA = \ @@ -250,15 +250,24 @@ $(ISO8859_15_BDF_FILES) CLEANFILES = $(font_DATA) $(BUILT_BDF_FILES) -EXTRA_DIST = $(BDF_FILES) autogen.sh +EXTRA_DIST = $(BDF_FILES) all-local: $(BUILT_BDF_FILES) $(font_DATA) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-adobe-100dpi-X11R7.0-1.0.0/README new/font-adobe-100dpi-1.0.1/README --- old/font-adobe-100dpi-X11R7.0-1.0.0/README 2005-07-01 00:28:05.000000000 +0200 +++ new/font-adobe-100dpi-1.0.1/README 2009-10-07 04:59:32.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/adobe-100dpi + + http://cgit.freedesktop.org/xorg/font/adobe-100dpi + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-adobe-100dpi-X11R7.0-1.0.0/autogen.sh new/font-adobe-100dpi-1.0.1/autogen.sh --- old/font-adobe-100dpi-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:05.000000000 +0200 +++ new/font-adobe-100dpi-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-adobe-100dpi-X11R7.0-1.0.0/configure.ac new/font-adobe-100dpi-1.0.1/configure.ac --- old/font-adobe-100dpi-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:21.000000000 +0100 +++ new/font-adobe-100dpi-1.0.1/configure.ac 2009-10-11 01:44:30.000000000 +0200 @@ -22,40 +22,28 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-adobe-100dpi, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-adobe-100dpi) +AC_INIT(font-adobe-100dpi, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-adobe-100dpi) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AC_PROG_INSTALL +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(UCS2ANY, ucs2any) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/100dpi -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) - -PKG_CHECK_MODULES(MAPS, [fontutil]) -MAPFILES_PATH=$(pkg-config --variable=mapdir fontutil) -AC_SUBST(MAPFILES_PATH) - -XORG_FONT_CHECK_ISO8859_1 -XORG_FONT_CHECK_ISO8859_2 -XORG_FONT_CHECK_ISO8859_3 -XORG_FONT_CHECK_ISO8859_4 -XORG_FONT_CHECK_ISO8859_9 -XORG_FONT_CHECK_ISO8859_10 -XORG_FONT_CHECK_ISO8859_13 -XORG_FONT_CHECK_ISO8859_14 -XORG_FONT_CHECK_ISO8859_15 +AC_PROG_INSTALL -XORG_RELEASE_VERSION +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) + +XORG_FONTDIR([100dpi]) +XORG_FONT_BDF_UTILS +XORG_FONT_UCS2ANY +XORG_FONT_CHECK_ENCODING_LIST([ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 + ISO8859-9 ISO8859-10 ISO8859-13 ISO8859-14 + ISO8859-15]) AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-adobe-100dpi-X11R7.0-1.0.0/missing new/font-adobe-100dpi-1.0.1/missing --- old/font-adobe-100dpi-X11R7.0-1.0.0/missing 2005-12-21 09:15:18.000000000 +0100 +++ new/font-adobe-100dpi-1.0.1/missing 2009-10-11 02:59:19.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-adobe-100dpi-X11R7.0-1.0.0.tar.bz2 -> font-adobe-75dpi-1.0.1.tar.bz2 ++++++ ++++ 2436049 lines of diff (skipped) ++++++ font-adobe-utopia-100dpi-X11R7.0-1.0.1.tar.bz2 -> font-adobe-utopia-100dpi-1.0.2.tar.bz2 ++++++ ++++ 16658 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-adobe-utopia-100dpi-X11R7.0-1.0.1/ChangeLog new/font-adobe-utopia-100dpi-1.0.2/ChangeLog --- old/font-adobe-utopia-100dpi-X11R7.0-1.0.1/ChangeLog 2005-12-21 03:30:05.000000000 +0100 +++ new/font-adobe-utopia-100dpi-1.0.2/ChangeLog 2009-10-11 03:05:33.000000000 +0200 @@ -1,45 +1,171 @@ -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit a30aff3709ab5d48306994f08300670b43a5e4f9 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 16:49:19 2009 -0700 - * configure.ac: - Update package version for X11R7 release. + font-adobe-utopia-100dpi 1.0.2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-16 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 73e80f4aa2561906e060526dc69a42c9618628fc +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 13:35:13 2009 -0700 - * COPYING: - * README: - Copy README from X11R5 release, and update COPYING to reflect the - original license from Adobe. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 6dbaeb10ff68c6e3ec03843b8805507870ad653e +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:25 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 7da9a27ef660b9eb056e57838d84e52c5df7792b +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:06 2009 -0200 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Janitor: Correct make distcheck and configure.ac simplification -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit babbadea2713e036ecb569c7b5a5dd65acbcdfe4 +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * configure.ac: - Update package version number for X11R7 RC3 release. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit 553dbc701d5f1669a2797d530286743a81104cbf +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:37:41 2007 -0500 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Replace static ChangeLog with dist-hook to generate from git log -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 657e312e55a4138425773db5cc6c6ac56615436b +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:52:54 2007 -0400 - * Makefile.am: - * configure.ac: - Add configure options to change the installed font dir and - disable ISO8859-* fonts. + Add *~ to .gitignore to skip patch/emacs droppings -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 011892c171f51f4c3dc3674c770b2965167c9679 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:08 2007 -0400 - * configure.ac: - Update package version number for RC1 release. + Rename .cvsignore to .gitignore +commit bd347961acb6cb3659336b94a0bea29717800105 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Dec 21 02:30:05 2005 +0000 + + Update package version for X11R7 release. + +commit a0d524cbcbbc19865599ac4f9269a6ee3617f18b +Author: Kevin E Martin <kem@kem.org> +Date: Fri Dec 16 18:24:54 2005 +0000 + + Copy README from X11R5 release, and update COPYING to reflect the original + license from Adobe. + +commit 0344fe910a89767482bf77892bb779823209847c +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:22 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 107712d0602bea65dd8c9177a57928492ff59e24 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:50 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit b60e97ae8dc8e3024d60e0f6e3b8ea7d3b6cde5a +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:37 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 6f81629b4829b622a27dbbf99ca0431e9fabe9c7 +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:13 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit e3bb85eba8e5e1dc3a2c7dab1bf56485c8a11973 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:18 2005 +0000 + + Add .cvsignores for fonts. + +commit 84413fac407f3482f6bfb65cd2e6d3df0dfa0b23 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:26:46 2005 +0000 + + Add configure options to change the installed font dir and disable + ISO8859-* fonts. + +commit 92204c52dbbf82ce570ff1304d7078dead4d95a1 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:48:06 2005 +0000 + + Update package version number for RC1 release. + +commit ffc5f98b0cd302b052586c486887546c8ec0914b +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Sun Oct 2 18:19:53 2005 +0000 + + Add explicit all-local targets so Solaris make can build, since it won't + recursively follow the implicit targets (.bdf -> -ISO-8859-1.bdf -> + pcf.gz) + Fix a couple of remaining GNU-make-isms + +commit b0f3fe2318ceda7a6551d00398b82d4f304225b3 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:46 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 87e81a6ebabf0c821bc0dfc9a310797033aa19f4 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 22 04:13:44 2005 +0000 + + Fix distcheck for fonts with multiple encodings + +commit c703eef674fa7a8cf2dc32bbf9e07b6c6621e3bf +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:05 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit 4b4a19675b7ab380be07d66a9a51302a257736dd +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:05 2005 +0000 + + Initial build system files for font module + +commit d3891dea8b0032478c32f46f17348634de844311 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:25 2003 +0000 + + XFree86 4.3.0.1 + +commit 5219c42bb4f4b0c7b8e7594d16a9945366f2b2ab +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:25 2003 +0000 + + Initial revision + +commit b0f62e30e375a507e85f6e2e0cf11d9184c76194 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:33 2003 +0000 + + R6.6 is the Xorg base-line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-adobe-utopia-100dpi-X11R7.0-1.0.1/Makefile.am new/font-adobe-utopia-100dpi-1.0.2/Makefile.am --- old/font-adobe-utopia-100dpi-X11R7.0-1.0.1/Makefile.am 2005-11-24 06:21:13.000000000 +0100 +++ new/font-adobe-utopia-100dpi-1.0.2/Makefile.am 2009-10-07 22:34:47.000000000 +0200 @@ -43,56 +43,56 @@ FONT_FILES = $(BDF2UCS_FONT_FILES) BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) if ISO8859_1 ISO8859_1_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.bdf) -ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.pcf.gz) +ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_2 ISO8859_2_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.bdf) -ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.pcf.gz) +ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_3 ISO8859_3_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.bdf) -ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.pcf.gz) +ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_4 ISO8859_4_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.bdf) -ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.pcf.gz) +ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_9 ISO8859_9_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.bdf) -ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.pcf.gz) +ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_10 ISO8859_10_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.bdf) -ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.pcf.gz) +ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_13 ISO8859_13_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.bdf) -ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.pcf.gz) +ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_14 ISO8859_14_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.bdf) -ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.pcf.gz) +ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_15 ISO8859_15_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.bdf) -ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.pcf.gz) +ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.pcf$(COMPRESS_SUFFIX)) endif UTIL_DIR = @MAPFILES_PATH@ -SUFFIXES = .bdf .pcf.gz \ +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) \ -ISO8859-1.bdf \ -ISO8859-2.bdf \ -ISO8859-3.bdf \ @@ -103,45 +103,45 @@ -ISO8859-14.bdf \ -ISO8859-15.bdf -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ .bdf-ISO8859-1.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-1 ISO8859-1 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-1 ISO8859-1 .bdf-ISO8859-2.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-2 ISO8859-2 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-2 ISO8859-2 .bdf-ISO8859-3.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-3 ISO8859-3 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-3 ISO8859-3 .bdf-ISO8859-4.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-4 ISO8859-4 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-4 ISO8859-4 .bdf-ISO8859-9.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-9 ISO8859-9 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-9 ISO8859-9 .bdf-ISO8859-10.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-10 ISO8859-10 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-10 ISO8859-10 .bdf-ISO8859-13.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-13 ISO8859-13 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-13 ISO8859-13 .bdf-ISO8859-14.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-14 ISO8859-14 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-14 ISO8859-14 .bdf-ISO8859-15.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-15 ISO8859-15 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-15 ISO8859-15 fontdir = @FONTDIR@ font_DATA = \ @@ -167,15 +167,24 @@ $(ISO8859_15_BDF_FILES) CLEANFILES = $(font_DATA) $(BUILT_BDF_FILES) -EXTRA_DIST = $(BDF_FILES) autogen.sh +EXTRA_DIST = $(BDF_FILES) all-local: $(BUILT_BDF_FILES) $(font_DATA) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-adobe-utopia-100dpi-X11R7.0-1.0.1/README new/font-adobe-utopia-100dpi-1.0.2/README --- old/font-adobe-utopia-100dpi-X11R7.0-1.0.1/README 2005-12-16 19:24:54.000000000 +0100 +++ new/font-adobe-utopia-100dpi-1.0.2/README 2009-10-07 04:14:25.000000000 +0200 @@ -23,3 +23,27 @@ Adobe Systems Incorporated + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/adobe-utopia-100dpi + + http://cgit.freedesktop.org/xorg/font/adobe-utopia-100dpi + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-adobe-utopia-100dpi-X11R7.0-1.0.1/autogen.sh new/font-adobe-utopia-100dpi-1.0.2/autogen.sh --- old/font-adobe-utopia-100dpi-X11R7.0-1.0.1/autogen.sh 2005-07-01 00:28:05.000000000 +0200 +++ new/font-adobe-utopia-100dpi-1.0.2/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-adobe-utopia-100dpi-X11R7.0-1.0.1/configure.ac new/font-adobe-utopia-100dpi-1.0.2/configure.ac --- old/font-adobe-utopia-100dpi-X11R7.0-1.0.1/configure.ac 2005-12-21 03:30:05.000000000 +0100 +++ new/font-adobe-utopia-100dpi-1.0.2/configure.ac 2009-10-11 01:44:30.000000000 +0200 @@ -22,40 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-adobe-utopia-100dpi, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-adobe-utopia-100dpi) +AC_INIT(font-adobe-utopia-100dpi, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-adobe-utopia-100dpi) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AC_PROG_INSTALL +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(UCS2ANY, ucs2any) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/100dpi -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) - -PKG_CHECK_MODULES(MAPS, [fontutil]) -MAPFILES_PATH=$(pkg-config --variable=mapdir fontutil) -AC_SUBST(MAPFILES_PATH) - -XORG_FONT_CHECK_ISO8859_1 -XORG_FONT_CHECK_ISO8859_2 -XORG_FONT_CHECK_ISO8859_3 -XORG_FONT_CHECK_ISO8859_4 -XORG_FONT_CHECK_ISO8859_9 -XORG_FONT_CHECK_ISO8859_10 -XORG_FONT_CHECK_ISO8859_13 -XORG_FONT_CHECK_ISO8859_14 -XORG_FONT_CHECK_ISO8859_15 +AC_PROG_INSTALL -XORG_RELEASE_VERSION +XORG_FONTDIR([100dpi]) +XORG_FONT_BDF_UTILS +XORG_FONT_UCS2ANY + +XORG_FONT_CHECK_ENCODING_LIST([ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 + ISO8859-9 ISO8859-10 ISO8859-13 ISO8859-14 + ISO8859-15]) AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-adobe-utopia-100dpi-X11R7.0-1.0.1/missing new/font-adobe-utopia-100dpi-1.0.2/missing --- old/font-adobe-utopia-100dpi-X11R7.0-1.0.1/missing 2005-12-21 09:16:10.000000000 +0100 +++ new/font-adobe-utopia-100dpi-1.0.2/missing 2009-10-11 03:05:23.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-adobe-utopia-100dpi-X11R7.0-1.0.1.tar.bz2 -> font-adobe-utopia-75dpi-1.0.2.tar.bz2 ++++++ ++++ 546453 lines of diff (skipped) ++++++ font-adobe-utopia-type1-X11R7.0-1.0.1.tar.bz2 -> font-adobe-utopia-type1-1.0.2.tar.bz2 ++++++ ++++ 15381 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-adobe-utopia-type1-X11R7.0-1.0.1/ChangeLog new/font-adobe-utopia-type1-1.0.2/ChangeLog --- old/font-adobe-utopia-type1-X11R7.0-1.0.1/ChangeLog 2005-12-21 03:30:05.000000000 +0100 +++ new/font-adobe-utopia-type1-1.0.2/ChangeLog 2009-10-11 03:07:21.000000000 +0200 @@ -1,33 +1,151 @@ -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 102082d77597c6a3dbab49e1756b4bc2660a3e4a +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 16:51:51 2009 -0700 - * configure.ac: - Update package version for X11R7 release. + font-adobe-utopia-type1 1.0.2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-16 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit aeec349748ad517fe76fdb52314169690ba89378 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 20:35:11 2009 -0700 - * COPYING: - * README: - Copy README from X11R5 release, and update COPYING to reflect the - original license from Adobe. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 4adba732f81690a7d46ebdee9f6df39a82dccb17 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:25 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 16b4d6d5f9cc1dc1b8e8024915a082a532decb70 +Author: Ryan Hill <dirtyepic@gentoo.org> +Date: Sun Aug 16 14:10:11 2009 -0600 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + adobe-utopia-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 <dirtyepic@gentoo.org> + Signed-off-by: Rémi Cardona <remi@gentoo.org> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit d9dabaa1cb852c344047338d752edc28bbf80742 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Jul 8 10:41:19 2009 -0400 - * configure.ac: - Update package version number for X11R7 RC3 release. + adobe-utopia-type1: use XORG_CHANGELOG macro to create ChangeLog. #22611 + + Build break: Makefile.am: command not found: git-log + Adding the macro in configure.ac and use it in Makefile.am + Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 + Tested: running autogen.sh, make and 'make dist' + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit e35a64bf048721d063fe373cc1c5403cdf036960 +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> + +commit 32cf24feb7e6b594440c4ef24d2d2ed986de09a8 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:37:42 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 9270f7eaee161a132d36bb31a82cc2775b216baa +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:52:55 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 8a88cccb57386dbe9ece597ff4f17eb6eb42768c +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:10 2007 -0400 + + Rename .cvsignore to .gitignore + +commit a98920748f2089a4becfbe8ed7a8b14fd3928f4b +Author: Kevin E Martin <kem@kem.org> +Date: Wed Dec 21 02:30:05 2005 +0000 + + Update package version for X11R7 release. + +commit f85d1b26b0883a31b0c9222708cc86e9164fe6bb +Author: Kevin E Martin <kem@kem.org> +Date: Fri Dec 16 18:24:54 2005 +0000 + + Copy README from X11R5 release, and update COPYING to reflect the original + license from Adobe. + +commit 88600232c556226f1d61cb356022e75cf9a020fd +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:22 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 9399995f54a91bc24634a1b240bee3b9c9d20d41 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:50 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit 382791a635585fa5904da3f2053ff32c0c7fcb0e +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:37 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit f4ca3a0baff6fb85aa1b266adeab5cf6eeeec1f4 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:18 2005 +0000 + + Add .cvsignores for fonts. + +commit 21a76c1fec40e7ab651f17eb0db97c3bcbd0e445 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:13 2005 +0000 + + Add configure option to change the installed font dir. + +commit b11d786b28d8a3f8ce1f0f7ef47437822da47682 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:46 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 7b89f0932e9ac7f480742c54935628fb149a019d +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:05 2005 +0000 + + Initial build system files for font module + +commit a9aa7832823c861af0015fa1a025688de972994c +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit 6a0838ba37e462e7236c54d95f7868b3a48e3389 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:35 2003 +0000 + + R6.6 is the Xorg base-line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-adobe-utopia-type1-X11R7.0-1.0.1/Makefile.am new/font-adobe-utopia-type1-1.0.2/Makefile.am --- old/font-adobe-utopia-type1-X11R7.0-1.0.1/Makefile.am 2005-11-15 09:29:13.000000000 +0100 +++ new/font-adobe-utopia-type1-1.0.2/Makefile.am 2009-10-08 05:34:20.000000000 +0200 @@ -39,7 +39,17 @@ $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) - $(FCCACHE) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-adobe-utopia-type1-X11R7.0-1.0.1/README new/font-adobe-utopia-type1-1.0.2/README --- old/font-adobe-utopia-type1-X11R7.0-1.0.1/README 2005-12-16 19:24:54.000000000 +0100 +++ new/font-adobe-utopia-type1-1.0.2/README 2009-10-07 04:14:25.000000000 +0200 @@ -23,3 +23,27 @@ Adobe Systems Incorporated + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/adobe-utopia-type1 + + http://cgit.freedesktop.org/xorg/font/adobe-utopia-type1 + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-adobe-utopia-type1-X11R7.0-1.0.1/configure.ac new/font-adobe-utopia-type1-1.0.2/configure.ac --- old/font-adobe-utopia-type1-X11R7.0-1.0.1/configure.ac 2005-12-21 03:30:05.000000000 +0100 +++ new/font-adobe-utopia-type1-1.0.2/configure.ac 2009-10-11 01:44:30.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-adobe-utopia-type1, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-adobe-utopia-type1) +AC_INIT(font-adobe-utopia-type1, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-adobe-utopia-type1) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) -AC_PATH_PROG(FCCACHE, fc-cache) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/Type1 -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([Type1]) +XORG_FONT_SCALED_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-adobe-utopia-type1-X11R7.0-1.0.1/missing new/font-adobe-utopia-type1-1.0.2/missing --- old/font-adobe-utopia-type1-X11R7.0-1.0.1/missing 2005-12-21 09:16:31.000000000 +0100 +++ new/font-adobe-utopia-type1-1.0.2/missing 2009-10-11 03:07:14.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-alias-X11R7.0-1.0.1.tar.bz2 -> font-alias-1.0.2.tar.bz2 ++++++ ++++ 17116 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-alias-X11R7.0-1.0.1/100dpi/Makefile.am new/font-alias-1.0.2/100dpi/Makefile.am --- old/font-alias-X11R7.0-1.0.1/100dpi/Makefile.am 2005-12-09 21:11:25.000000000 +0100 +++ new/font-alias-1.0.2/100dpi/Makefile.am 2009-10-07 22:41:53.000000000 +0200 @@ -19,7 +19,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -aliasdir = @TOPFONTDIR@/100dpi +aliasdir = @FONTROOTDIR@/100dpi alias_DATA = fonts.alias EXTRA_DIST = $(alias_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-alias-X11R7.0-1.0.1/75dpi/Makefile.am new/font-alias-1.0.2/75dpi/Makefile.am --- old/font-alias-X11R7.0-1.0.1/75dpi/Makefile.am 2005-12-09 21:11:25.000000000 +0100 +++ new/font-alias-1.0.2/75dpi/Makefile.am 2009-10-07 22:41:53.000000000 +0200 @@ -19,7 +19,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -aliasdir = @TOPFONTDIR@/75dpi +aliasdir = @FONTROOTDIR@/75dpi alias_DATA = fonts.alias EXTRA_DIST = $(alias_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-alias-X11R7.0-1.0.1/ChangeLog new/font-alias-1.0.2/ChangeLog --- old/font-alias-X11R7.0-1.0.1/ChangeLog 2005-12-21 03:30:05.000000000 +0100 +++ new/font-alias-1.0.2/ChangeLog 2009-10-11 03:07:49.000000000 +0200 @@ -1,27 +1,157 @@ -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 0b43084d10596794a23760b4e43fce6f0cf58f58 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 16:53:57 2009 -0700 - * configure.ac: - Update package version for X11R7 release. + font-alias 1.0.2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit a3f949590e752adc43a22c86f02d24ac02c597ba +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 14:20:13 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-09 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 70faca34b52a6b53b746e34c1f06bc4358266204 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:25 2009 -0700 - * 100dpi/Makefile.am: - * 75dpi/Makefile.am: - * configure.ac: - * cyrillic/Makefile.am: - * misc/Makefile.am: - Bug #5293: Use --with-top-fontdir instead of --with-aliasdir. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-09 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 6912df83bc761a6ecd902d03883bffd536a41416 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:06 2009 -0200 - * 100dpi/Makefile.am: - * 75dpi/Makefile.am: - * configure.ac: - * cyrillic/Makefile.am: - * misc/Makefile.am: - Bug #5293: Make aliasdir configurable (Donnie Berkholz). + Janitor: Correct make distcheck and configure.ac simplification + +commit e3321d06ca1772a79a9ea947711fbabaa6b690ab +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:10:57 2009 -0200 + + Janitor: Correct make distcheck and configure.ac simplification + +commit 6a059e8b817333e738317f3a148e24fa1d61f6ae +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:37:42 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 1223e5a4b5f0f7f1f5ed9ca4ec656a0f61fe3c30 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:52:57 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit e7e161150c83f1d273707e4d840b632c99b8fc26 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:12 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 45dc59e6d2162d8fa81901e49740181fa13f7648 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Dec 21 02:30:05 2005 +0000 + + Update package version for X11R7 release. + +commit ae366e7094154d17990c6d80d2f131c27835bda4 +Author: Adam Jackson <ajax@nwnk.net> +Date: Mon Dec 19 16:26:49 2005 +0000 + + Stub COPYING files + +commit 05ef0e2ad65985e5c45c61e1740e2fc41213ee36 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:22 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 97350d6338fd9f14a5fbe15d77701aa39b868741 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Dec 9 20:11:25 2005 +0000 + + Bug #5293: Use --with-top-fontdir instead of --with-aliasdir. + +commit c16cca19ed1fed6541c63d8e59830caf88facb88 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Dec 9 05:31:36 2005 +0000 + + Bug #5293: Make aliasdir configurable (Donnie Berkholz). + +commit cc0188ab131000dd893f165153efbc81d7bb936f +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:19 2005 +0000 + + Add .cvsignores for fonts. + +commit 655a0d27c1503f00fabe644df558c23f85a8bac7 +Author: Kevin E Martin <kem@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 7188b27551b11a11e797b1093fe02d968ee4890d +Author: Kevin E Martin <kem@kem.org> +Date: Tue Jul 12 04:23:08 2005 +0000 + + Add build system for font.alias files + +commit 1b2fef911e2eca971c6f8a9cd23403b4d40feeef +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 18:43:01 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit d2b134646d3d0dc15e38f874997ececb4a9edecc +Author: Egbert Eich <eich@suse.de> +Date: Sun Mar 14 08:31:08 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit c60589ba6eadb3f2b5ec67f96afb56d319f69d66 +Author: Egbert Eich <eich@suse.de> +Date: Wed Mar 3 12:10:49 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit d8a444f96cc8077eacaf5b4a9f4df4dbad4f9d02 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:35:10 2004 +0000 + + readding XFree86's cvs IDs + +commit 79f46f23e9ca4e1e40881c0858c8da4f4c78e2ca +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 09:22:20 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit e9230055b9a0674dd8d7a479abee1106c65508a1 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit 4cd3412a2d8778a74a6567bcbe49c45f20183770 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:41 2003 +0000 + + Initial revision + +commit 806fa2721e3e289455295a03197e699fa2514bfd +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:34 2003 +0000 + + R6.6 is the Xorg base-line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-alias-X11R7.0-1.0.1/Makefile.am new/font-alias-1.0.2/Makefile.am --- old/font-alias-X11R7.0-1.0.1/Makefile.am 2005-07-12 06:23:08.000000000 +0200 +++ new/font-alias-1.0.2/Makefile.am 2009-01-28 03:24:43.000000000 +0100 @@ -21,4 +21,12 @@ SUBDIRS = 100dpi 75dpi cyrillic misc -EXTRA_DIST = autogen.sh +EXTRA_DIST = ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-alias-X11R7.0-1.0.1/README new/font-alias-1.0.2/README --- old/font-alias-X11R7.0-1.0.1/README 2005-07-12 06:23:08.000000000 +0200 +++ new/font-alias-1.0.2/README 2009-10-07 04:14:25.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/alias + + http://cgit.freedesktop.org/xorg/font/alias + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-alias-X11R7.0-1.0.1/autogen.sh new/font-alias-1.0.2/autogen.sh --- old/font-alias-X11R7.0-1.0.1/autogen.sh 2005-07-12 06:23:08.000000000 +0200 +++ new/font-alias-1.0.2/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-alias-X11R7.0-1.0.1/configure.ac new/font-alias-1.0.2/configure.ac --- old/font-alias-X11R7.0-1.0.1/configure.ac 2005-12-21 03:30:05.000000000 +0100 +++ new/font-alias-1.0.2/configure.ac 2009-10-11 01:44:30.000000000 +0200 @@ -22,22 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-alias, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-alias) +AC_INIT(font-alias, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-alias) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) +XORG_FONTROOTDIR -DEFAULT_TOPFONTDIR=${libdir}/X11/fonts -AC_ARG_WITH(top-fontdir, - AS_HELP_STRING([--with-top-fontdir=<path>], [Path to top level font directory]), - [TOPFONTDIR="$withval"], - [TOPFONTDIR="$DEFAULT_TOPFONTDIR"]) -AC_SUBST(TOPFONTDIR) +AC_ARG_WITH(top-fontdir, AC_HELP_STRING([--with-top-fontdir=<pathname>], + [Obsolete: use --with-fontrootdir instead]), + [AC_MSG_ERROR([--with-top-fontdir is obsolete, use --with-fontrootdir instead])]) -XORG_RELEASE_VERSION AC_OUTPUT([Makefile 100dpi/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-alias-X11R7.0-1.0.1/cyrillic/Makefile.am new/font-alias-1.0.2/cyrillic/Makefile.am --- old/font-alias-X11R7.0-1.0.1/cyrillic/Makefile.am 2005-12-09 21:11:25.000000000 +0100 +++ new/font-alias-1.0.2/cyrillic/Makefile.am 2009-10-07 22:41:53.000000000 +0200 @@ -19,7 +19,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -aliasdir = @TOPFONTDIR@/cyrillic +aliasdir = @FONTROOTDIR@/cyrillic alias_DATA = fonts.alias EXTRA_DIST = $(alias_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-alias-X11R7.0-1.0.1/misc/Makefile.am new/font-alias-1.0.2/misc/Makefile.am --- old/font-alias-X11R7.0-1.0.1/misc/Makefile.am 2005-12-09 21:11:25.000000000 +0100 +++ new/font-alias-1.0.2/misc/Makefile.am 2009-10-07 22:41:53.000000000 +0200 @@ -19,7 +19,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -aliasdir = @TOPFONTDIR@/misc +aliasdir = @FONTROOTDIR@/misc alias_DATA = fonts.alias EXTRA_DIST = $(alias_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-alias-X11R7.0-1.0.1/missing new/font-alias-1.0.2/missing --- old/font-alias-X11R7.0-1.0.1/missing 2005-12-21 09:21:14.000000000 +0100 +++ new/font-alias-1.0.2/missing 2009-10-11 03:07:40.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-arabic-misc-X11R7.0-1.0.0.tar.bz2 -> font-arabic-misc-1.0.1.tar.bz2 ++++++ ++++ 15571 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-arabic-misc-X11R7.0-1.0.0/ChangeLog new/font-arabic-misc-1.0.1/ChangeLog --- old/font-arabic-misc-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:22.000000000 +0100 +++ new/font-arabic-misc-1.0.1/ChangeLog 2009-10-11 03:08:21.000000000 +0200 @@ -1,26 +1,147 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 2760129e0e6382fdc101d5278ef191d1445f58ed +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 16:56:40 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-arabic-misc 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 0bf9a21166911734c77e662b6bd8a47130175d24 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 14:23:39 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit d380bac3aea91afd34bef9fbc1ea224992321d92 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:15:31 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit 47675aa3d47cc42d6de4819e1db5d3769aa0ecff +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:06 2009 -0200 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Janitor: Correct make distcheck and configure.ac simplification -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 02efa2ad8b1440624ebf88e45186a230987855a8 +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> + +commit 7889493105db9f2d2768a03978ce9a543b309885 +Author: David Nusinow <dnusinow@debian.org> +Date: Thu Feb 28 20:24:19 2008 -0500 + + Remove missing README from EXTRA_DIST (bug #14642) + +commit bdecda3a11328fd3fb8ea92cdd674bc5fe32c2e9 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:37:42 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 7e2a2d1a9c3841c0a8a930bd8fc45543c480aeee +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:52:58 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit dc08565dde2381554c32586f8ebd46575da849ca +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:13 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 652620bcfe6504e2be65f74555bc9d39ab6ae64a +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:22 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit a244c50cd9bc13aaf2d1e9a9f6ddb0cc34b6e473 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:50 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit 093b0c688dd7fdd36bd0e15251d095399afb6f18 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:38 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 344080b297ddf430d94606b23efae8843a1c99cb +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:14 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit 29b89ea573dc0706ede0d555893eaf52c2016b19 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:19 2005 +0000 + + Add .cvsignores for fonts. + +commit eeb5fe0ad5aa6b895b82789073c00bd8999796f5 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:16 2005 +0000 + + Add configure option to change the installed font dir. + +commit 1021c8891942484fa9b69aeb655c3cde67457711 +Author: Kevin E Martin <kem@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 cda281021d5295613a0b7f2411c880b1896d81fd +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:05 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit 171269bd1aa24634cb397e787495c96308bd981b +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Date: Wed Jul 6 19:26:27 2005 +0000 + + - Xaw/xaw.m4: Change help string to say "enable xprint" instead of "disable + xprint" + - symlink.sh: Rename Bitmap-co.ad to Bitmap-color.ad. Add bitmaps for the + bitmap application. Add xdbedizzy.sgml. + - xc/programs/xdbedizzy/: Conditionalize use of xprint + - remove font/arabic-misc/README and font/mutt-misc/README + +commit 7aca251d0b4b9db155669785d0316eef5ea67741 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Jul 2 23:41:00 2005 +0000 + + Add build system for arabic24 and ClearlyU fonts + +commit f24f2f212b935ffbe09cbd293105044f6f95a4cd +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:24 2003 +0000 + + XFree86 4.3.0.1 + +commit f2a0b923da07ff5859052d4065bbeca2268708d1 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:24 2003 +0000 + + Initial revision diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-arabic-misc-X11R7.0-1.0.0/Makefile.am new/font-arabic-misc-1.0.1/Makefile.am --- old/font-arabic-misc-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:14.000000000 +0100 +++ new/font-arabic-misc-1.0.1/Makefile.am 2009-10-07 23:22:42.000000000 +0200 @@ -22,25 +22,34 @@ FONT_FILES = arabic24 BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) -SUFFIXES = .bdf .pcf.gz +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) CLEANFILES = $(font_DATA) -EXTRA_DIST = $(BDF_FILES) autogen.sh README uniarab.txt +EXTRA_DIST = $(BDF_FILES) uniarab.txt install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-arabic-misc-X11R7.0-1.0.0/README new/font-arabic-misc-1.0.1/README --- old/font-arabic-misc-X11R7.0-1.0.0/README 2003-11-14 17:48:24.000000000 +0100 +++ new/font-arabic-misc-1.0.1/README 2009-10-07 04:14:25.000000000 +0200 @@ -1,72 +1,24 @@ -# -# From: Id: README,v 1.2 1999/05/03 14:21:32 mleisher Exp $ -# -# Copyright 1996, 1997, 1998, 1999 Computing Research Labs, -# New Mexico State University -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY -# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT -# OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -# THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# - -This is a 100dpi, 24 point (approximately) font that is meant to act as -an example of what glyphs are needed to minimally support (almost) all -of the Arabic characters available in Unicode. - -The encoding of this font is the encoding of Arabic from Unicode 2.0 -with the addition of some contextual forms and some other convenient -glyphs that do not exist in Unicode. An additional file, "uniarab.txt", -has been provided to describe the encoding of the extra contextual -glyphs. - -Version: 1.3 - -CHANGES FROM 1.2 ----------------- - o Changed CHARSET_REGISTRY to be ISO10646. - -CHANGES FROM 1.1 ----------------- - - o Added FBE8 and FBE9 which are Uighur/Kazakh/Kirghiz positional variants - of ALEF MAKSURA. - -CHANGES FROM 1.0 ----------------- - - o Added the following missing glyph: - - E6B2 ARABIC LETTER U WITH HAMZA ABOVE FINAL FORM - - o Added the following glyphs for applications generating text for Omega: - - E6D0 ARABIC LIGATURE LAM SMALL V WITH ALEF ISOLATED FORM - E6D1 ARABIC LIGATURE LAM SMALL V WITH ALEF ISOLATED FORM - E6D2 ARABIC LIGATURE LAM DOT ABOVE WITH ALEF ISOLATED FORM - E6D3 ARABIC LIGATURE LAM DOT ABOVE WITH ALEF FINAL FORM - E6D4 ARABIC LIGATURE LAM THREE DOTS ABOVE WITH ALEF ISOLATED FORM - E6D5 ARABIC LIGATURE LAM THREE DOTS ABOVE WITH ALEF FINAL FORM - - o Added the following glyph simply for convenience: - E6F4 EXTENDED URDU-INDIC DIGIT FOUR +All questions regarding this software should be directed at the +Xorg mailing list: - o Cleaned up and improved a number of glyphs, particularly some - Persian and Urdu glyphs. + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/arabic-misc + + http://cgit.freedesktop.org/xorg/font/arabic-misc + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage -08 February 1999 -mleisher@crl.nmsu.edu (Mark Leisher) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-arabic-misc-X11R7.0-1.0.0/autogen.sh new/font-arabic-misc-1.0.1/autogen.sh --- old/font-arabic-misc-X11R7.0-1.0.0/autogen.sh 2005-07-03 01:41:00.000000000 +0200 +++ new/font-arabic-misc-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-arabic-misc-X11R7.0-1.0.0/configure.ac new/font-arabic-misc-1.0.1/configure.ac --- old/font-arabic-misc-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:22.000000000 +0100 +++ new/font-arabic-misc-1.0.1/configure.ac 2009-10-11 01:44:30.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-arabic-misc, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-arabic-misc) +AC_INIT(font-arabic-misc, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-arabic-misc) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/misc -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([misc]) +XORG_FONT_BDF_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-arabic-misc-X11R7.0-1.0.0/missing new/font-arabic-misc-1.0.1/missing --- old/font-arabic-misc-X11R7.0-1.0.0/missing 2005-12-21 09:16:39.000000000 +0100 +++ new/font-arabic-misc-1.0.1/missing 2009-10-11 03:08:14.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-bh-100dpi-X11R7.0-1.0.0.tar.bz2 -> font-bh-100dpi-1.0.1.tar.bz2 ++++++ ++++ 16651 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-100dpi-X11R7.0-1.0.0/ChangeLog new/font-bh-100dpi-1.0.1/ChangeLog --- old/font-bh-100dpi-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:22.000000000 +0100 +++ new/font-bh-100dpi-1.0.1/ChangeLog 2009-10-11 03:08:50.000000000 +0200 @@ -1,33 +1,158 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 08205771a091b2c4e5eccbba2306c246550e7466 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:08:39 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-bh-100dpi 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit cb24bb485112fe9fe72fa5bca34551fb98aa9946 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 14:28:46 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit fb40c3f3dff23d21aa5e3a00ea1cbe1aa6b3a212 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:25 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit d3ba51fda868ec7906b91946f2ae7ae380d307a9 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:07 2009 -0200 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Janitor: Correct make distcheck and configure.ac simplification -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit cc5aaaeeab3712d69a76f7ff4fac07573b980f33 +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure options to change the installed font dir and - disable ISO8859-* fonts. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 2d80ce6bb4d4a4c8ff12d500d43552be2a443f46 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:37:44 2007 -0500 - * configure.ac: - Update package version number for RC1 release. + Replace static ChangeLog with dist-hook to generate from git log +commit d423a71baee36fe38eef3c90b6235c9f0cdea0a8 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:52:58 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit c2bed1ae605fe3cc9142227719c5ed8759d6e4cb +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:15 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 7e6a96accc007925c497b92d835251f472d1d57f +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:22 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit a54835c0407d4895b8fe3fadb93992c0cbc69ce0 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:51 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit ca92bb77642703f89d10197315d71cc961fec6d7 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:38 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 81e6bd74a848a3bc61da00f62a9cc0325edb6b26 +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:14 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit c0152a49bd057f2d05d5794de7ddd806cef38f61 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:19 2005 +0000 + + Add .cvsignores for fonts. + +commit 2fe219375e33159f8a63ddc33804340dea98de37 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:26:46 2005 +0000 + + Add configure options to change the installed font dir and disable + ISO8859-* fonts. + +commit f9fb39ee28452ee6394405c364facd8877a9ec49 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:48:07 2005 +0000 + + Update package version number for RC1 release. + +commit f45369029f1661713df3d62eaa72f6fb6dd76f4a +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Sun Oct 2 18:19:53 2005 +0000 + + Add explicit all-local targets so Solaris make can build, since it won't + recursively follow the implicit targets (.bdf -> -ISO-8859-1.bdf -> + pcf.gz) + Fix a couple of remaining GNU-make-isms + +commit d57a6977f125eb099643436aa2bdac36d4f876a7 +Author: Kevin E Martin <kem@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 748393b41a69b3cf92aec4242c39b995ea4f4654 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 22 04:13:44 2005 +0000 + + Fix distcheck for fonts with multiple encodings + +commit aced160f00d2dc8e65dbfba25eb8b77d792e8f41 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:05 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit fffd7da29056fb1d92495f2de1bdbc75326877dc +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:05 2005 +0000 + + Initial build system files for font module + +commit 7f672519785ba58ebdb78c6938a120d5c2ce2a12 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Tue Nov 25 19:27:33 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit a9957d9849ab22d15975e04467efa2ba4e0937d9 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:34 2003 +0000 + + XFree86 4.3.0.1 + +commit a755e59b90300c94b4b0e09668e2a7e2daf1e7f5 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:33 2003 +0000 + + R6.6 is the Xorg base-line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-100dpi-X11R7.0-1.0.0/Makefile.am new/font-bh-100dpi-1.0.1/Makefile.am --- old/font-bh-100dpi-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:14.000000000 +0100 +++ new/font-bh-100dpi-1.0.1/Makefile.am 2009-10-07 23:25:05.000000000 +0200 @@ -79,56 +79,56 @@ FONT_FILES = $(BDF2UCS_FONT_FILES) BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) if ISO8859_1 ISO8859_1_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.bdf) -ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.pcf.gz) +ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_2 ISO8859_2_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.bdf) -ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.pcf.gz) +ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_3 ISO8859_3_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.bdf) -ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.pcf.gz) +ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_4 ISO8859_4_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.bdf) -ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.pcf.gz) +ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_9 ISO8859_9_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.bdf) -ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.pcf.gz) +ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_10 ISO8859_10_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.bdf) -ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.pcf.gz) +ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_13 ISO8859_13_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.bdf) -ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.pcf.gz) +ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_14 ISO8859_14_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.bdf) -ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.pcf.gz) +ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_15 ISO8859_15_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.bdf) -ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.pcf.gz) +ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.pcf$(COMPRESS_SUFFIX)) endif UTIL_DIR = @MAPFILES_PATH@ -SUFFIXES = .bdf .pcf.gz \ +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) \ -ISO8859-1.bdf \ -ISO8859-2.bdf \ -ISO8859-3.bdf \ @@ -139,45 +139,45 @@ -ISO8859-14.bdf \ -ISO8859-15.bdf -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ .bdf-ISO8859-1.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-1 ISO8859-1 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-1 ISO8859-1 .bdf-ISO8859-2.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-2 ISO8859-2 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-2 ISO8859-2 .bdf-ISO8859-3.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-3 ISO8859-3 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-3 ISO8859-3 .bdf-ISO8859-4.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-4 ISO8859-4 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-4 ISO8859-4 .bdf-ISO8859-9.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-9 ISO8859-9 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-9 ISO8859-9 .bdf-ISO8859-10.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-10 ISO8859-10 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-10 ISO8859-10 .bdf-ISO8859-13.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-13 ISO8859-13 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-13 ISO8859-13 .bdf-ISO8859-14.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-14 ISO8859-14 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-14 ISO8859-14 .bdf-ISO8859-15.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-15 ISO8859-15 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-15 ISO8859-15 fontdir = @FONTDIR@ font_DATA = \ @@ -203,15 +203,24 @@ $(ISO8859_15_BDF_FILES) CLEANFILES = $(font_DATA) $(BUILT_BDF_FILES) -EXTRA_DIST = $(BDF_FILES) LU_LEGALNOTICE autogen.sh +EXTRA_DIST = $(BDF_FILES) LU_LEGALNOTICE all-local: $(BUILT_BDF_FILES) $(font_DATA) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-100dpi-X11R7.0-1.0.0/README new/font-bh-100dpi-1.0.1/README --- old/font-bh-100dpi-X11R7.0-1.0.0/README 2005-07-01 00:28:05.000000000 +0200 +++ new/font-bh-100dpi-1.0.1/README 2009-10-07 04:14:25.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/bh-100dpi + + http://cgit.freedesktop.org/xorg/font/bh-100dpi + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-100dpi-X11R7.0-1.0.0/autogen.sh new/font-bh-100dpi-1.0.1/autogen.sh --- old/font-bh-100dpi-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:05.000000000 +0200 +++ new/font-bh-100dpi-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-100dpi-X11R7.0-1.0.0/configure.ac new/font-bh-100dpi-1.0.1/configure.ac --- old/font-bh-100dpi-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:22.000000000 +0100 +++ new/font-bh-100dpi-1.0.1/configure.ac 2009-10-11 01:44:30.000000000 +0200 @@ -22,40 +22,29 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-bh-100dpi, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bh-100dpi) +AC_INIT(font-bh-100dpi, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bh-100dpi) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AC_PROG_INSTALL +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(UCS2ANY, ucs2any) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/100dpi -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) - -PKG_CHECK_MODULES(MAPS, [fontutil]) -MAPFILES_PATH=$(pkg-config --variable=mapdir fontutil) -AC_SUBST(MAPFILES_PATH) - -XORG_FONT_CHECK_ISO8859_1 -XORG_FONT_CHECK_ISO8859_2 -XORG_FONT_CHECK_ISO8859_3 -XORG_FONT_CHECK_ISO8859_4 -XORG_FONT_CHECK_ISO8859_9 -XORG_FONT_CHECK_ISO8859_10 -XORG_FONT_CHECK_ISO8859_13 -XORG_FONT_CHECK_ISO8859_14 -XORG_FONT_CHECK_ISO8859_15 +AC_PROG_INSTALL -XORG_RELEASE_VERSION +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) + +XORG_FONTDIR([100dpi]) +XORG_FONT_BDF_UTILS +XORG_FONT_UCS2ANY + +XORG_FONT_CHECK_ENCODING_LIST([ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 + ISO8859-9 ISO8859-10 ISO8859-13 ISO8859-14 + ISO8859-15]) AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-100dpi-X11R7.0-1.0.0/missing new/font-bh-100dpi-1.0.1/missing --- old/font-bh-100dpi-X11R7.0-1.0.0/missing 2005-12-21 09:16:46.000000000 +0100 +++ new/font-bh-100dpi-1.0.1/missing 2009-10-11 03:08:43.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-bh-100dpi-X11R7.0-1.0.0.tar.bz2 -> font-bh-75dpi-1.0.1.tar.bz2 ++++++ ++++ 1479979 lines of diff (skipped) ++++++ font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0.tar.bz2 -> font-bh-lucidatypewriter-100dpi-1.0.1.tar.bz2 ++++++ ++++ 16652 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0/ChangeLog new/font-bh-lucidatypewriter-100dpi-1.0.1/ChangeLog --- old/font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:22.000000000 +0100 +++ new/font-bh-lucidatypewriter-100dpi-1.0.1/ChangeLog 2009-10-11 03:12:37.000000000 +0200 @@ -1,33 +1,158 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit b91d06ab1d93f3a61eebac347d87287ba506a408 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:11:32 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-bh-lucidatypewriter-100dpi 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit de559c60c470997cf87939b3fde686383fbc72de +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 20:35:36 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit ca4b53c613080c2eb1ad143b8d8577f471a09d17 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:26 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit 8b3bdeb793187e2251b6691c41be9f9738384106 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:07 2009 -0200 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Janitor: Correct make distcheck and configure.ac simplification -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 0d475f0752cd24a5edddd4e1c51c37eeefb640e8 +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure options to change the installed font dir and - disable ISO8859-* fonts. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 53aac56eae52490ee25a6cbc2e08bf64c2a3cfd7 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:37:46 2007 -0500 - * configure.ac: - Update package version number for RC1 release. + Replace static ChangeLog with dist-hook to generate from git log +commit 829e4670cf4a5670a6dd77d5704a17914f1726af +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:00 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 91f52dd10ba02cf009948ec87f0e048d56d269eb +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:18 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 6e6b6103848fb5020b4332821fb6208f24b2a6dd +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:22 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit bdc4a3055e641480db05054e9e80c505f4d3b5e0 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:51 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit 2db1e24e3da4c087b1938b30ff52de15f59d2090 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:38 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit a38d7f8fadb3f6ace84ded2726c29b0a89af789b +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:14 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit b7eea6e4d7e4fe0074d9154825b3d9e5b390f2a5 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:19 2005 +0000 + + Add .cvsignores for fonts. + +commit bf16c5de904976e96bfe278b32570947c41a9c1d +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:26:47 2005 +0000 + + Add configure options to change the installed font dir and disable + ISO8859-* fonts. + +commit e2c6cdcb061bbd1486106856f7e61ee5a33b94ab +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:48:07 2005 +0000 + + Update package version number for RC1 release. + +commit 0dfd428e536a9611e43beec6b47839c3ac4376ae +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Sun Oct 2 18:19:53 2005 +0000 + + Add explicit all-local targets so Solaris make can build, since it won't + recursively follow the implicit targets (.bdf -> -ISO-8859-1.bdf -> + pcf.gz) + Fix a couple of remaining GNU-make-isms + +commit 1c47b8e973839de3441eca218e1f7ad13274d825 +Author: Kevin E Martin <kem@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 0091651b29f8c64b15c3809230f49448646b8985 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 22 04:13:44 2005 +0000 + + Fix distcheck for fonts with multiple encodings + +commit d2ebfde7153d91832671cce6abe640597ab0680a +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:05 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit 422b1616752fa1a1f979546e01cae11fbc5e4fef +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:06 2005 +0000 + + Initial build system files for font module + +commit 562c978b25c499d023867ec2bce08f119f81b0a2 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Tue Nov 25 19:27:36 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 4b167157376d6cdd9254f4c0d0d761a9ec517f80 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:34 2003 +0000 + + XFree86 4.3.0.1 + +commit 48d80c682d9fe723882f981dcb2fc3b8d77f569f +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:33 2003 +0000 + + R6.6 is the Xorg base-line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0/Makefile.am new/font-bh-lucidatypewriter-100dpi-1.0.1/Makefile.am --- old/font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:14.000000000 +0100 +++ new/font-bh-lucidatypewriter-100dpi-1.0.1/Makefile.am 2009-10-07 23:32:06.000000000 +0200 @@ -37,56 +37,56 @@ FONT_FILES = $(BDF2UCS_FONT_FILES) BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) if ISO8859_1 ISO8859_1_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.bdf) -ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.pcf.gz) +ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_2 ISO8859_2_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.bdf) -ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.pcf.gz) +ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_3 ISO8859_3_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.bdf) -ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.pcf.gz) +ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_4 ISO8859_4_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.bdf) -ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.pcf.gz) +ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_9 ISO8859_9_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.bdf) -ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.pcf.gz) +ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_10 ISO8859_10_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.bdf) -ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.pcf.gz) +ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_13 ISO8859_13_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.bdf) -ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.pcf.gz) +ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_14 ISO8859_14_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.bdf) -ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.pcf.gz) +ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_15 ISO8859_15_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.bdf) -ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.pcf.gz) +ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.pcf$(COMPRESS_SUFFIX)) endif UTIL_DIR = @MAPFILES_PATH@ -SUFFIXES = .bdf .pcf.gz \ +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) \ -ISO8859-1.bdf \ -ISO8859-2.bdf \ -ISO8859-3.bdf \ @@ -97,45 +97,45 @@ -ISO8859-14.bdf \ -ISO8859-15.bdf -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ .bdf-ISO8859-1.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-1 ISO8859-1 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-1 ISO8859-1 .bdf-ISO8859-2.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-2 ISO8859-2 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-2 ISO8859-2 .bdf-ISO8859-3.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-3 ISO8859-3 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-3 ISO8859-3 .bdf-ISO8859-4.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-4 ISO8859-4 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-4 ISO8859-4 .bdf-ISO8859-9.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-9 ISO8859-9 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-9 ISO8859-9 .bdf-ISO8859-10.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-10 ISO8859-10 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-10 ISO8859-10 .bdf-ISO8859-13.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-13 ISO8859-13 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-13 ISO8859-13 .bdf-ISO8859-14.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-14 ISO8859-14 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-14 ISO8859-14 .bdf-ISO8859-15.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-15 ISO8859-15 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-15 ISO8859-15 fontdir = @FONTDIR@ font_DATA = \ @@ -161,15 +161,24 @@ $(ISO8859_15_BDF_FILES) CLEANFILES = $(font_DATA) $(BUILT_BDF_FILES) -EXTRA_DIST = $(BDF_FILES) autogen.sh +EXTRA_DIST = $(BDF_FILES) all-local: $(BUILT_BDF_FILES) $(font_DATA) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0/README new/font-bh-lucidatypewriter-100dpi-1.0.1/README --- old/font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0/README 2005-07-01 00:28:06.000000000 +0200 +++ new/font-bh-lucidatypewriter-100dpi-1.0.1/README 2009-10-07 04:14:26.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/bh-lucidatypewriter-100dpi + + http://cgit.freedesktop.org/xorg/font/bh-lucidatypewriter-100dpi + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0/autogen.sh new/font-bh-lucidatypewriter-100dpi-1.0.1/autogen.sh --- old/font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:06.000000000 +0200 +++ new/font-bh-lucidatypewriter-100dpi-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0/configure.ac new/font-bh-lucidatypewriter-100dpi-1.0.1/configure.ac --- old/font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:22.000000000 +0100 +++ new/font-bh-lucidatypewriter-100dpi-1.0.1/configure.ac 2009-10-11 01:44:30.000000000 +0200 @@ -22,40 +22,29 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-bh-lucidatypewriter-100dpi, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bh-lucidatypewriter-100dpi) +AC_INIT(font-bh-lucidatypewriter-100dpi, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bh-lucidatypewriter-100dpi) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AC_PROG_INSTALL +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(UCS2ANY, ucs2any) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/100dpi -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) - -PKG_CHECK_MODULES(MAPS, [fontutil]) -MAPFILES_PATH=$(pkg-config --variable=mapdir fontutil) -AC_SUBST(MAPFILES_PATH) - -XORG_FONT_CHECK_ISO8859_1 -XORG_FONT_CHECK_ISO8859_2 -XORG_FONT_CHECK_ISO8859_3 -XORG_FONT_CHECK_ISO8859_4 -XORG_FONT_CHECK_ISO8859_9 -XORG_FONT_CHECK_ISO8859_10 -XORG_FONT_CHECK_ISO8859_13 -XORG_FONT_CHECK_ISO8859_14 -XORG_FONT_CHECK_ISO8859_15 +AC_PROG_INSTALL -XORG_RELEASE_VERSION +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) + +XORG_FONTDIR([100dpi]) +XORG_FONT_BDF_UTILS +XORG_FONT_UCS2ANY + +XORG_FONT_CHECK_ENCODING_LIST([ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 + ISO8859-9 ISO8859-10 ISO8859-13 ISO8859-14 + ISO8859-15]) AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0/missing new/font-bh-lucidatypewriter-100dpi-1.0.1/missing --- old/font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0/missing 2005-12-21 09:17:18.000000000 +0100 +++ new/font-bh-lucidatypewriter-100dpi-1.0.1/missing 2009-10-11 03:12:30.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-bh-lucidatypewriter-100dpi-X11R7.0-1.0.0.tar.bz2 -> font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2 ++++++ ++++ 449991 lines of diff (skipped) ++++++ font-bh-ttf-X11R7.0-1.0.0.tar.bz2 -> font-bh-ttf-1.0.1.tar.bz2 ++++++ ++++ 15372 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-ttf-X11R7.0-1.0.0/ChangeLog new/font-bh-ttf-1.0.1/ChangeLog --- old/font-bh-ttf-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:23.000000000 +0100 +++ new/font-bh-ttf-1.0.1/ChangeLog 2009-10-11 03:14:26.000000000 +0200 @@ -1,21 +1,130 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 195d8a6841730c3ca8d30936f0e7151d21894f6d +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:54:58 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-bh-ttf 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 04def8129edca8e7e9005690e608a77d995005b6 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Mon Oct 5 19:41:20 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit cd2c3164a0da65cadcc55f02c23161f9a15beb66 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:26 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit fc50baa2f533586e442a366fd072369d450fe2bb +Author: Ryan Hill <dirtyepic@gentoo.org> +Date: Sun Aug 16 14:38:19 2009 -0600 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + bh-ttf: 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 <dirtyepic@gentoo.org> + Signed-off-by: Rémi Cardona <remi@gentoo.org> + +commit 6225ea97ec6c354164a2437e08f1c9d6a21886b8 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:07 2009 -0200 + + Janitor: Correct make distcheck and configure.ac simplification + +commit b2da25346f5fa9ef6f7f3829cf3ee4f1fc607b43 +Author: Andres Salomon <dilinger@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 <jcristau@debian.org> + +commit ff992ba2f5de0ff419f5ab0610feda5ec4a7289d +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:37:47 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit be1cb23a76afd9fd8420b948b5825518174f6759 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:02 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 9e51a0a6370c3a0627fa29e11b8d97b32507f5e5 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:21 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 446d89fc26208f81b0fde439e635879f718cb2f8 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:23 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 9d7064887dbeacb3cca569444e4e5125d71aa0f4 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:51 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit 865237158ef97d03eadfeeca788b71bfe9552a4c +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:38 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit ddca6714c4ed21cbaafa327737d91a4eb28ecab9 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:19 2005 +0000 + + Add .cvsignores for fonts. + +commit cac47c41bba50c0b406c0142cb63ad42e2b64b81 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:16 2005 +0000 + + Add configure option to change the installed font dir. + +commit f42d82a2b60d4d78e1e1668900afc09a91d804ac +Author: Kevin E Martin <kem@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 c715d6873588b9de1db9a0f3c941bda3888a9393 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:06 2005 +0000 + + Initial build system files for font module + +commit 425ba2e686ed734b0581044d45a18fbe1c068f6a +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit 9c265bd972ba1b92e0ce03f4bb5febefe7cbaae7 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + Initial revision diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-ttf-X11R7.0-1.0.0/Makefile.am new/font-bh-ttf-1.0.1/Makefile.am --- old/font-bh-ttf-X11R7.0-1.0.0/Makefile.am 2005-11-15 09:29:16.000000000 +0100 +++ new/font-bh-ttf-1.0.1/Makefile.am 2009-10-07 23:50:05.000000000 +0200 @@ -36,14 +36,24 @@ fontdir = @FONTDIR@ font_DATA = $(FONT_FILES) -EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH autogen.sh +EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH install-data-hook: @rm -f $(DESTDIR)$(fontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) - $(FCCACHE) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-ttf-X11R7.0-1.0.0/README new/font-bh-ttf-1.0.1/README --- old/font-bh-ttf-X11R7.0-1.0.0/README 2005-07-01 00:28:06.000000000 +0200 +++ new/font-bh-ttf-1.0.1/README 2009-10-07 23:50:05.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/bh-ttf + + http://cgit.freedesktop.org/xorg/font/bh-ttf + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-ttf-X11R7.0-1.0.0/autogen.sh new/font-bh-ttf-1.0.1/autogen.sh --- old/font-bh-ttf-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:06.000000000 +0200 +++ new/font-bh-ttf-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-ttf-X11R7.0-1.0.0/configure.ac new/font-bh-ttf-1.0.1/configure.ac --- old/font-bh-ttf-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:23.000000000 +0100 +++ new/font-bh-ttf-1.0.1/configure.ac 2009-10-11 01:44:31.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-bh-ttf, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bh-ttf) +AC_INIT(font-bh-ttf, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bh-ttf) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) -AC_PATH_PROG(FCCACHE, fc-cache) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/TTF -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([TTF]) +XORG_FONT_SCALED_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-ttf-X11R7.0-1.0.0/missing new/font-bh-ttf-1.0.1/missing --- old/font-bh-ttf-X11R7.0-1.0.0/missing 2005-12-21 09:17:38.000000000 +0100 +++ new/font-bh-ttf-1.0.1/missing 2009-10-11 03:14:19.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-bh-type1-X11R7.0-1.0.0.tar.bz2 -> font-bh-type1-1.0.1.tar.bz2 ++++++ ++++ 15360 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-type1-X11R7.0-1.0.0/ChangeLog new/font-bh-type1-1.0.1/ChangeLog --- old/font-bh-type1-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:23.000000000 +0100 +++ new/font-bh-type1-1.0.1/ChangeLog 2009-10-11 03:14:55.000000000 +0200 @@ -1,21 +1,118 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit fe3926ad56179c0e22623c11e07c447fc11df463 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:13:10 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-bh-type1 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit a6edf75a6b4a14802e3159c74c899b3dcc240002 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 15:10:23 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 0baac9f6b4ef09df10e1899e2e85dcab092d8ef0 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 15:09:43 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 8227767d2554c7746a9bcaf0f5a0327de0ced507 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:07 2009 -0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Janitor: Correct make distcheck and configure.ac simplification + +commit 1740b989521030f5391a922b0fec97dfb71fddb9 +Author: Andres Salomon <dilinger@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 <jcristau@debian.org> + +commit fd9c9cca0e01db9e0d3c6501522e16c44e07778f +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:37:48 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit d21593ad533b3ab61bd893023d4d60bb089da108 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:03 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 24f6cfb85a2b057f25bb3b5ff1238bcd3749bd15 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:22 2007 -0400 + + Rename .cvsignore to .gitignore + +commit b1b1bd24d427bf82ac83c4b8e291de1253460988 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:23 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit d5f858778844056cf1ecf7b8981120947470035c +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:51 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit 8a54af08672f8a44a17689b61f1bd780ecb036fa +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:38 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit ed73654e87359d946f74b25220048ad1204a18df +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:19 2005 +0000 + + Add .cvsignores for fonts. + +commit 5d9afa91e39b969fb98232699fa2b0f6c77c7aa2 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:16 2005 +0000 + + Add configure option to change the installed font dir. + +commit c25e4dcea10a5840455f3a4e8747994167c6d2d7 +Author: Kevin E Martin <kem@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 1603b6116c6a4d5a0e56955171ea0f4987f5aa4c +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:06 2005 +0000 + + Initial build system files for font module + +commit 81c84aedf79092bf82b3041b2dfcf62050829171 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit d8482c8cf71edad5f381f8090194ea7169abe14a +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + Initial revision diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-type1-X11R7.0-1.0.0/Makefile.am new/font-bh-type1-1.0.1/Makefile.am --- old/font-bh-type1-X11R7.0-1.0.0/Makefile.am 2005-11-15 09:29:16.000000000 +0100 +++ new/font-bh-type1-1.0.1/Makefile.am 2009-10-08 00:09:10.000000000 +0200 @@ -48,14 +48,24 @@ fontdir = @FONTDIR@ font_DATA = $(FONT_FILES) -EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH autogen.sh +EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH install-data-hook: @rm -f $(DESTDIR)$(fontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) - $(FCCACHE) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-type1-X11R7.0-1.0.0/README new/font-bh-type1-1.0.1/README --- old/font-bh-type1-X11R7.0-1.0.0/README 2005-07-01 00:28:06.000000000 +0200 +++ new/font-bh-type1-1.0.1/README 2009-10-08 00:09:10.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/bh-type1 + + http://cgit.freedesktop.org/xorg/font/bh-type1 + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-type1-X11R7.0-1.0.0/autogen.sh new/font-bh-type1-1.0.1/autogen.sh --- old/font-bh-type1-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:06.000000000 +0200 +++ new/font-bh-type1-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-type1-X11R7.0-1.0.0/configure.ac new/font-bh-type1-1.0.1/configure.ac --- old/font-bh-type1-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:23.000000000 +0100 +++ new/font-bh-type1-1.0.1/configure.ac 2009-10-11 01:44:31.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-bh-type1, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bh-type1) +AC_INIT(font-bh-type1, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bh-type1) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) -AC_PATH_PROG(FCCACHE, fc-cache) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/Type1 -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([Type1]) +XORG_FONT_SCALED_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bh-type1-X11R7.0-1.0.0/missing new/font-bh-type1-1.0.1/missing --- old/font-bh-type1-X11R7.0-1.0.0/missing 2005-12-21 09:17:45.000000000 +0100 +++ new/font-bh-type1-1.0.1/missing 2009-10-11 03:14:45.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-bitstream-100dpi-X11R7.0-1.0.0.tar.bz2 -> font-bitstream-100dpi-1.0.1.tar.bz2 ++++++ ++++ 15497 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bitstream-100dpi-X11R7.0-1.0.0/ChangeLog new/font-bitstream-100dpi-1.0.1/ChangeLog --- old/font-bitstream-100dpi-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:23.000000000 +0100 +++ new/font-bitstream-100dpi-1.0.1/ChangeLog 2009-10-11 03:15:32.000000000 +0200 @@ -1,26 +1,136 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 44981b44384751bc3132187826e010b81cf4d577 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:15:43 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-bitstream-100dpi 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit b231452a798b2efdc32c9676b8bb52941c3cf0b2 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 15:08:31 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit aee67b1e107ac16549c6c4db00c3abea195ee18b +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:27 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit d48f49287b0dcc0d5d582ce9b8b237dc1e39dbfa +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:07 2009 -0200 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Janitor: Correct make distcheck and configure.ac simplification -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 2f0c0276d2d867040d7222279059e16d9fd05e48 +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> + +commit aa6649e9c478826f74ad9afb448e3926bd6d65ff +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:37:50 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 7c00bb01da7759339974adc72c1782c05bf1e82d +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:03 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 121d90a5303591e1953919a64beeaa755c0d7577 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:23 2007 -0400 + + Rename .cvsignore to .gitignore + +commit fd8e71a6e748fd649e807f7016ae5b441c36070a +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:23 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 951aa5feff5f8ac49a798846ba05ce50a330eda3 +Author: Kevin E Martin <kem@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 5c587bf1820fe666e40b4a46f2967e9ae37e383c +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:38 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 1943f4af946ae100d6b8090a54e5e05b8eecf5b4 +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:14 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit 712a42d870da7dbb328c1fdc0a4d1a84cd00d2fa +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:19 2005 +0000 + + Add .cvsignores for fonts. + +commit d8beca15d7572f317da91cc23fa048c773c3b111 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:17 2005 +0000 + + Add configure option to change the installed font dir. + +commit 7d25f42ab871b8fcb9b3d4fbe5be487d67ff6199 +Author: Kevin E Martin <kem@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 4fde33f2dc38995d54b34dc340e7adabcbc0f9ed +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:05 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit 00c1d5cef5e2ba90cfc6c05e02ec9c87bdb10d1f +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:06 2005 +0000 + + Initial build system files for font module + +commit 1c8e1d77df916c02272d4d72fb685df30603e388 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:34 2003 +0000 + + XFree86 4.3.0.1 + +commit 9d00735f0343381317a9b03416e8136c87acca20 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:25 2003 +0000 + + Initial revision + +commit 44fd83afb566fcb11b342a184dae65f9cbfd8a29 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:33 2003 +0000 + + R6.6 is the Xorg base-line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bitstream-100dpi-X11R7.0-1.0.0/Makefile.am new/font-bitstream-100dpi-1.0.1/Makefile.am --- old/font-bitstream-100dpi-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:14.000000000 +0100 +++ new/font-bitstream-100dpi-1.0.1/Makefile.am 2009-10-08 00:03:05.000000000 +0200 @@ -50,25 +50,34 @@ termB14 BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) -SUFFIXES = .bdf .pcf.gz +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) CLEANFILES = $(font_DATA) -EXTRA_DIST = $(BDF_FILES) autogen.sh +EXTRA_DIST = $(BDF_FILES) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bitstream-100dpi-X11R7.0-1.0.0/README new/font-bitstream-100dpi-1.0.1/README --- old/font-bitstream-100dpi-X11R7.0-1.0.0/README 2005-07-01 00:28:06.000000000 +0200 +++ new/font-bitstream-100dpi-1.0.1/README 2009-10-07 04:14:26.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/bitstream-100dpi + + http://cgit.freedesktop.org/xorg/font/bitstream-100dpi + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bitstream-100dpi-X11R7.0-1.0.0/autogen.sh new/font-bitstream-100dpi-1.0.1/autogen.sh --- old/font-bitstream-100dpi-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:06.000000000 +0200 +++ new/font-bitstream-100dpi-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bitstream-100dpi-X11R7.0-1.0.0/configure.ac new/font-bitstream-100dpi-1.0.1/configure.ac --- old/font-bitstream-100dpi-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:23.000000000 +0100 +++ new/font-bitstream-100dpi-1.0.1/configure.ac 2009-10-11 01:44:31.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-bitstream-100dpi, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bitstream-100dpi) +AC_INIT(font-bitstream-100dpi, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bitstream-100dpi) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/100dpi -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([100dpi]) +XORG_FONT_BDF_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bitstream-100dpi-X11R7.0-1.0.0/missing new/font-bitstream-100dpi-1.0.1/missing --- old/font-bitstream-100dpi-X11R7.0-1.0.0/missing 2005-12-21 09:17:53.000000000 +0100 +++ new/font-bitstream-100dpi-1.0.1/missing 2009-10-11 03:15:23.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-bitstream-100dpi-X11R7.0-1.0.0.tar.bz2 -> font-bitstream-75dpi-1.0.1.tar.bz2 ++++++ ++++ 181440 lines of diff (skipped) ++++++ font-bitstream-type1-X11R7.0-1.0.0.tar.bz2 -> font-bitstream-type1-1.0.1.tar.bz2 ++++++ ++++ 15373 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bitstream-type1-X11R7.0-1.0.0/ChangeLog new/font-bitstream-type1-1.0.1/ChangeLog --- old/font-bitstream-type1-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:23.000000000 +0100 +++ new/font-bitstream-type1-1.0.1/ChangeLog 2009-10-11 03:17:00.000000000 +0200 @@ -1,21 +1,130 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 442d80e6990cfb4d0c4cbc8673bc62d63cc35458 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:33:43 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-bitstream-type1 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 43a8529507b903e9b80fd896ac9b5ad512c3e620 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 15:17:49 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 72527a36fa191284f940c9cf66953861dbf6fe4a +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:27 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit dbca5ca974d6cec77357082a6f86a2e0259e451a +Author: Ryan Hill <dirtyepic@gentoo.org> +Date: Sun Aug 16 14:48:15 2009 -0600 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + 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 <dirtyepic@gentoo.org> + Signed-off-by: Rémi Cardona <remi@gentoo.org> + +commit fca975ffcac8a4455c24300396e652e646c8476c +Author: Paulo Cesar Pereira de Andrade <pcpa@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 <dilinger@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 <jcristau@debian.org> + +commit 59ef1c711cc8382ee603d10b90709f6357c9df92 +Author: James Cloos <cloos@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 <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:06 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit f90da3ecb3f344922f48218eef0603a2069b1e13 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:26 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 790a52d9740fc6772caa5d9a2db1c3faa72639c2 +Author: Kevin E Martin <kem@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 <kem@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 <kem@kem.org> +Date: Sat Dec 3 05:49:39 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 3fcfbaa507cdfe59a0caec80d2d7ebd65b6ce118 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:19 2005 +0000 + + Add .cvsignores for fonts. + +commit 8224335cc21ebb6a3e68dd634ff0846f2fecd834 +Author: Kevin E Martin <kem@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 <kem@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 <kem@kem.org> +Date: Thu Jun 30 22:28:07 2005 +0000 + + Initial build system files for font module + +commit 86efdda71cba55dc91f8c3e4d6d21656d7c6f520 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit c9c05992f6d2e2df72f642b2e3aa18de69d9c439 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:35 2003 +0000 + + R6.6 is the Xorg base-line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bitstream-type1-X11R7.0-1.0.0/Makefile.am new/font-bitstream-type1-1.0.1/Makefile.am --- old/font-bitstream-type1-X11R7.0-1.0.0/Makefile.am 2005-11-15 09:29:17.000000000 +0100 +++ new/font-bitstream-type1-1.0.1/Makefile.am 2009-10-08 00:16:13.000000000 +0200 @@ -40,14 +40,24 @@ fontdir = @FONTDIR@ font_DATA = $(FONT_FILES) -EXTRA_DIST = $(FONT_FILES) Copyright autogen.sh +EXTRA_DIST = $(FONT_FILES) Copyright install-data-hook: @rm -f $(DESTDIR)$(fontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) - $(FCCACHE) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bitstream-type1-X11R7.0-1.0.0/README new/font-bitstream-type1-1.0.1/README --- old/font-bitstream-type1-X11R7.0-1.0.0/README 2005-07-01 00:28:07.000000000 +0200 +++ new/font-bitstream-type1-1.0.1/README 2009-10-07 04:14:27.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/bitstream-type1 + + http://cgit.freedesktop.org/xorg/font/bitstream-type1 + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bitstream-type1-X11R7.0-1.0.0/autogen.sh new/font-bitstream-type1-1.0.1/autogen.sh --- old/font-bitstream-type1-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:07.000000000 +0200 +++ new/font-bitstream-type1-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bitstream-type1-X11R7.0-1.0.0/configure.ac new/font-bitstream-type1-1.0.1/configure.ac --- old/font-bitstream-type1-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:23.000000000 +0100 +++ new/font-bitstream-type1-1.0.1/configure.ac 2009-10-11 01:44:31.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-bitstream-type1, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bitstream-type1) +AC_INIT(font-bitstream-type1, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bitstream-type1) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) -AC_PATH_PROG(FCCACHE, fc-cache) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/Type1 -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([Type1]) +XORG_FONT_SCALED_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-bitstream-type1-X11R7.0-1.0.0/missing new/font-bitstream-type1-1.0.1/missing --- old/font-bitstream-type1-X11R7.0-1.0.0/missing 2005-12-21 09:18:16.000000000 +0100 +++ new/font-bitstream-type1-1.0.1/missing 2009-10-11 03:16:52.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-cronyx-cyrillic-X11R7.0-1.0.0.tar.bz2 -> font-cronyx-cyrillic-1.0.1.tar.bz2 ++++++ ++++ 15521 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-cronyx-cyrillic-X11R7.0-1.0.0/ChangeLog new/font-cronyx-cyrillic-1.0.1/ChangeLog --- old/font-cronyx-cyrillic-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:24.000000000 +0100 +++ new/font-cronyx-cyrillic-1.0.1/ChangeLog 2009-10-11 03:17:26.000000000 +0200 @@ -1,26 +1,160 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit eefd082f5c8a9b0b6a99239107b4802613502919 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:35:48 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-cronyx-cyrillic 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 0f97ef0c993e14519664e11c481611086f74ad3c +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 15:20:09 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 40d81d67ec1ad8ce27087ea31a67ee261fd80d2b +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:27 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit d9896453fdda5cab50820dba4568b9a2d8551ca7 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:07 2009 -0200 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Janitor: Correct make distcheck and configure.ac simplification -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit b90b9a63f96ee03ae91232f068a12e9c91159842 +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> + +commit 1191e659159879ac1ecc09608f6da2e74380a2c7 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:37:54 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit ffbdefb48cd67e4404aa2d6f2f1be12d916f5113 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:07 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 8f62aec7cc9d8aa8fa914a620ab19f6a9fbaac8e +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:27 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 11f115a148fccb2fd708b97bee334bb104133fbf +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:24 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 41a183189ad9b7dbb8fad34b539c2e2fcef24035 +Author: Kevin E Martin <kem@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 64ace18e436d6b2c4339c38e5346681ff5e02951 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:39 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 0e4ddadd32aaab00fe59bcb2a093e9d06afc02b2 +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:15 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit a330c5812b4267139a140dc13b9980fe450a9fde +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:20 2005 +0000 + + Add .cvsignores for fonts. + +commit dab532a2e4dbd060d5ee136420aa171b46d7c9d4 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:17 2005 +0000 + + Add configure option to change the installed font dir. + +commit b0aaec30f326d21a94f8f61af7953c5e1907098f +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:48 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 58ddf8ef8b8004fbd824106b39444299465a3f43 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:05 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit df6659d9f34ab617dcfa7972c42a43165b261479 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:07 2005 +0000 + + Initial build system files for font module + +commit 55e26730e0a7fb83cd729fdc1c7801d138ca7cae +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 18:43:01 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 839fa68c40d13a7190596f1edab89bea3ef18f9f +Author: Egbert Eich <eich@suse.de> +Date: Sun Mar 14 08:31:10 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 06fa9cbbaaec654957c4b491ab774455a55ed193 +Author: Egbert Eich <eich@suse.de> +Date: Wed Mar 3 12:10:49 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 8c3e4ccc4f6240eb840f9cd7293665e89ff2fa71 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:35:10 2004 +0000 + + readding XFree86's cvs IDs + +commit e16294116cdbf0dbf814df9b25d106bc97cf7769 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 09:22:22 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 8eccf082ead517da78e8f22da58fcd2a0bfe5b5d +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:41 2003 +0000 + + XFree86 4.3.0.1 + +commit 974b28db14b318fff5abfc552873f3cc77992564 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:41 2003 +0000 + + Initial revision diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-cronyx-cyrillic-X11R7.0-1.0.0/Makefile.am new/font-cronyx-cyrillic-1.0.1/Makefile.am --- old/font-cronyx-cyrillic-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:15.000000000 +0100 +++ new/font-cronyx-cyrillic-1.0.1/Makefile.am 2009-10-08 00:18:30.000000000 +0200 @@ -86,25 +86,34 @@ koinil2 BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) -SUFFIXES = .bdf .pcf.gz +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) CLEANFILES = $(font_DATA) -EXTRA_DIST = $(BDF_FILES) COPYRIGHT autogen.sh +EXTRA_DIST = $(BDF_FILES) COPYRIGHT install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-cronyx-cyrillic-X11R7.0-1.0.0/README new/font-cronyx-cyrillic-1.0.1/README --- old/font-cronyx-cyrillic-X11R7.0-1.0.0/README 2005-07-01 00:28:07.000000000 +0200 +++ new/font-cronyx-cyrillic-1.0.1/README 2009-10-07 04:14:27.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/cronyx-cyrillic + + http://cgit.freedesktop.org/xorg/font/cronyx-cyrillic + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-cronyx-cyrillic-X11R7.0-1.0.0/autogen.sh new/font-cronyx-cyrillic-1.0.1/autogen.sh --- old/font-cronyx-cyrillic-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:07.000000000 +0200 +++ new/font-cronyx-cyrillic-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-cronyx-cyrillic-X11R7.0-1.0.0/configure.ac new/font-cronyx-cyrillic-1.0.1/configure.ac --- old/font-cronyx-cyrillic-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:24.000000000 +0100 +++ new/font-cronyx-cyrillic-1.0.1/configure.ac 2009-10-11 01:44:31.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-cronyx-cyrillic, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-cronyx-cyrillic) +AC_INIT(font-cronyx-cyrillic, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-cronyx-cyrillic) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/cyrillic -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([cyrillic]) +XORG_FONT_BDF_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-cronyx-cyrillic-X11R7.0-1.0.0/missing new/font-cronyx-cyrillic-1.0.1/missing --- old/font-cronyx-cyrillic-X11R7.0-1.0.0/missing 2005-12-21 09:18:23.000000000 +0100 +++ new/font-cronyx-cyrillic-1.0.1/missing 2009-10-11 03:17:18.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-cursor-misc-X11R7.0-1.0.0.tar.bz2 -> font-cursor-misc-1.0.1.tar.bz2 ++++++ ++++ 15487 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-cursor-misc-X11R7.0-1.0.0/ChangeLog new/font-cursor-misc-1.0.1/ChangeLog --- old/font-cursor-misc-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:24.000000000 +0100 +++ new/font-cursor-misc-1.0.1/ChangeLog 2009-10-11 03:18:02.000000000 +0200 @@ -1,26 +1,130 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 0a64fc9d64abd2f32a2e39f6a8f28fb9a1b9b612 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:37:02 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-cursor-misc 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 16dafb05bce3fedd2a6f224490800ca0d3e628e5 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 16:25:48 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 79c9d70c4dab28a1fc3a0d0093c907175cb129b6 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:27 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit 81aa760ad09c0d0698608fd4fd16ddd602b0b662 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:07 2009 -0200 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Janitor: Correct make distcheck and configure.ac simplification -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit ca2c450bc3b118a06340819246554daedaffbecc +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> + +commit b05045d97ab62341f4534bc2fbe5f89ce761115a +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:37:55 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 463036dfb7bf628df5f65d062560b5615f405441 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:08 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 84f66d61b8d05c308d48aefd84095d48b2242780 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:29 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 759caddc4ed3c2e4f950ac0ab5f643574b4ad49e +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:24 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 969d01938ae7d1906a77344423bef69913169d27 +Author: Kevin E Martin <kem@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 ef18d99b5c44e2802cc011407bb17f7eb1c61404 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:39 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 180f931676e1dedcdfc17e7e67c81d9186b1f433 +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:15 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit 0822f8ef5536c6d2b0ee9e9714c482ef1f59fa31 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:20 2005 +0000 + + Add .cvsignores for fonts. + +commit 26e0c9be798a57ca81e28f527c1a675c2ba7b7bf +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:18 2005 +0000 + + Add configure option to change the installed font dir. + +commit 946dddc6585eb7847a437bd5e559a6dbe3b13622 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:48 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 8981905196909d0461f54e7355edc35438630dc3 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:05 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit 854398a6d4a6d63004b7375cea6137edf892ec92 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:07 2005 +0000 + + Initial build system files for font module + +commit 429bf3a0efcbef1e17c0318c313d6763c3f8271c +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit b3c1d05b1c6f0c3d00a00cea9f2b90c104f3a1c2 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:34 2003 +0000 + + R6.6 is the Xorg base-line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-cursor-misc-X11R7.0-1.0.0/Makefile.am new/font-cursor-misc-1.0.1/Makefile.am --- old/font-cursor-misc-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:15.000000000 +0100 +++ new/font-cursor-misc-1.0.1/Makefile.am 2009-10-08 00:21:43.000000000 +0200 @@ -23,25 +23,34 @@ cursor BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) -SUFFIXES = .bdf .pcf.gz +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) CLEANFILES = $(font_DATA) -EXTRA_DIST = $(BDF_FILES) autogen.sh +EXTRA_DIST = $(BDF_FILES) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-cursor-misc-X11R7.0-1.0.0/README new/font-cursor-misc-1.0.1/README --- old/font-cursor-misc-X11R7.0-1.0.0/README 2005-07-01 00:28:07.000000000 +0200 +++ new/font-cursor-misc-1.0.1/README 2009-10-07 04:14:27.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/cursor-misc + + http://cgit.freedesktop.org/xorg/font/cursor-misc + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-cursor-misc-X11R7.0-1.0.0/autogen.sh new/font-cursor-misc-1.0.1/autogen.sh --- old/font-cursor-misc-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:07.000000000 +0200 +++ new/font-cursor-misc-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-cursor-misc-X11R7.0-1.0.0/configure.ac new/font-cursor-misc-1.0.1/configure.ac --- old/font-cursor-misc-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:24.000000000 +0100 +++ new/font-cursor-misc-1.0.1/configure.ac 2009-10-11 01:44:31.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-cursor-misc, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-cursor-misc) +AC_INIT(font-cursor-misc, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-cursor-misc) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/misc -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([misc]) +XORG_FONT_BDF_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-cursor-misc-X11R7.0-1.0.0/missing new/font-cursor-misc-1.0.1/missing --- old/font-cursor-misc-X11R7.0-1.0.0/missing 2005-12-21 09:18:31.000000000 +0100 +++ new/font-cursor-misc-1.0.1/missing 2009-10-11 03:17:55.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-daewoo-misc-X11R7.0-1.0.0.tar.bz2 -> font-daewoo-misc-1.0.1.tar.bz2 ++++++ ++++ 15489 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-daewoo-misc-X11R7.0-1.0.0/ChangeLog new/font-daewoo-misc-1.0.1/ChangeLog --- old/font-daewoo-misc-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:24.000000000 +0100 +++ new/font-daewoo-misc-1.0.1/ChangeLog 2009-10-11 03:18:31.000000000 +0200 @@ -1,26 +1,130 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 68e1fce89dd50bcd29933d59042e966767605a9c +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:37:50 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-daewoo-misc 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit fbd4afe7b79e8dd6d06232fb1a98f2bb79f8ab72 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 16:29:13 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit ea291e10f50f1588d27bce83a58257a75d7733b9 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:28 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit 7e43cdc55a4c5a310ce98fd04ee1a25671d34029 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:07 2009 -0200 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Janitor: Correct make distcheck and configure.ac simplification -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit ae4ec15ecc0ddff44f9b020f90c639641bae4d80 +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> + +commit 8f0810df0344d856d4fd76bc08f93905888b68ed +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:37:55 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit f1afa371915ca375a67819fbf65d1e6ff6a3c72f +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:08 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 955a852e1f83338c9c1e4fb73742cdbdbe1b6d61 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:30 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 94c7fcab052e313d2e5a416fc933deb8ae13ab1d +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:24 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 79cc8beb522f25011fbd3168858bf242b64508c1 +Author: Kevin E Martin <kem@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 9646e4b8ba4eae4a397ce5c71d19689f64a0c22d +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:39 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 6a39ccbc4aaa7a7ccb6ff9d2a5df2c79a801abe1 +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:15 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit e7c44386407d5f8ee9226ad020628417f072f860 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:20 2005 +0000 + + Add .cvsignores for fonts. + +commit 086025d1c86b9c44368f065c455a863d8a1230c9 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:18 2005 +0000 + + Add configure option to change the installed font dir. + +commit 77ae6b82baf0ef62e95a3defa66b3964644fa8dc +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:48 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 a32872dd10221e2d919126c5edc319a6f8495c71 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:06 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit 14174bd97ecfbbb35a18aeac1ea96acbe8cf8aba +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:07 2005 +0000 + + Initial build system files for font module + +commit b5ccbbb8bcb40c761776d6c68edd07d5c4378b22 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit 06632e12d0e2ed5b7c45a8ece96032081791afb5 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:35 2003 +0000 + + R6.6 is the Xorg base-line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-daewoo-misc-X11R7.0-1.0.0/Makefile.am new/font-daewoo-misc-1.0.1/Makefile.am --- old/font-daewoo-misc-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:15.000000000 +0100 +++ new/font-daewoo-misc-1.0.1/Makefile.am 2009-10-08 01:27:04.000000000 +0200 @@ -25,25 +25,34 @@ hanglm24 BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) -SUFFIXES = .bdf .pcf.gz +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) CLEANFILES = $(font_DATA) -EXTRA_DIST = $(BDF_FILES) autogen.sh +EXTRA_DIST = $(BDF_FILES) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-daewoo-misc-X11R7.0-1.0.0/README new/font-daewoo-misc-1.0.1/README --- old/font-daewoo-misc-X11R7.0-1.0.0/README 2005-07-01 00:28:07.000000000 +0200 +++ new/font-daewoo-misc-1.0.1/README 2009-10-07 04:14:27.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/daewoo-misc + + http://cgit.freedesktop.org/xorg/font/daewoo-misc + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-daewoo-misc-X11R7.0-1.0.0/autogen.sh new/font-daewoo-misc-1.0.1/autogen.sh --- old/font-daewoo-misc-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:07.000000000 +0200 +++ new/font-daewoo-misc-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-daewoo-misc-X11R7.0-1.0.0/configure.ac new/font-daewoo-misc-1.0.1/configure.ac --- old/font-daewoo-misc-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:24.000000000 +0100 +++ new/font-daewoo-misc-1.0.1/configure.ac 2009-10-11 01:44:31.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-daewoo-misc, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-daewoo-misc) +AC_INIT(font-daewoo-misc, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-daewoo-misc) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/misc -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([misc]) +XORG_FONT_BDF_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-daewoo-misc-X11R7.0-1.0.0/missing new/font-daewoo-misc-1.0.1/missing --- old/font-daewoo-misc-X11R7.0-1.0.0/missing 2005-12-21 09:18:38.000000000 +0100 +++ new/font-daewoo-misc-1.0.1/missing 2009-10-11 03:18:23.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-dec-misc-X11R7.0-1.0.0.tar.bz2 -> font-dec-misc-1.0.1.tar.bz2 ++++++ ++++ 15487 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-dec-misc-X11R7.0-1.0.0/ChangeLog new/font-dec-misc-1.0.1/ChangeLog --- old/font-dec-misc-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:24.000000000 +0100 +++ new/font-dec-misc-1.0.1/ChangeLog 2009-10-11 03:19:03.000000000 +0200 @@ -1,26 +1,130 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit ec5130c373193261f0df330536b0e2c3c1afaf8e +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:38:50 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-dec-misc 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit d8148570849eca169b5f16a7a66bb89a47f07414 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 16:32:02 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit ae2f541bf76e0369335ccd0f19c5e9d60f991647 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:28 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit c8cb0da6b2eb2c78b8991b1b38a3f49da784fe26 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:08 2009 -0200 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Janitor: Correct make distcheck and configure.ac simplification -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 0b12762b1337394748d2a57b25c0b68949313071 +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> + +commit faf07ad3af23b883a7af9b7247c48b30137c5db0 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:37:56 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit c79299b101e9c11a6080800915481ebd5b12c490 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:09 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit b1ce11a8528caefb52c5ed2ae8a5bf24cc946e40 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:31 2007 -0400 + + Rename .cvsignore to .gitignore + +commit bd3fdf80841753371b17d6a93148770a7b4b511e +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:24 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 9d04d112a2c37e932930fa254ce6b74525129b13 +Author: Kevin E Martin <kem@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 361b342c25b319374b76880823c541b1b9150b36 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:39 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 3b51dcef53944a78d08a534624965af0770c06e9 +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:15 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit c5ebdf7e0df652a69ff09769e5d6199d152cf19d +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:20 2005 +0000 + + Add .cvsignores for fonts. + +commit c944c53ddce8e0a3ab3cd8ac8e6afc54d1fa8b58 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:18 2005 +0000 + + Add configure option to change the installed font dir. + +commit 0448f38bce4e06b60ab6a569f6ba19c957a78fd5 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:48 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 e3a8bf0636eed701c565180dff7048816deffc38 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:06 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit 98786f6bd48a241127643483a356c47794515c27 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:07 2005 +0000 + + Initial build system files for font module + +commit 46d353873e0b45aaa4ce771c879bde8de48664f6 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit 6e469a2931d22e543d22e480deeaa4d1460d02a8 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:34 2003 +0000 + + R6.6 is the Xorg base-line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-dec-misc-X11R7.0-1.0.0/Makefile.am new/font-dec-misc-1.0.1/Makefile.am --- old/font-dec-misc-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:15.000000000 +0100 +++ new/font-dec-misc-1.0.1/Makefile.am 2009-10-08 01:27:45.000000000 +0200 @@ -24,25 +24,34 @@ decsess BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) -SUFFIXES = .bdf .pcf.gz +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) CLEANFILES = $(font_DATA) -EXTRA_DIST = $(BDF_FILES) autogen.sh +EXTRA_DIST = $(BDF_FILES) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-dec-misc-X11R7.0-1.0.0/README new/font-dec-misc-1.0.1/README --- old/font-dec-misc-X11R7.0-1.0.0/README 2005-07-01 00:28:07.000000000 +0200 +++ new/font-dec-misc-1.0.1/README 2009-10-07 04:14:28.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/dec-misc + + http://cgit.freedesktop.org/xorg/font/dec-misc + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-dec-misc-X11R7.0-1.0.0/autogen.sh new/font-dec-misc-1.0.1/autogen.sh --- old/font-dec-misc-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:07.000000000 +0200 +++ new/font-dec-misc-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-dec-misc-X11R7.0-1.0.0/configure.ac new/font-dec-misc-1.0.1/configure.ac --- old/font-dec-misc-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:24.000000000 +0100 +++ new/font-dec-misc-1.0.1/configure.ac 2009-10-11 01:44:31.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-dec-misc, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-dec-misc) +AC_INIT(font-dec-misc, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-dec-misc) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/misc -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([misc]) +XORG_FONT_BDF_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-dec-misc-X11R7.0-1.0.0/missing new/font-dec-misc-1.0.1/missing --- old/font-dec-misc-X11R7.0-1.0.0/missing 2005-12-21 09:18:48.000000000 +0100 +++ new/font-dec-misc-1.0.1/missing 2009-10-11 03:18:54.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-ibm-type1-X11R7.0-1.0.0.tar.bz2 -> font-ibm-type1-1.0.1.tar.bz2 ++++++ ++++ 15372 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-ibm-type1-X11R7.0-1.0.0/ChangeLog new/font-ibm-type1-1.0.1/ChangeLog --- old/font-ibm-type1-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:24.000000000 +0100 +++ new/font-ibm-type1-1.0.1/ChangeLog 2009-10-11 03:20:03.000000000 +0200 @@ -1,21 +1,130 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 7f4e15697a6fc599a0371e831c6e90604c479e36 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:39:28 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-ibm-type1 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 1795b4003b73675883b419d21fcd2274d97de5db +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 16:48:49 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 1696da07a125a5044e6b8a28f526b2e452824694 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:28 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 28cef37b7914e1a1da6b41ab5c53c28eb14e3300 +Author: Ryan Hill <dirtyepic@gentoo.org> +Date: Sun Aug 16 14:51:55 2009 -0600 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + ibm-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 <dirtyepic@gentoo.org> + Signed-off-by: Rémi Cardona <remi@gentoo.org> + +commit 687b87d63da9eb81d7d56f1382dfd970d0358610 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:08 2009 -0200 + + Janitor: Correct make distcheck and configure.ac simplification + +commit 22fe783acc053eee246c419a573b85932e3aefd8 +Author: Andres Salomon <dilinger@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 <jcristau@debian.org> + +commit 056fb025cabdf3bfe1aa22a44176e15ca3f58e00 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:37:56 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit ceb5a2a644035fd628962f11ae1dad15cadb0bb5 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:10 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 55b9beece254e04e5fe7801138818efb04d7beca +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:33 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 350c17bb5a550aa0f1a8018a594f31da4fe33aae +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:24 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit e9a4782c09ce8c0428a2bfbdf57c912f54e90c73 +Author: Kevin E Martin <kem@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 5c4fada6f0f5554bd00d3244e9f717e3196364c3 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:39 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 58dc95d24807612180f761305d7ca4a1ac7c986e +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:20 2005 +0000 + + Add .cvsignores for fonts. + +commit 750d912bc950dd7fa75754bfdd977bbd81e6ff28 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:18 2005 +0000 + + Add configure option to change the installed font dir. + +commit 9947edb3bd659eff87d99a9371a31c97079a3012 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:48 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 3e97e5129f43becfe214d40bf06efbeb14383466 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:07 2005 +0000 + + Initial build system files for font module + +commit b8ace6dda82a9aa12e935122c8ec0df89b3d14c3 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit 9cb0333f00580ec6bc0e098b4346d7a5737928c6 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:35 2003 +0000 + + R6.6 is the Xorg base-line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-ibm-type1-X11R7.0-1.0.0/Makefile.am new/font-ibm-type1-1.0.1/Makefile.am --- old/font-ibm-type1-X11R7.0-1.0.0/Makefile.am 2005-11-15 09:29:18.000000000 +0100 +++ new/font-ibm-type1-1.0.1/Makefile.am 2009-10-08 01:48:13.000000000 +0200 @@ -32,14 +32,24 @@ fontdir = @FONTDIR@ font_DATA = $(FONT_FILES) -EXTRA_DIST = $(FONT_FILES) COPYRIGHT.IBM autogen.sh +EXTRA_DIST = $(FONT_FILES) COPYRIGHT.IBM install-data-hook: @rm -f $(DESTDIR)$(fontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) - $(FCCACHE) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-ibm-type1-X11R7.0-1.0.0/README new/font-ibm-type1-1.0.1/README --- old/font-ibm-type1-X11R7.0-1.0.0/README 2005-07-01 00:28:07.000000000 +0200 +++ new/font-ibm-type1-1.0.1/README 2009-10-07 04:14:28.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/ibm-type1 + + http://cgit.freedesktop.org/xorg/font/ibm-type1 + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-ibm-type1-X11R7.0-1.0.0/autogen.sh new/font-ibm-type1-1.0.1/autogen.sh --- old/font-ibm-type1-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:07.000000000 +0200 +++ new/font-ibm-type1-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-ibm-type1-X11R7.0-1.0.0/configure.ac new/font-ibm-type1-1.0.1/configure.ac --- old/font-ibm-type1-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:24.000000000 +0100 +++ new/font-ibm-type1-1.0.1/configure.ac 2009-10-11 01:44:31.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-ibm-type1, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-ibm-type1) +AC_INIT(font-ibm-type1, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-ibm-type1) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) -AC_PATH_PROG(FCCACHE, fc-cache) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/Type1 -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([Type1]) +XORG_FONT_SCALED_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-ibm-type1-X11R7.0-1.0.0/missing new/font-ibm-type1-1.0.1/missing --- old/font-ibm-type1-X11R7.0-1.0.0/missing 2005-12-21 09:18:55.000000000 +0100 +++ new/font-ibm-type1-1.0.1/missing 2009-10-11 03:19:56.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-isas-misc-X11R7.0-1.0.0.tar.bz2 -> font-isas-misc-1.0.1.tar.bz2 ++++++ ++++ 15495 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-isas-misc-X11R7.0-1.0.0/ChangeLog new/font-isas-misc-1.0.1/ChangeLog --- old/font-isas-misc-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:24.000000000 +0100 +++ new/font-isas-misc-1.0.1/ChangeLog 2009-10-11 03:20:27.000000000 +0200 @@ -1,26 +1,137 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit ea5864ea4db7d9259eea0999731362808563914d +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:39:52 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-isas-misc 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 27833d8c88a76e356854900d82ab2b16f4baead2 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 16:51:56 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit b68de4f46a09536dc8100ae230ee112a391d5ecd +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:28 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit 6231ab31e61a6b336d18996d2828527524316231 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:08 2009 -0200 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Janitor: Correct make distcheck and configure.ac simplification -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit b6b32810c548c33fc3aad85d3b9c4b367e96eca0 +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> + +commit 50923411c56426de1753932c88a9f671722b7a51 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:37:57 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit ce73f0d1d9f5f4f63f818e0854f250cf9ddd74a0 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:11 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 2f65fb815f82e0424b6a9203b255b1fe1f0a2c68 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:34 2007 -0400 + + Rename .cvsignore to .gitignore + +commit f3b4b2df6e26136924c6c932354c6284c46b8a0c +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:24 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 9c0b1685dc23917896eaaeeee93aa26605056393 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:53 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit e72b6ca3925b09abaaaff5c6994f2cd792c358a0 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:40 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit eb896b26746d52efa62e7ae51925c1733e2090ec +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:15 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit 4d15cf870b5417edfb04cb3f9c46fa9125873aa4 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:20 2005 +0000 + + Add .cvsignores for fonts. + +commit 68fb201ea8b60bf280504288a78db1583b473b54 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:18 2005 +0000 + + Add configure option to change the installed font dir. + +commit dd6d8cfe97c447ff4954a8bd0046a1b3fbdeefec +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:48 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 42b88df1147d736e79682e3d89d7df534624e79a +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:06 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit 18b545de677611818d3ce9d757756207534e491a +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:07 2005 +0000 + + Initial build system files for font module + +commit 8a2b7f3c914c0f34344d69e97cb6f4a4ce72f2b3 +Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> +Date: Sun Nov 28 17:17:20 2004 +0000 + + Cyrillic uppercase glyphs 0x2736 and 0x2737 had been swapped (bug #1805, + reported 2004-11-09 by tomo@m17n.org) + +commit 4cf3c33ebe504bbf96bdb08e25e4fdb2e7779a95 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit 4b8ca8f47cd6b8a6f8cbdf61a8c49c6556f74d15 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:35 2003 +0000 + + R6.6 is the Xorg base-line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-isas-misc-X11R7.0-1.0.0/Makefile.am new/font-isas-misc-1.0.1/Makefile.am --- old/font-isas-misc-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:15.000000000 +0100 +++ new/font-isas-misc-1.0.1/Makefile.am 2009-10-08 01:50:42.000000000 +0200 @@ -25,25 +25,34 @@ gb24st BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) -SUFFIXES = .bdf .pcf.gz +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) CLEANFILES = $(font_DATA) -EXTRA_DIST = $(BDF_FILES) autogen.sh +EXTRA_DIST = $(BDF_FILES) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-isas-misc-X11R7.0-1.0.0/README new/font-isas-misc-1.0.1/README --- old/font-isas-misc-X11R7.0-1.0.0/README 2005-07-01 00:28:07.000000000 +0200 +++ new/font-isas-misc-1.0.1/README 2009-10-07 04:14:28.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/isas-misc + + http://cgit.freedesktop.org/xorg/font/isas-misc + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-isas-misc-X11R7.0-1.0.0/autogen.sh new/font-isas-misc-1.0.1/autogen.sh --- old/font-isas-misc-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:07.000000000 +0200 +++ new/font-isas-misc-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-isas-misc-X11R7.0-1.0.0/configure.ac new/font-isas-misc-1.0.1/configure.ac --- old/font-isas-misc-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:24.000000000 +0100 +++ new/font-isas-misc-1.0.1/configure.ac 2009-10-11 01:44:31.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-isas-misc, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-isas-misc) +AC_INIT(font-isas-misc, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-isas-misc) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/misc -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([misc]) +XORG_FONT_BDF_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-isas-misc-X11R7.0-1.0.0/missing new/font-isas-misc-1.0.1/missing --- old/font-isas-misc-X11R7.0-1.0.0/missing 2005-12-21 09:19:02.000000000 +0100 +++ new/font-isas-misc-1.0.1/missing 2009-10-11 03:20:20.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-jis-misc-X11R7.0-1.0.0.tar.bz2 -> font-jis-misc-1.0.1.tar.bz2 ++++++ ++++ 15487 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-jis-misc-X11R7.0-1.0.0/ChangeLog new/font-jis-misc-1.0.1/ChangeLog --- old/font-jis-misc-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:24.000000000 +0100 +++ new/font-jis-misc-1.0.1/ChangeLog 2009-10-11 03:20:57.000000000 +0200 @@ -1,26 +1,130 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit e72b364f613aa58514baf4daaba85abf86d9cf22 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:40:20 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-jis-misc 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 9f7b1db901f91041b3b35255237bd016f0e4e1da +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 16:53:51 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 3ab3b692d762eaf573766308d0576f555c800440 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:28 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit b34f028f1dd572049621e2f9e597351b8b11e3ec +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:08 2009 -0200 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Janitor: Correct make distcheck and configure.ac simplification -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit fd71310b351161a26ca5eb320dc6c486094c5096 +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> + +commit 14bde1ec96a42ba050a1b626e50816a6fb5137b0 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:37:58 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit fefda33b8c26da1ac386fcb532c20bcc559d77cd +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:12 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 7f219a44ce37e044378f9cce15f1bda173460c9c +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:36 2007 -0400 + + Rename .cvsignore to .gitignore + +commit d8084b166fe95210ff53c68518b9981d81f39f8d +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:24 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 7c7fcc3f1bb8b5d3cb263a03f95e5038d0ce61e9 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:53 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit cfc3044a17c0761f3b53b2f4fc3d19c690f167f9 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:40 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 81c5caf6fe889d66a86150c5973a3a38a5ee439d +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:15 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit edc8e28cf58678d167e797c7e0e751dd0fd3b7e6 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:20 2005 +0000 + + Add .cvsignores for fonts. + +commit 1e380ad6aeb7e98cee5a33a2fbaacbcd38adaa99 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:18 2005 +0000 + + Add configure option to change the installed font dir. + +commit c3c567f8e335b292e2161dfa03584fbd24b903c7 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:48 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 87733cd9324e1e1db2d0f283a59c46d344e99e16 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:06 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit f2f5a27d7f57d4b27aaf12d7d14343d4463c9d4b +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:07 2005 +0000 + + Initial build system files for font module + +commit 6277a7c71f81ca466108cd005fb8ef8c84ebdd0a +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit 5b54b1798ba76092850fe947d4958409ca61e86d +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:35 2003 +0000 + + R6.6 is the Xorg base-line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-jis-misc-X11R7.0-1.0.0/Makefile.am new/font-jis-misc-1.0.1/Makefile.am --- old/font-jis-misc-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:15.000000000 +0100 +++ new/font-jis-misc-1.0.1/Makefile.am 2009-10-08 01:52:44.000000000 +0200 @@ -24,25 +24,34 @@ jiskan24 BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) -SUFFIXES = .bdf .pcf.gz +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) CLEANFILES = $(font_DATA) -EXTRA_DIST = $(BDF_FILES) autogen.sh +EXTRA_DIST = $(BDF_FILES) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-jis-misc-X11R7.0-1.0.0/README new/font-jis-misc-1.0.1/README --- old/font-jis-misc-X11R7.0-1.0.0/README 2005-07-01 00:28:07.000000000 +0200 +++ new/font-jis-misc-1.0.1/README 2009-10-07 04:14:28.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/jis-misc + + http://cgit.freedesktop.org/xorg/font/jis-misc + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-jis-misc-X11R7.0-1.0.0/autogen.sh new/font-jis-misc-1.0.1/autogen.sh --- old/font-jis-misc-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:07.000000000 +0200 +++ new/font-jis-misc-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-jis-misc-X11R7.0-1.0.0/configure.ac new/font-jis-misc-1.0.1/configure.ac --- old/font-jis-misc-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:24.000000000 +0100 +++ new/font-jis-misc-1.0.1/configure.ac 2009-10-11 01:44:31.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-jis-misc, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-jis-misc) +AC_INIT(font-jis-misc, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-jis-misc) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/misc -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([misc]) +XORG_FONT_BDF_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-jis-misc-X11R7.0-1.0.0/missing new/font-jis-misc-1.0.1/missing --- old/font-jis-misc-X11R7.0-1.0.0/missing 2005-12-21 09:19:12.000000000 +0100 +++ new/font-jis-misc-1.0.1/missing 2009-10-11 03:20:50.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-micro-misc-X11R7.0-1.0.0.tar.bz2 -> font-micro-misc-1.0.1.tar.bz2 ++++++ ++++ 15516 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-micro-misc-X11R7.0-1.0.0/ChangeLog new/font-micro-misc-1.0.1/ChangeLog --- old/font-micro-misc-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:24.000000000 +0100 +++ new/font-micro-misc-1.0.1/ChangeLog 2009-10-11 03:21:24.000000000 +0200 @@ -1,26 +1,160 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 635c82ab0a5223e72bee558126075700c8d00249 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:40:52 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-micro-misc 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit f100670e03b0477f2af3643a2059ecb839ab4185 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 17:42:47 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit ff8c506fc5cc2fc4a3900426e15e03baef7c3e59 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:28 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit e6fae6dcf9f95cdb53bc7eaa51d56d543d6d5f1e +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:08 2009 -0200 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Janitor: Correct make distcheck and configure.ac simplification -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit ee17d9b930247724f9847ad9f17739f09e103bb0 +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> + +commit 7e03106b2be2a98542ec0e1828850f61baa1e600 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:38:00 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 190fe723fb1797acc3645eb1ffc23a6518987bc9 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:13 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit e3b646f40676ac33178cbb5ae5c76251927649a5 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:36 2007 -0400 + + Rename .cvsignore to .gitignore + +commit a81e62a9e9a50901630878f78d1a36915bdf5a58 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:24 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 499db8a6262fe0e218ba126ff550377760884503 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:53 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit bca2eb2eaeabda5ed10ed982f0bb51b7aefa81fa +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:40 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 26fe4380448a5717477f68ebbff50df6f061e4ac +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:15 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit 1edb1b39f8e61e42990a080aa0fa290a03ef47e2 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:20 2005 +0000 + + Add .cvsignores for fonts. + +commit 57df2be1134a6618dab6dbc9e38d5e2e2a729ca6 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:19 2005 +0000 + + Add configure option to change the installed font dir. + +commit e52b924c8a865a946c8e2c559a19b94056b5e2ff +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:48 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 b44cf9decf865974b56d28c5ca0e3393384c2e4c +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:06 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit 1a18e57951271a7744b5596fa9b5021e2dbdca24 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:08 2005 +0000 + + Initial build system files for font module + +commit 8f1d8781c779d6f70b932a2f3f02d97d35deb6b0 +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 18:43:02 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 457e39611f5ca74144351c6a3836e4e2ba6043b0 +Author: Egbert Eich <eich@suse.de> +Date: Sun Mar 14 08:29:37 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 98ba535fba08426e4fe2ba969c4a73f852fd5a6e +Author: Egbert Eich <eich@suse.de> +Date: Wed Mar 3 12:10:23 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 062909b83d82c272d81ccf45ed8cd5bce6cf0b5d +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:34:54 2004 +0000 + + readding XFree86's cvs IDs + +commit 8920ab612ddccf211aae468afd1f8d7aebe3f574 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 09:21:57 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 92a28b27eccab5163ffda9e636b84fe748f9c0eb +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit 31d2ebb0addf0d7f415b29ce476ed7ea828384d4 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + Initial revision diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-micro-misc-X11R7.0-1.0.0/Makefile.am new/font-micro-misc-1.0.1/Makefile.am --- old/font-micro-misc-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:15.000000000 +0100 +++ new/font-micro-misc-1.0.1/Makefile.am 2009-10-08 02:03:50.000000000 +0200 @@ -23,25 +23,34 @@ micro BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) -SUFFIXES = .bdf .pcf.gz +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) CLEANFILES = $(font_DATA) -EXTRA_DIST = $(BDF_FILES) autogen.sh +EXTRA_DIST = $(BDF_FILES) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-micro-misc-X11R7.0-1.0.0/README new/font-micro-misc-1.0.1/README --- old/font-micro-misc-X11R7.0-1.0.0/README 2005-07-01 00:28:08.000000000 +0200 +++ new/font-micro-misc-1.0.1/README 2009-10-07 04:14:28.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/micro-misc + + http://cgit.freedesktop.org/xorg/font/micro-misc + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-micro-misc-X11R7.0-1.0.0/autogen.sh new/font-micro-misc-1.0.1/autogen.sh --- old/font-micro-misc-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:08.000000000 +0200 +++ new/font-micro-misc-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-micro-misc-X11R7.0-1.0.0/configure.ac new/font-micro-misc-1.0.1/configure.ac --- old/font-micro-misc-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:24.000000000 +0100 +++ new/font-micro-misc-1.0.1/configure.ac 2009-10-11 01:44:31.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-micro-misc, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-micro-misc) +AC_INIT(font-micro-misc, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-micro-misc) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/misc -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([misc]) +XORG_FONT_BDF_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-micro-misc-X11R7.0-1.0.0/missing new/font-micro-misc-1.0.1/missing --- old/font-micro-misc-X11R7.0-1.0.0/missing 2005-12-21 09:19:21.000000000 +0100 +++ new/font-micro-misc-1.0.1/missing 2009-10-11 03:21:17.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-misc-cyrillic-X11R7.0-1.0.0.tar.bz2 -> font-misc-cyrillic-1.0.1.tar.bz2 ++++++ ++++ 15547 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-cyrillic-X11R7.0-1.0.0/ChangeLog new/font-misc-cyrillic-1.0.1/ChangeLog --- old/font-misc-cyrillic-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:25.000000000 +0100 +++ new/font-misc-cyrillic-1.0.1/ChangeLog 2009-10-11 03:21:47.000000000 +0200 @@ -1,26 +1,174 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 5b71faa26c5e52e7e9d382999f41429b22b11b72 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:41:17 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-misc-cyrillic 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 2c277efff7d670333d9f8641ffade31614433e5c +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 17:46:12 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 1054d693e96006db97ec8e16c7fdb8276c4e3cef +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 20:37:00 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add missing newline in .gitignore between "missing" and "*~" + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit f769ca2dde4b2fead16485966356de1f4be2a351 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:29 2009 -0700 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 4cd80d59d8755f43dcaff47f4e281ea4fdf7391b +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:08 2009 -0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Janitor: Correct make distcheck and configure.ac simplification + +commit 03ef482871c0972ec0b29f342e15ba04af71d5c6 +Author: Andres Salomon <dilinger@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 <jcristau@debian.org> + +commit b65b4c6d9f3d7401c7962adabdf5f6a7ace4eff4 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:38:00 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 7f79d42461851cb266a4f0dc6f0a6b37597e66f9 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:14 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 4feae691c2040437b43f50f02d555ddcf8044d1e +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:37 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 3d8dde235824146070757aecc2531d2ffb5449fa +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:25 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 49ec5678565848aee0c47e8bd59d0a78c012583f +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:53 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit e4062756abb6aa70734ea42d08c8cf9edcc0dae0 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:40 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit bbebb43a798e254baf38b7c9a64d28ec4dd88914 +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:15 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit a98aed681d6b9e83255f06c0aafe2f6bbae08840 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:20 2005 +0000 + + Add .cvsignores for fonts. + +commit 031639facd5527a073bf73026908c5fd4bbd50e8 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:19 2005 +0000 + + Add configure option to change the installed font dir. + +commit 137e55b38e06e0a9d4096d33c7e82791a891c480 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:48 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 72c76794c7fed9db4aa3ceb3c9032b436ba58a68 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:06 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit b4bc7920c657165fb96c0941f501f1ff942bcc82 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:08 2005 +0000 + + Initial build system files for font module + +commit a546be63238ca48e3feb9589917b682df506b0f8 +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 18:43:01 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit c2c90f55c796d69a70ff00896a172a414166107b +Author: Egbert Eich <eich@suse.de> +Date: Sun Mar 14 08:31:10 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit c83f0f3f640c5453a8a2150b02b22547e050fcd7 +Author: Egbert Eich <eich@suse.de> +Date: Wed Mar 3 12:10:49 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 7a92ea0390d915c320c1bb59a0b22af952ee596e +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:35:10 2004 +0000 + + readding XFree86's cvs IDs + +commit 54c0eba6c9c7520756d9559013cad1c23963b712 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 09:22:22 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit d4b0aae1b047e517ece3c361c878dfa44a98673e +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Tue Nov 25 19:27:48 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 9c2fa80219caccc932733c321f309bb827a6f058 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:41 2003 +0000 + + XFree86 4.3.0.1 + +commit 70b717151a779ddc0482f513129ce19ea1145d52 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:41 2003 +0000 + + Initial revision diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-cyrillic-X11R7.0-1.0.0/Makefile.am new/font-misc-cyrillic-1.0.1/Makefile.am --- old/font-misc-cyrillic-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:15.000000000 +0100 +++ new/font-misc-cyrillic-1.0.1/Makefile.am 2009-10-08 05:37:22.000000000 +0200 @@ -37,25 +37,34 @@ koi9x18 BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) -SUFFIXES = .bdf .pcf.gz +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) CLEANFILES = $(font_DATA) -EXTRA_DIST = $(BDF_FILES) autogen.sh +EXTRA_DIST = $(BDF_FILES) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-cyrillic-X11R7.0-1.0.0/README new/font-misc-cyrillic-1.0.1/README --- old/font-misc-cyrillic-X11R7.0-1.0.0/README 2005-07-01 00:28:08.000000000 +0200 +++ new/font-misc-cyrillic-1.0.1/README 2009-10-07 04:14:28.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/misc-cyrillic + + http://cgit.freedesktop.org/xorg/font/misc-cyrillic + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-cyrillic-X11R7.0-1.0.0/autogen.sh new/font-misc-cyrillic-1.0.1/autogen.sh --- old/font-misc-cyrillic-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:08.000000000 +0200 +++ new/font-misc-cyrillic-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-cyrillic-X11R7.0-1.0.0/configure.ac new/font-misc-cyrillic-1.0.1/configure.ac --- old/font-misc-cyrillic-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:25.000000000 +0100 +++ new/font-misc-cyrillic-1.0.1/configure.ac 2009-10-11 01:44:31.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-misc-cyrillic, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-misc-cyrillic) +AC_INIT(font-misc-cyrillic, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-misc-cyrillic) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/cyrillic -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([cyrillic]) +XORG_FONT_BDF_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-cyrillic-X11R7.0-1.0.0/koi5x8.bdf new/font-misc-cyrillic-1.0.1/koi5x8.bdf --- old/font-misc-cyrillic-X11R7.0-1.0.0/koi5x8.bdf 2004-04-23 20:43:01.000000000 +0200 +++ new/font-misc-cyrillic-1.0.1/koi5x8.bdf 2006-07-11 05:00:21.000000000 +0200 @@ -3,7 +3,7 @@ COMMENT Generated with 'ucs2any.pl 5x8.bdf ../xcyr-2.3/tryfont/KOI8-C.TXT KOI8-C' COMMENT from an ISO10646-1 encoded source BDF font. COMMENT ucs2any.pl by Markus Kuhn <mkuhn@acm.org>, 1999. -COMMENT $Id: koi5x8.bdf,v 1.2 2004/04/23 18:43:01 eich Exp $ +COMMENT $Id$ COMMENT Send bug reports to Markus Kuhn <mkuhn@acm.org> COMMENT Changes 1999 by Serge Winitzki. COMMENT $XFree86$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-cyrillic-X11R7.0-1.0.0/missing new/font-misc-cyrillic-1.0.1/missing --- old/font-misc-cyrillic-X11R7.0-1.0.0/missing 2005-12-21 09:19:28.000000000 +0100 +++ new/font-misc-cyrillic-1.0.1/missing 2009-10-11 03:21:40.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-misc-cyrillic.diff ++++++ --- /var/tmp/diff_new_pack.gCQ5hd/_old 2010-04-07 13:23:34.000000000 +0200 +++ /var/tmp/diff_new_pack.gCQ5hd/_new 2010-04-07 13:23:34.000000000 +0200 @@ -1,7 +1,5 @@ -Index: Makefile.am -=================================================================== ---- Makefile.am.orig -+++ Makefile.am +--- Makefile.am.orig 2009-10-08 05:37:22.000000000 +0200 ++++ Makefile.am 2010-04-07 12:36:46.000000000 +0200 @@ -22,19 +22,12 @@ FONT_FILES = \ koi12x24b \ @@ -22,12 +20,10 @@ + koi9x18b BDF_FILES = $(FONT_FILES:%=%.bdf) - PCF_FILES = $(FONT_FILES:%=%.pcf.gz) -Index: Makefile.in -=================================================================== ---- Makefile.in.orig -+++ Makefile.in -@@ -118,19 +118,12 @@ target_alias = @target_alias@ + PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) +--- Makefile.in.orig 2009-10-11 03:21:40.000000000 +0200 ++++ Makefile.in 2010-04-07 12:37:27.000000000 +0200 +@@ -232,19 +232,12 @@ FONT_FILES = \ koi12x24b \ koi12x24 \ @@ -46,5 +42,5 @@ - koi9x18 + koi9x18b - BDF_FILES = $(FONT_FILES:%=%.bdf) + PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) ++++++ font-misc-ethiopic-X11R7.0-1.0.0.tar.bz2 -> font-misc-ethiopic-1.0.1.tar.bz2 ++++++ ++++ 15503 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-ethiopic-X11R7.0-1.0.0/COPYING new/font-misc-ethiopic-1.0.1/COPYING --- old/font-misc-ethiopic-X11R7.0-1.0.0/COPYING 2005-09-28 21:49:16.000000000 +0200 +++ new/font-misc-ethiopic-1.0.1/COPYING 2008-11-11 04:48:13.000000000 +0100 @@ -1,2 +1,30 @@ -These fonts are redistributable under the standard X11/XFree86 license. +These fonts contain this copyright & license information: +Copyright: + This is the Ge'ez Frontiers Foundation's Zemen class font based on the + Goha-Tibeb HP LasterJet fonts and released under the MIT Licence. + True Type Artist:- Biruk Asrat. + +Manufacturer: Ge'ez Frontier Foundation http://www.geez.org/ +License: The MIT License +License URL: http://www.opensource.org/licenses/mit-license.php + +The MIT License at that URL currently states: + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-ethiopic-X11R7.0-1.0.0/ChangeLog new/font-misc-ethiopic-1.0.1/ChangeLog --- old/font-misc-ethiopic-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:25.000000000 +0100 +++ new/font-misc-ethiopic-1.0.1/ChangeLog 2009-10-11 03:22:11.000000000 +0200 @@ -1,32 +1,134 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit a66b98e8924d5767dcbe9a771ee4ff8f8e1f2050 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:42:03 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-misc-ethiopic 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-08 Adam Jackson <ajax@freedesktop.org> +commit 7d19d6a4ec173a6f7f9743ad4bc629a5d306eef2 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 18:02:10 2009 -0700 - * configure.ac: - Bug #5267: Fix AC_ARG_WITH to not lie. (Donnie Berkholz) + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit c82bfd47978d78008f8358bcc2f56a04367bdceb +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:29 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 16a4bce5c8c911c443bd21932c25fddccad6ccc9 +Author: Ryan Hill <dirtyepic@gentoo.org> +Date: Sun Aug 16 15:00:30 2009 -0600 - * configure.ac: - Update package version number for X11R7 RC3 release. + misc-ethiopic: 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 <dirtyepic@gentoo.org> + Signed-off-by: Rémi Cardona <remi@gentoo.org> -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 5fc284976292e3d67e8fe68c711dab1ae224da17 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:08 2009 -0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Janitor: Correct make distcheck and configure.ac simplification -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 15d4322f7f9d8cea77c59c8a01ed9cc4c8a72390 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Mon Nov 10 19:48:45 2008 -0800 - * configure.ac: - Update package version number for RC1 release. + Fill in license details in COPYING file +commit cb7b01b2d0a27cf69e45489ec154bc01e6cb6d93 +Author: Andres Salomon <dilinger@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 <jcristau@debian.org> + +commit 448806eda04b0b6431e64c8ba2324648c7ea7740 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:38:01 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit ba20ae0b8b92067edecbf10422d968c75505230b +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:15 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit b7b122a63b3a4b47391160269c637aaf906aca6a +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:38 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 1cc18c617962bce6202e028813001cfc739b0de3 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:25 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 409bf4e90e1092101906645b7683368e4496bc0c +Author: Adam Jackson <ajax@nwnk.net> +Date: Thu Dec 8 19:39:15 2005 +0000 + + Bug #5267: Fix AC_ARG_WITH to not lie. (Donnie Berkholz) + +commit c4629658e950c9ac010fa7f9fcb62d5bf28c4d18 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:53 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit f9668e4e48180b9f2b784f0d97b2af8bafc93a8a +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:40 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 6f282f69ea5a9e479db7a659446d6ee706879bbd +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:21 2005 +0000 + + Add .cvsignores for fonts. + +commit ccc293d68271d13f8d921cb4e2f8adb6045cc90a +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:19 2005 +0000 + + Add configure option to change the installed font dir. + +commit df31db238bc5ce186f36ba843974c5152110e764 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:48:07 2005 +0000 + + Update package version number for RC1 release. + +commit b5808f7d3b4ac526278c144f225a214cde286780 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Sep 28 19:49:16 2005 +0000 + + Add Ethiopic, Meltho and Speedo fonts and their build systems + +commit a1d95e0f41ee5e807c3f33dafc24f36ebbe15a37 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit e3f7d4fee01065d8113836fa91f30ae8e7b556e3 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + Initial revision diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-ethiopic-X11R7.0-1.0.0/Makefile.am new/font-misc-ethiopic-1.0.1/Makefile.am --- old/font-misc-ethiopic-X11R7.0-1.0.0/Makefile.am 2005-11-15 09:29:19.000000000 +0100 +++ new/font-misc-ethiopic-1.0.1/Makefile.am 2009-10-08 02:52:33.000000000 +0200 @@ -25,19 +25,31 @@ otffontdir = @OTFFONTDIR@ otffont_DATA = GohaTibebZemen.otf -EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt autogen.sh +# Used by RUN_FCCACHE +fontdir = $(ttffontdir) $(otffontdir) + +EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt install-data-hook: @rm -f $(DESTDIR)$(ttffontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(ttffontdir) @rm -f $(DESTDIR)$(ttffontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(ttffontdir) - $(FCCACHE) $(DESTDIR)$(ttffontdir) @rm -f $(DESTDIR)$(otffontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(otffontdir) @rm -f $(DESTDIR)$(otffontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(otffontdir) - $(FCCACHE) $(DESTDIR)$(otffontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-ethiopic-X11R7.0-1.0.0/README new/font-misc-ethiopic-1.0.1/README --- old/font-misc-ethiopic-X11R7.0-1.0.0/README 2005-09-28 21:49:16.000000000 +0200 +++ new/font-misc-ethiopic-1.0.1/README 2009-10-07 04:14:29.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/misc-ethiopic + + http://cgit.freedesktop.org/xorg/font/misc-ethiopic + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-ethiopic-X11R7.0-1.0.0/autogen.sh new/font-misc-ethiopic-1.0.1/autogen.sh --- old/font-misc-ethiopic-X11R7.0-1.0.0/autogen.sh 2005-09-28 21:49:16.000000000 +0200 +++ new/font-misc-ethiopic-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-ethiopic-X11R7.0-1.0.0/configure.ac new/font-misc-ethiopic-1.0.1/configure.ac --- old/font-misc-ethiopic-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:25.000000000 +0100 +++ new/font-misc-ethiopic-1.0.1/configure.ac 2009-10-11 01:44:32.000000000 +0200 @@ -22,32 +22,25 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-misc-ethiopic, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-misc-ethiopic) +AC_INIT(font-misc-ethiopic, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-misc-ethiopic) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AC_PROG_INSTALL +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) -AC_PATH_PROG(FCCACHE, fc-cache) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_TTFFONTDIR=${libdir}/X11/fonts/TTF -AC_ARG_WITH(ttf-fontdir, - AS_HELP_STRING([--with-ttf-fontdir=FONTDIR], [Path to install TTF fonts]), - [TTFFONTDIR="$withval"], - [TTFFONTDIR="$DEFAULT_TTFFONTDIR"]) -AC_SUBST(TTFFONTDIR) - -DEFAULT_OTFFONTDIR=${libdir}/X11/fonts/OTF -AC_ARG_WITH(otf-fontdir, - AS_HELP_STRING([--with-otf-fontdir=FONTDIR], [Path to install OTF fonts]), - [OTFFONTDIR="$withval"], - [OTFFONTDIR="$DEFAULT_OTFFONTDIR"]) -AC_SUBST(OTFFONTDIR) +AC_PROG_INSTALL -XORG_RELEASE_VERSION +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) + +XORG_FONTSUBDIR([TTFFONTDIR], [ttf-fontdir], [TTF]) +XORG_FONTSUBDIR([OTFFONTDIR], [otf-fontdir], [OTF]) +XORG_FONT_SCALED_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-ethiopic-X11R7.0-1.0.0/missing new/font-misc-ethiopic-1.0.1/missing --- old/font-misc-ethiopic-X11R7.0-1.0.0/missing 2005-12-21 09:19:34.000000000 +0100 +++ new/font-misc-ethiopic-1.0.1/missing 2009-10-11 03:22:04.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-misc-ethiopic.diff ++++++ --- /var/tmp/diff_new_pack.gCQ5hd/_old 2010-04-07 13:23:34.000000000 +0200 +++ /var/tmp/diff_new_pack.gCQ5hd/_new 2010-04-07 13:23:34.000000000 +0200 @@ -1,6 +1,6 @@ ---- Makefile.am.orig 2007-02-12 14:12:27.228324571 +0100 -+++ Makefile.am 2007-02-12 14:14:24.701315546 +0100 -@@ -19,20 +19,12 @@ +--- Makefile.am.orig 2009-10-08 02:52:33.000000000 +0200 ++++ Makefile.am 2010-04-04 17:46:32.000000000 +0200 +@@ -19,22 +19,15 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. @@ -10,77 +10,87 @@ otffontdir = @OTFFONTDIR@ otffont_DATA = GohaTibebZemen.otf --EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt autogen.sh -+EXTRA_DIST = $(otffont_DATA) license.txt autogen.sh + # Used by RUN_FCCACHE + fontdir = $(ttffontdir) $(otffontdir) + +-EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt ++EXTRA_DIST = $(otffont_DATA) license.txt install-data-hook: - @rm -f $(DESTDIR)$(ttffontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(ttffontdir) - @rm -f $(DESTDIR)$(ttffontdir)/font.dir - $(MKFONTDIR) $(DESTDIR)$(ttffontdir) -- $(FCCACHE) $(DESTDIR)$(ttffontdir) @rm -f $(DESTDIR)$(otffontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(otffontdir) @rm -f $(DESTDIR)$(otffontdir)/font.dir ---- Makefile.in.orig 2007-02-12 14:14:31.183432175 +0100 -+++ Makefile.in 2007-02-12 14:16:53.405050524 +0100 -@@ -116,19 +116,16 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - +--- Makefile.in.orig 2009-10-11 03:22:05.000000000 +0200 ++++ Makefile.in 2010-04-04 17:49:25.000000000 +0200 +@@ -98,8 +98,8 @@ + am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +-am__installdirs = "$(DESTDIR)$(otffontdir)" "$(DESTDIR)$(ttffontdir)" +-DATA = $(otffont_DATA) $(ttffont_DATA) ++am__installdirs = "$(DESTDIR)$(otffontdir)" ++DATA = $(otffont_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) +@@ -228,14 +228,12 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ -ttffontdir = @TTFFONTDIR@ -ttffont_DATA = GohaTibebZemen.ttf -- otffontdir = @OTFFONTDIR@ otffont_DATA = GohaTibebZemen.otf --EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt autogen.sh -+EXTRA_DIST = $(otffont_DATA) license.txt autogen.sh - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_CLEAN_FILES = - DIST_SOURCES = --DATA = $(otffont_DATA) $(ttffont_DATA) -+DATA = $(otffont_DATA) - - DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ - COPYING ChangeLog INSTALL Makefile.am NEWS aclocal.m4 configure \ -@@ -171,24 +168,6 @@ - echo " rm -f $(DESTDIR)$(otffontdir)/$$f"; \ - rm -f $(DESTDIR)$(otffontdir)/$$f; \ - done --ttffontDATA_INSTALL = $(INSTALL_DATA) + # Used by RUN_FCCACHE +-fontdir = $(ttffontdir) $(otffontdir) +-EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt ChangeLog ++fontdir = $(otffontdir) ++EXTRA_DIST = $(otffont_DATA) license.txt ChangeLog + MAINTAINERCLEANFILES = ChangeLog + all: all-am + +@@ -294,26 +292,7 @@ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(otffontdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(otffontdir)" && rm -f $$files -install-ttffontDATA: $(ttffont_DATA) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(ttffontdir) -- @list='$(ttffont_DATA)'; for p in $$list; do \ +- test -z "$(ttffontdir)" || $(MKDIR_P) "$(DESTDIR)$(ttffontdir)" +- @list='$(ttffont_DATA)'; test -n "$(ttffontdir)" || list=; \ +- for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(ttffontDATA_INSTALL) $$d$$p $(DESTDIR)$(ttffontdir)/$$f"; \ -- $(ttffontDATA_INSTALL) $$d$$p $(DESTDIR)$(ttffontdir)/$$f; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(ttffontdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(ttffontdir)" || exit $$?; \ - done -- + -uninstall-ttffontDATA: - @$(NORMAL_UNINSTALL) -- @list='$(ttffont_DATA)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(ttffontdir)/$$f"; \ -- rm -f $(DESTDIR)$(ttffontdir)/$$f; \ -- done +- @list='$(ttffont_DATA)'; test -n "$(ttffontdir)" || list=; \ +- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ +- test -n "$$files" || exit 0; \ +- echo " ( cd '$(DESTDIR)$(ttffontdir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(ttffontdir)" && rm -f $$files tags: TAGS TAGS: -@@ -308,7 +287,7 @@ +@@ -465,7 +444,7 @@ + check: check-am all-am: Makefile $(DATA) - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(otffontdir) $(DESTDIR)$(ttffontdir) -+ $(mkinstalldirs) $(DESTDIR)$(otffontdir) +- for dir in "$(DESTDIR)$(otffontdir)" "$(DESTDIR)$(ttffontdir)"; do \ ++ for dir in "$(DESTDIR)$(otffontdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -350,7 +329,7 @@ +@@ -515,7 +494,7 @@ info-am: @@ -88,27 +98,27 @@ +install-data-am: install-otffontDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook - -@@ -380,8 +359,7 @@ + install-dvi: install-dvi-am +@@ -562,7 +541,7 @@ ps-am: --uninstall-am: uninstall-info-am uninstall-otffontDATA \ -- uninstall-ttffontDATA -+uninstall-am: uninstall-info-am uninstall-otffontDATA +-uninstall-am: uninstall-otffontDATA uninstall-ttffontDATA ++uninstall-am: uninstall-otffontDATA - .PHONY: all all-am check check-am clean clean-generic dist dist-all \ - dist-bzip2 dist-gzip distcheck distclean distclean-generic \ -@@ -389,18 +367,13 @@ - info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-otffontDATA install-strip \ -- install-ttffontDATA installcheck installcheck-am installdirs \ -+ installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ -- uninstall-info-am uninstall-otffontDATA uninstall-ttffontDATA -+ uninstall-info-am uninstall-otffontDATA + .MAKE: install-am install-data-am install-strip + +@@ -575,18 +554,13 @@ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-otffontDATA install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip install-ttffontDATA installcheck \ ++ install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am uninstall uninstall-am uninstall-otffontDATA \ +- uninstall-ttffontDATA ++ pdf-am ps ps-am uninstall uninstall-am uninstall-otffontDATA install-data-hook: @@ -116,7 +126,6 @@ - $(MKFONTSCALE) $(DESTDIR)$(ttffontdir) - @rm -f $(DESTDIR)$(ttffontdir)/font.dir - $(MKFONTDIR) $(DESTDIR)$(ttffontdir) -- $(FCCACHE) $(DESTDIR)$(ttffontdir) @rm -f $(DESTDIR)$(otffontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(otffontdir) @rm -f $(DESTDIR)$(otffontdir)/font.dir ++++++ font-misc-meltho-X11R7.0-1.0.0.tar.bz2 -> font-misc-meltho-1.0.1.tar.bz2 ++++++ ++++ 15372 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-meltho-X11R7.0-1.0.0/ChangeLog new/font-misc-meltho-1.0.1/ChangeLog --- old/font-misc-meltho-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:25.000000000 +0100 +++ new/font-misc-meltho-1.0.1/ChangeLog 2009-10-11 03:22:36.000000000 +0200 @@ -1,27 +1,122 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 68173e8e02c726e66d1a139b00823bd296194cdc +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:42:33 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-misc-meltho 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit d4f8ad0a44a752dbeb3773fc690eed71620197ee +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 19:03:23 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 117e42771482eed4fcaf68f10c3f497d6b031152 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:29 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit d5cb8b8e6ab8b832b87b7fabc9c90c36a2921420 +Author: Ryan Hill <dirtyepic@gentoo.org> +Date: Sun Aug 16 14:54:23 2009 -0600 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + misc-meltho: Skip running 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 <dirtyepic@gentoo.org> + Signed-off-by: Rémi Cardona <remi@gentoo.org> -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 16a78aa66239bd25bd63aa04a2ea5d0924f72bff +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:08 2009 -0200 - * configure.ac: - Update package version number for RC1 release. + Janitor: Correct make distcheck and configure.ac simplification +commit bf8dedf369eee5fffbf2ac2984a3b6c319ece98f +Author: Andres Salomon <dilinger@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 <jcristau@debian.org> + +commit 9d08acb7a0eb58393c3ce5936d99fcc09ee53edb +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:38:01 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 864d00a9d0c39336bdf42efc1847370b433c4e66 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:17 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 1a9c0ae20e0a93120c1546bd134bd096a1571c75 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:40 2007 -0400 + + Rename .cvsignore to .gitignore + +commit c06a789d2e89a49acf712c1b2b1e16750f85dbc8 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:25 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 1caa24372154d0f96850725e5c407c7473c92e71 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:53 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit 09b10f89f2b7b02856975ee5eaf59736fe818030 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:40 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 10cf582c5fcee6c1f69a990b1c657564fb33124e +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:21 2005 +0000 + + Add .cvsignores for fonts. + +commit f794270c691efbadfcb0943b9deb3ff25f88b7a0 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:19 2005 +0000 + + Add configure option to change the installed font dir. + +commit 35e78956bedac4dc9df55cebc9f4ac2e4fdd8e5f +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:48:07 2005 +0000 + + Update package version number for RC1 release. + +commit a67f927d1b495fbbcf4cac575e4cf2b9449ce55e +Author: Kevin E Martin <kem@kem.org> +Date: Wed Sep 28 19:49:16 2005 +0000 + + Add Ethiopic, Meltho and Speedo fonts and their build systems + +commit 4d869ef19a6c1893b2964758b14833f3dc680ed2 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit d76225e2cdcf7fa12ea3c2d06dc46d358dd0be93 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + Initial revision diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-meltho-X11R7.0-1.0.0/Makefile.am new/font-misc-meltho-1.0.1/Makefile.am --- old/font-misc-meltho-X11R7.0-1.0.0/Makefile.am 2005-11-15 09:29:19.000000000 +0100 +++ new/font-misc-meltho-1.0.1/Makefile.am 2009-10-08 03:03:00.000000000 +0200 @@ -46,14 +46,24 @@ fontdir = @FONTDIR@ font_DATA = $(FONT_FILES) -EXTRA_DIST = $(FONT_FILES) license.txt README autogen.sh +EXTRA_DIST = $(FONT_FILES) license.txt README install-data-hook: @rm -f $(DESTDIR)$(fontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) - $(FCCACHE) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-meltho-X11R7.0-1.0.0/README new/font-misc-meltho-1.0.1/README --- old/font-misc-meltho-X11R7.0-1.0.0/README 2003-11-14 17:48:42.000000000 +0100 +++ new/font-misc-meltho-1.0.1/README 2009-10-07 04:14:29.000000000 +0200 @@ -5,3 +5,27 @@ Thanks go to both Emil Soleyman-Zomalan and George Kiraz for working to make these fonts available. + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/misc-meltho + + http://cgit.freedesktop.org/xorg/font/misc-meltho + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-meltho-X11R7.0-1.0.0/autogen.sh new/font-misc-meltho-1.0.1/autogen.sh --- old/font-misc-meltho-X11R7.0-1.0.0/autogen.sh 2005-09-28 21:49:16.000000000 +0200 +++ new/font-misc-meltho-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-meltho-X11R7.0-1.0.0/configure.ac new/font-misc-meltho-1.0.1/configure.ac --- old/font-misc-meltho-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:25.000000000 +0100 +++ new/font-misc-meltho-1.0.1/configure.ac 2009-10-11 01:44:32.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-misc-meltho, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-misc-meltho) +AC_INIT(font-misc-meltho, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-misc-meltho) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AC_PROG_INSTALL +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) +AC_PROG_INSTALL -DEFAULT_FONTDIR=${libdir}/X11/fonts/OTF -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) - -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) -AC_PATH_PROG(FCCACHE, fc-cache) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([OTF]) +XORG_FONT_SCALED_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-misc-meltho-X11R7.0-1.0.0/missing new/font-misc-meltho-1.0.1/missing --- old/font-misc-meltho-X11R7.0-1.0.0/missing 2005-12-21 09:19:42.000000000 +0100 +++ new/font-misc-meltho-1.0.1/missing 2009-10-11 03:22:29.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-misc-misc-X11R7.0-1.0.0.tar.bz2 -> font-misc-misc-1.1.0.tar.bz2 ++++++ ++++ 129884 lines of diff (skipped) ++++++ font-mutt-misc-X11R7.0-1.0.0.tar.bz2 -> font-mutt-misc-1.0.1.tar.bz2 ++++++ ++++ 15803 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-mutt-misc-X11R7.0-1.0.0/ChangeLog new/font-mutt-misc-1.0.1/ChangeLog --- old/font-mutt-misc-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:25.000000000 +0100 +++ new/font-mutt-misc-1.0.1/ChangeLog 2009-10-11 03:25:21.000000000 +0200 @@ -1,26 +1,155 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 1aef40ca21e1e6d5945adb4f3aeafa66a1fa4070 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:45:42 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-mutt-misc 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 25dee300d5cd15a16e16c2584265daa6336294fb +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 19:36:43 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit ca90ff97738322776ed18d4a13b5bcef1741b513 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:15:31 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit 922f54b907a25c81acb552bb7040d3e4d17f99fe +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Jul 8 10:44:07 2009 -0400 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + mutt-misc: use XORG_CHANGELOG macro to create ChangeLog. #22611 + + Build break: Makefile.am: command not found: git-log + Adding the macro in configure.ac and use it in Makefile.am + Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 + Tested: running autogen.sh, make and 'make dist' + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 2418c897d2263eb4634de3f4fcb2877ab167b52b +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> + +commit 2d7da96703dc4c661d307641e7c3a5b7a7c272a1 +Author: Eric Anholt <eric@anholt.net> +Date: Wed Apr 16 14:31:53 2008 -0700 + + Bug #14196: Don't attempt to dist nonexistent README. + +commit c1a8f12c514ce465650133ec55034c69c65a63b6 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:38:04 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 83947e0ee2d346f0c05c98b9e68cb19b4dc0d945 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:19 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 9501ddc84839418ad9752eca6c4f1b765727c93c +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:44 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 8de03e93e805c63276a66f608d93678a66a702fe +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:25 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 861a24906aad116d73ce07742ce691b22f368108 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:54 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit b7bdf280257221b6bcd2bf758e9549f9985dcca5 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:40 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit c624beab019f8436652653bda0d3e49ce701cb45 +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:16 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit 22ff23f93062d3b8dba05a2ae894f67226b33942 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:21 2005 +0000 + + Add .cvsignores for fonts. + +commit 3f5a964a7050ca78684da5224564471f1d4f615b +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:19 2005 +0000 + + Add configure option to change the installed font dir. + +commit bf502fd3dad2e63ce99715abe8bc1138b31c1746 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:49 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 a9107bc812df8cdc6b2ba50d8aa6183269394fd6 +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:06 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit 024fd5b9fe443c73cdf85427e119f79a0ee29340 +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Date: Wed Jul 6 19:26:27 2005 +0000 + + - Xaw/xaw.m4: Change help string to say "enable xprint" instead of "disable + xprint" + - symlink.sh: Rename Bitmap-co.ad to Bitmap-color.ad. Add bitmaps for the + bitmap application. Add xdbedizzy.sgml. + - xc/programs/xdbedizzy/: Conditionalize use of xprint + - remove font/arabic-misc/README and font/mutt-misc/README + +commit 33647c77681459f33bc8d42418d3cc1aa8df0dd0 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Jul 2 23:41:00 2005 +0000 + + Add build system for arabic24 and ClearlyU fonts + +commit 023759c8bf143b485e1764e2f65efb93ff03cdcd +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:24 2003 +0000 + + XFree86 4.3.0.1 + +commit 9206c9e1f7fe83658f3ab14f4d920c19895ba2ed +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:24 2003 +0000 + + Initial revision diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-mutt-misc-X11R7.0-1.0.0/Makefile.am new/font-mutt-misc-1.0.1/Makefile.am --- old/font-mutt-misc-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:16.000000000 +0100 +++ new/font-mutt-misc-1.0.1/Makefile.am 2009-10-08 04:20:08.000000000 +0200 @@ -30,25 +30,34 @@ cu-pua12 BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) -SUFFIXES = .bdf .pcf.gz +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) CLEANFILES = $(font_DATA) -EXTRA_DIST = $(BDF_FILES) autogen.sh README +EXTRA_DIST = $(BDF_FILES) autogen.sh install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-mutt-misc-X11R7.0-1.0.0/README new/font-mutt-misc-1.0.1/README --- old/font-mutt-misc-X11R7.0-1.0.0/README 2003-11-14 17:48:24.000000000 +0100 +++ new/font-mutt-misc-1.0.1/README 2009-10-07 04:14:29.000000000 +0200 @@ -1,316 +1,24 @@ -# -# Id: README,v 1.19 2002/11/22 23:11:31 mleisher Exp $ -# -# Copyright 2002 Computing Research Lab, New Mexico State University -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY -# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT -# OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -# THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -Version: 1.9 -22 November 2002 +All questions regarding this software should be directed at the +Xorg mailing list: -This set of fonts provides a 12pt, 100dpi proportional font with many of -the glyphs needed for Unicode text. I call the typeface "ClearlyU" and -it was influenced by Donald Knuth's Computer Modern. + http://lists.freedesktop.org/mailman/listinfo/xorg -The fonts together contain 9538 glyphs at the moment. This does not include -cuarabic12.bdf and cudevnag12.bdf which contain glyphs from cu12.bdf and and -cu-pua12.bdf. +Please submit bug reports to the Xorg bugzilla: -Information about this font and samples, are located at: + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg - http://crl.nmsu.edu/~mleisher/cu.html +The master development code repository can be found at: -ACKNOWLEDGEMENTS -================ -Thanks to Otto Stolz <Otto.Stolz@uni-konstanz.de> for finding spelling errors -in one of the Greek samples. + git://anongit.freedesktop.org/git/xorg/font/mutt-misc -Thanks to Theppitak Karoonboonyanan <theppitak@nectec.or.th> for his excellent -cleanup of the Thai glyphs, particularly the vowel and tone marks. + http://cgit.freedesktop.org/xorg/font/mutt-misc -Thanks to Ahmed Abdelali <ahmed@crl.nmsu.edu> for his help in improving the -Arabic glyphs. +For patch submission instructions, see: -Thanks to S�amus � Ciardhu�in <seoc@cnds.ucd.ie> for a much cleaner version -of the Ogham glyphs. + http://www.x.org/wiki/Development/Documentation/SubmittingPatches -Thanks go to Daniel Yacob <yacob@ethiopiaonline.net> for a major cleanup of -the Ethiopic block glyphs! +For more information on the git code manager, see: -AUTHOR -====== -Mark Leisher <mleisher@crl.nmsu.edu> + http://wiki.x.org/wiki/GitPage -CHANGES -======= - -CHANGES FROM 1.8 ----------------- - o Adjusted positioning of several math symbols. - - o Fixed the Hebrew FB39 glyph. - - o Added Hangul Jamo and Hangul Compatibility Jamo glyphs. - - o Changed the apostrophe and double quotes to the straight versions, and - fixed the grave accent to look right. - - o Added Koranic marks. - - o Made the Geometric Shapes a bit larger. - - o Cleaned up Control Pictures. - - o Added Miscellaneous Technical symbols. - - o Fixed a couple currency symbols. - - o Added Runes. - - o Added Ogham. - - o Adjusted the positioning of the Arabic decimal and thousands separator. - - o Changed some of the Greek glyphs to represent the trailing - ypogegrammeni. - - o Swapped the Greek phi letter and symbol glyphs. - - o Cleaned up Cherokee a bit. - - o Fixed the non-spacing Dhivehi vowels. - - o Adjusted some of the UCAS shapes. - - o Replaced Ogham glyphs with better version. - - o Major cleanup of Ethiopic glyphs. - - o Added some glyphs to the Cyrillic block. - - o Added a couple missing Arabic glyphs. - - o Minor adjustment to U+1EF5. - - o Added a Devanagari-only font. - - o Added the Braille block. - -CHANGES FROM 1.7 ----------------- - - o Added Unified Canadian Aboriginal Syllabics glyphs. - - o Added Cherokee glyphs. - - o Changed some of the "caron" forms to the preferred "apostrophe" forms. - - o Added Thaana (Dhivehi - Maldivian) glyphs. - - o Finished the Arabic glyph improvements. - - o Adjusted the Lao dependent vowels, tones, and marks based on work done on - the Thai glyphs. - - o Replaced the Thai glyphs with cleaned up versions. - - o Adjusted the shapes of U+01A2 and U+01A3 based on: - http://www.indigo.ie/egt/standards/iso10646/pdf/gha.pdf - - o Added some more glyphs for Unicode 3.0. - - o Some minor lightening of a few glyphs. - - o Redrew the Hebrew glyphs to be more consistent with the other scripts. - - o Removed a combination from the PUA font that is in Unicode 3.0. - - o Made the digits in the Arabic glyphs heavier to reflect more common - practice. The Urdu digit glyphs in the alternate font updated as well. - - o Modified the Arabic block glyphs to be smaller and less silly looking. - - o Added Devanagari glyphs including those needed to actually present text. - - o Adjusted the advance widths of the Cyrillic capital letters to make - presentation more consistent. - - o Adjusted the width of the Lao vowels, I, II, Y, and YY. - - o Renamed all the glyphs to "uniXXXX". - - o Added a Macedonian/Serbian alternate for U+0431 to cu-alt12. - - o Added the Romanian alternates using virgule instead of cedilla for - U+015E, U+015F, U+0162, and U+0163. - - o Added the Persian alternate glyph for the decimal separator at U+066B to - the alternate font. - - o Fixed up some of the Greek glyphs so the small iota follows the capital - letters. - - o Improved the Greek drachma sign. - - o Adjusted the Cyrillic block to match Unicode 3.0 and moved the extra - characters to the PUA font. - - o Initial addition of some basic Hangul glyphs. - -CHANGES FROM 1.6 ----------------- - - o Fixed some more spacing problems with Greek glyphs. - - o Fixed some problems with two alternate Greek glyphs. - - o Fixed a spacing problem with an Armenian glyph. - - o Fixed advance width problems with the Klingon. - - o Added an alternate "No." glyph at 0x2116. - - o Changed the spacing on the basic Latin upper-case letters to make them - look better in natural text. - - o Lowered the dot above the the lower case "i" and "j" letters to make them - blend in more with the surrounding letters. - - o Added some Greek block glyphs. - - o Replaced the small letter d-caron (U+010F) with the preferred typesetting - form and moved the caron form to the alternate page. - - o Replaced the small letter l-caron (U+013E) with the preferred typesetting - form and moved the caron form to the alternate page. - - o Added U+01F6 through U+01F9, U+021C and U+021D, U+0222 through U+0225, - U+02A9 through U+02AD, U+02EA through U+02EE, U+0346 through U+034E, - U+0362, U+2139 and U+213A, U+2183, U+21EB through U+21F3, U+2425 and - U+2426, U+25F0 through U+25F7, - - for Unicode 3.0 support. - - o Lightened the weight of the "w" shape a little. - - o Added a couple glyphs to the Private Use Area font for Navajo (U+E12E and - U+E12F). - - o Added glyphs at U+FFFE for use as an X11 DEFAULT_CHAR entry. - - o Added the _XFREE86_GLYPH_RANGES properties. - - o Updated the copyright notice year. - -CHANGES FROM 1.5 ----------------- - - o Fixed up the Coptic SMALL LETTER FEI shape. - - o Changed the default shape of the Greek KOPPA to the O shape and added a - lower case KOPPA in the unassigned slot after the KOPPA. - - o Added some glyphs to the Private Use Area font: dotless lower j, upper - and lower g with tilde, upper j with caron, final Hebrew kaf with - qamats, upper and lower Xucuri letter he, alternate forms of the Greek - koppa. - - o Some minor improvements made to a few Xucuri glyphs. - - o Spacing adjustments to Armenian, Georgian, Lao, and Thai. - - o Added some more Cyrillic and Latin glyphs. - - o Renamed all the glyphs to 4-digit hexadecimal codes of the form 0xUUUU. - - o Added alternate Greek glyphs that use the curved PERISPOMENI instead of - the one that looks like a tilde. - -CHANGES FROM 1.4 ----------------- - - o Fixed the tone marks in the Greek block. - - o Adjusted the spacing on the lower case Greek letters. - - o Added the missing micro sign at U+00B5. - - o Adjusted spacing on more Latin, Greek, and Cyrillic letters. - - o Added a different Franc symbol to the alternate font. - - o Added the Macedonian I with grave, U+040D, U+045D. - - o Added Cyrillic letter IE with grave at U+0400, U+0450. - - o Added the Armenian hyphen at U+058A. - - o Fixed spacings on glyphs shaped like the capital C and R, and lightened - the capital K a bit. - - o Lightened the "small k shape" found in Cyrillic and Greek. - - o Adjusted some spacing problems with Greek alphas. - - o Fixed Cyrillic glyphs UPRIGHT U and UPRIGHT U WITH BAR. - - o Adjusted the Cyrillic letters U WITH DOUBLE ACUTE. - -CHANGES FROM 1.3 ----------------- - - o Lightened the lower case "k" and "t" shapes to be more consistent with - the weight of the other glyphs. - - o Adjusted the spacing of the letter "x" yet again. - - o Adjusted spacing of the letter "y". - - o Changed the Greek capital "Y" shape to something more modern, in the - diatonic block as well. - - o Adjusted many spacings. - - o Adjusted spacing on Georgian Xutsuri lower case alternate glyphs. - - o Added consistent CAP_HEIGHT and X_HEIGHT to all fonts. - -CHANGES -------- -20 October 1998 - Cleaned up some more spacing problems and added the floor - and ceiling glyphs. - -15 October 1998 - Cleaned up some spacing problems with digits. - Added Klingon to the PUA font. - -02 October 1998 - Changed U+0123 to the preferred Latvian form. - Cleaned up some of the Arabic digits. - Made the alternate Georgian font into a general alternate - glyph font. Added some alternate Arabic glyphs for Urdu - digits and letters. Added the g-cedilla as an alternate - glyph. - -03 September 1998 - Fixed some math character metrics. - -09 September 1998 - Finished the Arabic blocks. - -12 July 1998 - Added proposed Cyrillic glyphs for Kildin S�mi. - -12 July 1998 - Borrowed the Ethiopic glyphs from ethiomx12-uni.bdf. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-mutt-misc-X11R7.0-1.0.0/configure.ac new/font-mutt-misc-1.0.1/configure.ac --- old/font-mutt-misc-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:25.000000000 +0100 +++ new/font-mutt-misc-1.0.1/configure.ac 2009-10-11 01:44:32.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-mutt-misc, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-mutt-misc) +AC_INIT(font-mutt-misc, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-mutt-misc) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/misc -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([misc]) +XORG_FONT_BDF_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-mutt-misc-X11R7.0-1.0.0/missing new/font-mutt-misc-1.0.1/missing --- old/font-mutt-misc-X11R7.0-1.0.0/missing 2005-12-21 09:20:26.000000000 +0100 +++ new/font-mutt-misc-1.0.1/missing 2009-10-11 03:25:14.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-schumacher-misc-X11R7.0-1.0.0.tar.bz2 -> font-schumacher-misc-1.1.0.tar.bz2 ++++++ ++++ 17296 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-schumacher-misc-X11R7.0-1.0.0/ChangeLog new/font-schumacher-misc-1.1.0/ChangeLog --- old/font-schumacher-misc-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:26.000000000 +0100 +++ new/font-schumacher-misc-1.1.0/ChangeLog 2009-10-11 03:25:55.000000000 +0200 @@ -1,33 +1,191 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit b6aa5679baa7897fec72eb6da4188f2109360aed +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:46:50 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-schumacher-misc 1.1.0 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit d4d3b2091ae3faa09d9a0aab2e9f90f00114840e +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 20:15:00 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 8d5dbbe02d2197ffa87de2ba51f4ffdee9ac3107 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:29 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit 677062e4623446d0edb222d14c1b0398f44e5526 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Sep 23 23:39:07 2009 -0700 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Stop trying to run bdftruncate with perl now that it's a C program + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 81881c2da9610cdfccf61685a091dbf5db7c415b +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:08 2009 -0200 - * Makefile.am: - * configure.ac: - Add configure options to change the installed font dir and - disable ISO8859-* fonts. + Janitor: Correct make distcheck and configure.ac simplification -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 8ca2261df425c58a994e4c1a98984f6c0a5f036d +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * configure.ac: - Update package version number for RC1 release. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> +commit 7c5abf91afb8c9cfed25c1e4bad01562e86c7b04 +Author: Jeremy Lainé <jeremy.laine@m4x.org> +Date: Sat Oct 25 20:07:14 2008 +0200 + + Respect the $PKG_CONFIG variable (bug#8185) + + Signed-off-by: Julien Cristau <jcristau@debian.org> + +commit 8a8c7dcea97e48bff9808e5f7e47aee5cb0f092b +Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> +Date: Sat Apr 19 22:24:24 2008 +0100 + + Changes from http://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html since 2004-11-28 + + - removed all wide and full-width characters + + - moved wide angle brackets U+2329/232A to + mathematical angle brackets U+27E8/27E9 + + - added U+20AF DRACHMA SIGN + +commit b2c2f965d55a099902daf53a8ac56cf3d6236d42 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Apr 17 01:07:56 2008 -0400 + + Remove bogus glyphs for characters uni30D0, uni30D1, uni30D2 and uni30D3 + The 6x12 pixel roman variant had four inaccurate glyphs in the Katakana + Range (Katakana ba, Pa, Hi, Bi). None of the other fonts in this family + have any glyphs in that character range, nor did R6x12 have any other + Katakana glyphs. + +commit 2786980b0d65c9518a8b2e7484ff6fcc01ab46af +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:38:06 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 72ae5d8f357f7d621947e254e4cb71e2db0841da +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:20 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 85f93ce2e941c104d31a92da623640cf4610c027 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:45 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 9dfd962b3683d56e679044fd10ce5be6282ad79b +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:26 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 7b44d8fa23eb29b1dfc6685725a2c1cff99be63f +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:54 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit 441431632d1f9d1b9f37143f706d7ed739d8e499 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:40 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit cc129f811a1bb335cc82f2822b380ef90cae8544 +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:16 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit f130c68378919289ad8d7a1d1ebb9d2fb771dc0a +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:21 2005 +0000 + + Add .cvsignores for fonts. + +commit 4f4486cc02dcea3ebd8b4c10432bbe006b59acc5 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:26:47 2005 +0000 + + Add configure options to change the installed font dir and disable + ISO8859-* fonts. + +commit c5d4fd410bdeb9d5c197f4dcb3fe9edc8acf3a59 +Author: Kevin E Martin <kem@kem.org> +Date: Wed Oct 19 02:48:08 2005 +0000 + + Update package version number for RC1 release. + +commit fc6248859c29dbe39a9d9c9926a36ecb6b4693ed +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Sun Oct 2 18:19:54 2005 +0000 + + Add explicit all-local targets so Solaris make can build, since it won't + recursively follow the implicit targets (.bdf -> -ISO-8859-1.bdf -> + pcf.gz) + Fix a couple of remaining GNU-make-isms + +commit d92e1e3b3b93108708d96968b938a151c3c550e0 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:49 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 14b3f5680dbd6e6963b0df28fe6a0f44c6b41def +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 22 04:13:44 2005 +0000 + + Fix distcheck for fonts with multiple encodings + +commit bffc96da62136c690033cc7f003f4caab249e0aa +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:06 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit 091c83502d80a60e59d67d41e44ebf414cf5e589 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:08 2005 +0000 + + Initial build system files for font module + +commit c79ce532d4fc2bf10a9d3af11eb06b3b5e9880ef +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit bb2d9cb5b946b9ea63affd297a5bc449553cf8ee +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:34 2003 +0000 + + R6.6 is the Xorg base-line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-schumacher-misc-X11R7.0-1.0.0/Makefile.am new/font-schumacher-misc-1.1.0/Makefile.am --- old/font-schumacher-misc-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:16.000000000 +0100 +++ new/font-schumacher-misc-1.1.0/Makefile.am 2009-10-08 05:17:11.000000000 +0200 @@ -56,84 +56,84 @@ TRUNC_FONT_FILES = $(BDF2UCS_FONT_FILES) BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) TRUNC_BDF_FILES = $(TRUNC_FONT_FILES:%=%t.bdf) -TRUNC_PCF_FILES = $(TRUNC_FONT_FILES:%=%.pcf.gz) +TRUNC_PCF_FILES = $(TRUNC_FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) if ISO8859_1 ISO8859_1_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.bdf) -ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.pcf.gz) +ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_2 ISO8859_2_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.bdf) -ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.pcf.gz) +ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_3 ISO8859_3_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.bdf) -ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.pcf.gz) +ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_4 ISO8859_4_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.bdf) -ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.pcf.gz) +ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_5 ISO8859_5_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-5.bdf) -ISO8859_5_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-5.pcf.gz) +ISO8859_5_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-5.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_7 ISO8859_7_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-7.bdf) -ISO8859_7_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-7.pcf.gz) +ISO8859_7_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-7.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_8 ISO8859_8_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-8.bdf) -ISO8859_8_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-8.pcf.gz) +ISO8859_8_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-8.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_9 ISO8859_9_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.bdf) -ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.pcf.gz) +ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_10 ISO8859_10_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.bdf) -ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.pcf.gz) +ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_13 ISO8859_13_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.bdf) -ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.pcf.gz) +ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_14 ISO8859_14_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.bdf) -ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.pcf.gz) +ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_15 ISO8859_15_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.bdf) -ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.pcf.gz) +ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.pcf$(COMPRESS_SUFFIX)) endif if ISO8859_16 ISO8859_16_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-16.bdf) -ISO8859_16_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-16.pcf.gz) +ISO8859_16_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-16.pcf$(COMPRESS_SUFFIX)) endif if KOI8_R KOI8_R_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-KOI8-R.bdf) -KOI8_R_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-KOI8-R.pcf.gz) +KOI8_R_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-KOI8-R.pcf$(COMPRESS_SUFFIX)) endif UTIL_DIR = @MAPFILES_PATH@ -SUFFIXES = .bdf .pcf.gz t.bdf \ +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) t.bdf \ -ISO8859-1.bdf \ -ISO8859-2.bdf \ -ISO8859-3.bdf \ @@ -149,73 +149,73 @@ -ISO8859-16.bdf \ -KOI8-R.bdf -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ .bdft.bdf: @rm -f $@ - $(PERL) $(BDFTRUNCATE) 0x3200 < $< > $@ + $(BDFTRUNCATE) 0x3200 < $< > $@ .bdf-ISO8859-1.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-1 ISO8859-1 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-1 ISO8859-1 .bdf-ISO8859-2.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-2 ISO8859-2 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-2 ISO8859-2 .bdf-ISO8859-3.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-3 ISO8859-3 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-3 ISO8859-3 .bdf-ISO8859-4.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-4 ISO8859-4 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-4 ISO8859-4 .bdf-ISO8859-5.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-5 ISO8859-5 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-5 ISO8859-5 .bdf-ISO8859-7.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-7 ISO8859-7 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-7 ISO8859-7 .bdf-ISO8859-8.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-8 ISO8859-8 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-8 ISO8859-8 .bdf-ISO8859-9.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-9 ISO8859-9 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-9 ISO8859-9 .bdf-ISO8859-10.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-10 ISO8859-10 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-10 ISO8859-10 .bdf-ISO8859-13.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-13 ISO8859-13 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-13 ISO8859-13 .bdf-ISO8859-14.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-14 ISO8859-14 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-14 ISO8859-14 .bdf-ISO8859-15.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-15 ISO8859-15 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-15 ISO8859-15 .bdf-ISO8859-16.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-16 ISO8859-16 + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-16 ISO8859-16 .bdf-KOI8-R.bdf: @rm -f $@ - $(UCS2ANY) $< $(UTIL_DIR)/map-KOI8-R KOI8-R + $(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-KOI8-R KOI8-R -t.bdf.pcf.gz: +t.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = \ @@ -251,15 +251,24 @@ $(KOI8_R_BDF_FILES) CLEANFILES = $(font_DATA) $(TRUNC_BDF_FILES) $(BUILT_BDF_FILES) -EXTRA_DIST = $(BDF_FILES) autogen.sh +EXTRA_DIST = $(BDF_FILES) all-local: $(BUILT_BDF_FILES) $(font_DATA) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-schumacher-misc-X11R7.0-1.0.0/README new/font-schumacher-misc-1.1.0/README --- old/font-schumacher-misc-X11R7.0-1.0.0/README 2005-07-01 00:28:08.000000000 +0200 +++ new/font-schumacher-misc-1.1.0/README 2009-10-08 04:41:07.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/schumacher-misc + + http://cgit.freedesktop.org/xorg/font/schumacher-misc + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-schumacher-misc-X11R7.0-1.0.0/autogen.sh new/font-schumacher-misc-1.1.0/autogen.sh --- old/font-schumacher-misc-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:08.000000000 +0200 +++ new/font-schumacher-misc-1.1.0/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-schumacher-misc-X11R7.0-1.0.0/clR6x12.bdf new/font-schumacher-misc-1.1.0/clR6x12.bdf --- old/font-schumacher-misc-X11R7.0-1.0.0/clR6x12.bdf 2003-11-14 17:48:41.000000000 +0100 +++ new/font-schumacher-misc-1.1.0/clR6x12.bdf 2008-04-25 05:06:21.000000000 +0200 @@ -46,7 +46,7 @@ CAP_HEIGHT 8 X_HEIGHT 5 ENDPROPERTIES -CHARS 1197 +CHARS 1194 STARTCHAR char0 ENCODING 0 SWIDTH 480 0 @@ -15684,6 +15684,25 @@ 00 00 ENDCHAR +STARTCHAR uni20AF +ENCODING 8367 +SWIDTH 480 0 +DWIDTH 6 0 +BBX 6 12 0 -3 +BITMAP +00 +40 +E0 +50 +48 +48 +48 +E8 +D0 +00 +00 +00 +ENDCHAR STARTCHAR uni20D0 ENCODING 8400 SWIDTH 480 0 @@ -18344,44 +18363,6 @@ 20 00 ENDCHAR -STARTCHAR angleleft -ENCODING 9001 -SWIDTH 480 0 -DWIDTH 6 0 -BBX 6 12 0 -3 -BITMAP -10 -10 -20 -20 -40 -20 -20 -10 -10 -00 -00 -00 -ENDCHAR -STARTCHAR angleright -ENCODING 9002 -SWIDTH 480 0 -DWIDTH 6 0 -BBX 6 12 0 -3 -BITMAP -40 -40 -20 -20 -10 -20 -20 -40 -40 -00 -00 -00 -ENDCHAR STARTCHAR uni23BA ENCODING 9146 SWIDTH 480 0 @@ -22657,79 +22638,41 @@ 08 00 ENDCHAR -STARTCHAR uni30D0 -ENCODING 12496 +STARTCHAR uni27E8 +ENCODING 10216 SWIDTH 480 0 DWIDTH 6 0 BBX 6 12 0 -3 BITMAP +10 +10 +20 +20 40 -F8 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -ENDCHAR -STARTCHAR uni30D1 -ENCODING 12497 -SWIDTH 480 0 -DWIDTH 6 0 -BBX 6 12 0 -3 -BITMAP +20 +20 +10 10 -F8 -00 -00 -00 -00 -00 -00 -00 00 00 00 ENDCHAR -STARTCHAR uni30D2 -ENCODING 12498 +STARTCHAR uni27E9 +ENCODING 10217 SWIDTH 480 0 DWIDTH 6 0 BBX 6 12 0 -3 BITMAP +40 +40 20 20 +10 20 20 -20 -20 -20 -20 -20 -20 -20 -20 -ENDCHAR -STARTCHAR uni30D3 -ENCODING 12499 -SWIDTH 480 0 -DWIDTH 6 0 -BBX 6 12 0 -3 -BITMAP -00 +40 +40 00 -20 -20 -20 -20 -20 -20 -20 -20 00 00 ENDCHAR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-schumacher-misc-X11R7.0-1.0.0/configure.ac new/font-schumacher-misc-1.1.0/configure.ac --- old/font-schumacher-misc-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:26.000000000 +0100 +++ new/font-schumacher-misc-1.1.0/configure.ac 2009-10-11 02:46:46.000000000 +0200 @@ -22,47 +22,31 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-schumacher-misc, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-schumacher-misc) +AC_INIT(font-schumacher-misc, [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-schumacher-misc) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROGS(PERL, perl perl5) -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(BDFTRUNCATE, bdftruncate) -AC_PATH_PROG(UCS2ANY, ucs2any) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/misc -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) - -PKG_CHECK_MODULES(MAPS, [fontutil]) -MAPFILES_PATH=$(pkg-config --variable=mapdir fontutil) -AC_SUBST(MAPFILES_PATH) - -XORG_FONT_CHECK_ISO8859_1 -XORG_FONT_CHECK_ISO8859_2 -XORG_FONT_CHECK_ISO8859_3 -XORG_FONT_CHECK_ISO8859_4 -XORG_FONT_CHECK_ISO8859_5 -XORG_FONT_CHECK_ISO8859_7 -XORG_FONT_CHECK_ISO8859_8 -XORG_FONT_CHECK_ISO8859_9 -XORG_FONT_CHECK_ISO8859_10 -XORG_FONT_CHECK_ISO8859_13 -XORG_FONT_CHECK_ISO8859_14 -XORG_FONT_CHECK_ISO8859_15 -XORG_FONT_CHECK_ISO8859_16 -XORG_FONT_CHECK_KOI8_R +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) + +XORG_FONTDIR([misc]) +XORG_FONT_BDF_UTILS +XORG_FONT_UCS2ANY + +XORG_FONT_CHECK_ENCODING_LIST([ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 + ISO8859-5 ISO8859-7 ISO8859-8 ISO8859-9 + ISO8859-10 ISO8859-11 ISO8859-13 ISO8859-14 + ISO8859-15 ISO8859-16 KOI8-R]) -XORG_RELEASE_VERSION AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-schumacher-misc-X11R7.0-1.0.0/missing new/font-schumacher-misc-1.1.0/missing --- old/font-schumacher-misc-X11R7.0-1.0.0/missing 2005-12-21 09:20:35.000000000 +0100 +++ new/font-schumacher-misc-1.1.0/missing 2009-10-11 03:25:45.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-screen-cyrillic-1.0.1.tar.bz2 -> font-screen-cyrillic-1.0.2.tar.bz2 ++++++ ++++ 13288 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-screen-cyrillic-1.0.1/ChangeLog new/font-screen-cyrillic-1.0.2/ChangeLog --- old/font-screen-cyrillic-1.0.1/ChangeLog 2006-11-08 18:24:00.000000000 +0100 +++ new/font-screen-cyrillic-1.0.2/ChangeLog 2009-10-11 03:26:30.000000000 +0200 @@ -1,26 +1,173 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit a1fcf7698de7627fb2538d985875dea66b7b15a0 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:49:17 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-screen-cyrillic 1.0.2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit ab7eef00ed18c0f16e0fe751da9b2c68e9884f89 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 19:59:19 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 52fe033642ea1dab4728dd46e4d7c54a78007012 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:30 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit 090025a0099118509ebad01d80f149cb602e2a63 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:08 2009 -0200 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Janitor: Correct make distcheck and configure.ac simplification -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit f4ff2860fa99bbbbb217353a53b5815eb7c19de4 +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> + +commit 491edb0127e6642772d54dbc2ef70e7d120393a6 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:38:06 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 0dadf80fea0b8b23e9469e6cc20ab9361cec3208 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:21 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 1c6a0c15e28c2d03f139e7087c2ff67560511042 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:46 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 856dd7d697de378518d4751f0caef2bcf8471308 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Nov 8 19:25:01 2006 +0200 + + bump to 1.0.1 + +commit 54f5b61cfcaae96b45b8008da4d5e975862ecf75 +Author: Jeremy C. Reed <reed@glacier.reedmedia.net> +Date: Tue Oct 17 14:44:22 2006 -0500 + + Add license from Andrey via Mikhail on xorg list. + See: http://lists.freedesktop.org/archives/xorg/2006-October/018866.html + +commit f94b7e6fbe7f6bdc93d34e35ec83711b0052e807 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:26 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 19fb5edcd1eff7591ed4e89dd1c3e6551834192f +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:54 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit 9f6d4140952949e7edb9a94197c0d933d6376095 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:41 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 56fe52672d05e7481980ffb7690bd7740068f956 +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:16 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit b86744f5802a6a26a7dda2fc72f9c5ac3efd50a5 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:22 2005 +0000 + + Add .cvsignores for fonts. + +commit 444dca607fe5b384168f66136580a4d92345e8c1 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:19 2005 +0000 + + Add configure option to change the installed font dir. + +commit 3d7f88e712a144232da97e9c34f8e38c642af45c +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:49 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 f63198574832c385c6517517441e3489c948c98b +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:06 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit 64ea6aacad62eb974d8a0d9d4a28b34602182aba +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:08 2005 +0000 + + Initial build system files for font module + +commit afc6858a4a6b74f149df3a316d8632e5fc13f1d2 +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 18:43:01 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit d379b6213d492ab8d43e61f5b8d06674dd3e38f8 +Author: Egbert Eich <eich@suse.de> +Date: Sun Mar 14 08:31:10 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 326fadd9d2c7585ad4a469d844f75c5452b329bb +Author: Egbert Eich <eich@suse.de> +Date: Wed Mar 3 12:10:49 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit e65d88375b44408faf4786d66cd1b196008a97f5 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:35:10 2004 +0000 + + readding XFree86's cvs IDs + +commit f08bd2bb044c70ff483320d37b50179d692e0bb8 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 09:22:22 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit fe401c4a54ff8a27d61ff272beaae3edbf8a8407 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:41 2003 +0000 + + XFree86 4.3.0.1 + +commit 4b875cfb4290fd28660f450b25481acaa6d94c49 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:41 2003 +0000 + + Initial revision diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-screen-cyrillic-1.0.1/Makefile.am new/font-screen-cyrillic-1.0.2/Makefile.am --- old/font-screen-cyrillic-1.0.1/Makefile.am 2006-11-08 18:24:00.000000000 +0100 +++ new/font-screen-cyrillic-1.0.2/Makefile.am 2009-10-08 04:43:50.000000000 +0200 @@ -24,25 +24,34 @@ screen8x16 BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) -SUFFIXES = .bdf .pcf.gz +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) CLEANFILES = $(font_DATA) -EXTRA_DIST = $(BDF_FILES) autogen.sh +EXTRA_DIST = $(BDF_FILES) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-screen-cyrillic-1.0.1/README new/font-screen-cyrillic-1.0.2/README --- old/font-screen-cyrillic-1.0.1/README 2006-11-08 18:24:00.000000000 +0100 +++ new/font-screen-cyrillic-1.0.2/README 2009-10-07 04:14:30.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/screen-cyrillic + + http://cgit.freedesktop.org/xorg/font/screen-cyrillic + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-screen-cyrillic-1.0.1/autogen.sh new/font-screen-cyrillic-1.0.2/autogen.sh --- old/font-screen-cyrillic-1.0.1/autogen.sh 2006-11-08 18:24:00.000000000 +0100 +++ new/font-screen-cyrillic-1.0.2/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-screen-cyrillic-1.0.1/configure.ac new/font-screen-cyrillic-1.0.2/configure.ac --- old/font-screen-cyrillic-1.0.1/configure.ac 2006-11-08 18:24:27.000000000 +0100 +++ new/font-screen-cyrillic-1.0.2/configure.ac 2009-10-11 01:44:32.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-screen-cyrillic, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-screen-cyrillic) +AC_INIT(font-screen-cyrillic, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-screen-cyrillic) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/cyrillic -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([cyrillic]) +XORG_FONT_BDF_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-screen-cyrillic-1.0.1/missing new/font-screen-cyrillic-1.0.2/missing --- old/font-screen-cyrillic-1.0.1/missing 2006-11-08 18:24:56.000000000 +0100 +++ new/font-screen-cyrillic-1.0.2/missing 2009-10-11 03:26:21.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +44,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -86,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create `y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + Send bug reports to <bug-automake@gnu.org>." exit $? ;; @@ -103,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). -case "$1" in - lex|yacc) +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: `tar' requires --run" exit 1 @@ -135,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $program in aclocal*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if @@ -145,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the @@ -154,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want @@ -164,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -184,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: `$1' is needed, but is $msg. You might have modified some files without having the @@ -192,8 +203,8 @@ You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -207,80 +218,78 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file @@ -289,11 +298,17 @@ DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -303,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -317,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -356,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: ++++++ font-sony-misc-X11R7.0-1.0.0.tar.bz2 -> font-sony-misc-1.0.1.tar.bz2 ++++++ ++++ 15489 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-sony-misc-X11R7.0-1.0.0/ChangeLog new/font-sony-misc-1.0.1/ChangeLog --- old/font-sony-misc-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:26.000000000 +0100 +++ new/font-sony-misc-1.0.1/ChangeLog 2009-10-11 03:27:00.000000000 +0200 @@ -1,26 +1,130 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 7cbddbd4fa260cd472fb91d965a440cecffe92c8 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:50:47 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-sony-misc 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit cc1432e5e006222281cf0cd698e649a6150240bf +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 20:02:13 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit d2685c6dab9b0892f2f4387379e5bb6a199c765f +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:30 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit 9ae88cb1becdfd76d27f42ad07dd3745b6952da2 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:08 2009 -0200 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Janitor: Correct make distcheck and configure.ac simplification -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit d9d49b57505bfffe99a5281423e7cf629f2dd2ab +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> + +commit dfd7a1b27d2da86843aeace1c4ff76d95c44eed2 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:38:06 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 3323bb5bf80a9d1a2cd81eef84197e62de8fa853 +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:23 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 31804138e4484dab22a63b5682c769e073cdd410 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:47 2007 -0400 + + Rename .cvsignore to .gitignore + +commit a5317ca1375a9d39a01482ad711a675497902819 +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:26 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 6facaa31e1255a4d07294b5813afba673b6ec3db +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:54 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit e30e7c31040ed643b0ad54883e36e99de4d65fc4 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:41 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 89c7c56c91d8a3f9a824be89bb4b9d04d9253932 +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:16 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit 9a21681abd4db294f0c20fe912c1ee5abbc69be7 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:22 2005 +0000 + + Add .cvsignores for fonts. + +commit 6dad07b803a33509c789974647d0911c2ed2a7c7 +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:19 2005 +0000 + + Add configure option to change the installed font dir. + +commit 8932d6c031e59a59752d7adeba2e230a872529e1 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:49 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 e5b5d58706b139fdc485dd4fd23447ab18f55d1d +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:06 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit 0a1faa0f78443028aed94eef8f1608c28511748e +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:08 2005 +0000 + + Initial build system files for font module + +commit 60ea1a5db86c86a1a6536ef3c1162684486fc548 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:41 2003 +0000 + + XFree86 4.3.0.1 + +commit da33321bc2273c0a49e1cc3b3ef4ca3ac698ddc8 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:34 2003 +0000 + + R6.6 is the Xorg base-line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-sony-misc-X11R7.0-1.0.0/Makefile.am new/font-sony-misc-1.0.1/Makefile.am --- old/font-sony-misc-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:16.000000000 +0100 +++ new/font-sony-misc-1.0.1/Makefile.am 2009-10-08 04:59:52.000000000 +0200 @@ -26,25 +26,34 @@ 8x16rk BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) -SUFFIXES = .bdf .pcf.gz +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) CLEANFILES = $(font_DATA) -EXTRA_DIST = $(BDF_FILES) autogen.sh +EXTRA_DIST = $(BDF_FILES) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-sony-misc-X11R7.0-1.0.0/README new/font-sony-misc-1.0.1/README --- old/font-sony-misc-X11R7.0-1.0.0/README 2005-07-01 00:28:08.000000000 +0200 +++ new/font-sony-misc-1.0.1/README 2009-10-07 04:14:30.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/sony-misc + + http://cgit.freedesktop.org/xorg/font/sony-misc + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-sony-misc-X11R7.0-1.0.0/autogen.sh new/font-sony-misc-1.0.1/autogen.sh --- old/font-sony-misc-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:08.000000000 +0200 +++ new/font-sony-misc-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-sony-misc-X11R7.0-1.0.0/configure.ac new/font-sony-misc-1.0.1/configure.ac --- old/font-sony-misc-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:26.000000000 +0100 +++ new/font-sony-misc-1.0.1/configure.ac 2009-10-11 01:44:32.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-sony-misc, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-sony-misc) +AC_INIT(font-sony-misc, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-sony-misc) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/misc -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([misc]) +XORG_FONT_BDF_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-sony-misc-X11R7.0-1.0.0/missing new/font-sony-misc-1.0.1/missing --- old/font-sony-misc-X11R7.0-1.0.0/missing 2005-12-21 09:20:48.000000000 +0100 +++ new/font-sony-misc-1.0.1/missing 2009-10-11 03:26:51.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-sun-misc-X11R7.0-1.0.0.tar.bz2 -> font-sun-misc-1.0.1.tar.bz2 ++++++ ++++ 15480 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-sun-misc-X11R7.0-1.0.0/ChangeLog new/font-sun-misc-1.0.1/ChangeLog --- old/font-sun-misc-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:26.000000000 +0100 +++ new/font-sun-misc-1.0.1/ChangeLog 2009-10-11 03:27:23.000000000 +0200 @@ -1,26 +1,138 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit f482e497e9b65a1c2e913c3ed69b1460e5f92bdc +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:51:16 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-sun-misc 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit ed92e73073b7bc73d384f03fbee5102e5aaee3c2 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 20:04:59 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 19ea2388dbb79584a7f90b938ca76e4b05b91461 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:30 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit 85abbc64c528f92fd7318f7a66fa4073900bc995 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Jul 8 10:46:21 2009 -0400 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + sun-misc: use XORG_CHANGELOG macro to create ChangeLog. #22611 + + Build break: Makefile.am: command not found: git-log + Adding the macro in configure.ac and use it in Makefile.am + Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 + Tested: running autogen.sh, make and 'make dist' + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 25e53a28bdb918f3f7bcb065ddd37e2257dcb996 +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> + +commit 340ebc5fc343762ed6d41a24e29d9d83136e753b +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:38:07 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 8c8a72a83311a2cbfb1933edb8982be3502ad30f +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:23 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 3be5dfb3858f2d887f9e0de8488481ca0091b5d4 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:49 2007 -0400 + + Rename .cvsignore to .gitignore + +commit d5e653f960b1880383f7e91faa091646ebccc51a +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:26 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 245e01e8aee5780bd17d2d4a510c9403858f49dc +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:54 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit 5df57f4fb0f1095f181e8c4a84aebe660f7f08f5 +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:41 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit c71cdbd9145ff22dba57f2c2e108e582a9339495 +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:16 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit baedbc8948a434d530c6c7bbbde8935bd004d2e3 +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:22 2005 +0000 + + Add .cvsignores for fonts. + +commit 8a7ab14ca6417da7ba58ba8c06f3d84d8984500d +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:20 2005 +0000 + + Add configure option to change the installed font dir. + +commit e2e6565eebd69f9cf2f178db1313dfa639a5d627 +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:49 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 323fd5b9d931a22296ceb35d0f6c3c736a033d5f +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:06 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit e62c4a519ea35394def1371a5d8d3362211e7e4a +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:08 2005 +0000 + + Initial build system files for font module + +commit 8f4d515d749012fe92af62003b4c0a1d43baf981 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit 48fae96105ba1557e7c1749c0078bb4d5254a45a +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 15:54:35 2003 +0000 + + R6.6 is the Xorg base-line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-sun-misc-X11R7.0-1.0.0/Makefile.am new/font-sun-misc-1.0.1/Makefile.am --- old/font-sun-misc-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:16.000000000 +0100 +++ new/font-sun-misc-1.0.1/Makefile.am 2009-10-08 05:04:06.000000000 +0200 @@ -27,13 +27,13 @@ olgl19 BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) -SUFFIXES = .bdf .pcf.gz +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) @@ -42,10 +42,19 @@ EXTRA_DIST = $(BDF_FILES) autogen.sh install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-sun-misc-X11R7.0-1.0.0/README new/font-sun-misc-1.0.1/README --- old/font-sun-misc-X11R7.0-1.0.0/README 2005-07-01 00:28:08.000000000 +0200 +++ new/font-sun-misc-1.0.1/README 2009-10-07 04:14:30.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/sun-misc + + http://cgit.freedesktop.org/xorg/font/sun-misc + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-sun-misc-X11R7.0-1.0.0/configure.ac new/font-sun-misc-1.0.1/configure.ac --- old/font-sun-misc-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:26.000000000 +0100 +++ new/font-sun-misc-1.0.1/configure.ac 2009-10-11 01:44:32.000000000 +0200 @@ -22,25 +22,24 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-sun-misc, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-sun-misc) +AC_INIT(font-sun-misc, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-sun-misc) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/misc -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([misc]) +XORG_FONT_BDF_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-sun-misc-X11R7.0-1.0.0/missing new/font-sun-misc-1.0.1/missing --- old/font-sun-misc-X11R7.0-1.0.0/missing 2005-12-21 09:20:55.000000000 +0100 +++ new/font-sun-misc-1.0.1/missing 2009-10-11 03:27:16.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-winitzki-cyrillic-X11R7.0-1.0.0.tar.bz2 -> font-winitzki-cyrillic-1.0.1.tar.bz2 ++++++ ++++ 15518 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-winitzki-cyrillic-X11R7.0-1.0.0/ChangeLog new/font-winitzki-cyrillic-1.0.1/ChangeLog --- old/font-winitzki-cyrillic-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:26.000000000 +0100 +++ new/font-winitzki-cyrillic-1.0.1/ChangeLog 2009-10-11 03:28:20.000000000 +0200 @@ -1,26 +1,160 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit d302ef5f07b8abfa3883ab094de457f686ccc494 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:51:57 2009 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + font-winitzki-cyrillic 1.0.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 6e3050400a87993616fceec7ab8188b89a6b4156 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 20:06:32 2009 -0700 - * configure.ac: - Add m4 magic to allow AS_HELP_STRING to work with older versions - of autoconf 2.57. + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 4c32e24528294394f0fb8f095bf9aa860c75b5df +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:31 2009 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> -2005-11-23 Eric Anholt <anholt@FreeBSD.org> +commit 099261ffb519e871c9ded98872a1f14a6645ea0b +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:08 2009 -0200 - * Makefile.am: - Use $< instead of $^ to be portable to FreeBSD's make. + Janitor: Correct make distcheck and configure.ac simplification -2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 99979c1c2c74aa8db498392528defac50e0c46b9 +Author: Andres Salomon <dilinger@debian.org> +Date: Sat Oct 25 20:50:21 2008 +0200 - * Makefile.am: - * configure.ac: - Add configure option to change the installed font dir. + Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found + + Signed-off-by: Julien Cristau <jcristau@debian.org> + +commit 278dc5aae467690cd7c9b67b7f59f90d016c3e79 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Dec 6 16:38:08 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 487b32a11054b0e2a921871dd32a283e7a6c831d +Author: James Cloos <cloos@jhcloos.com> +Date: Mon Sep 3 05:53:25 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit b4abbe682e3ad934b43ff6a032084e209cd02a00 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Aug 23 19:26:52 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 38e2252d3236e0d51f3d1b4d565517ca8273febc +Author: Kevin E Martin <kem@kem.org> +Date: Thu Dec 15 00:24:26 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 2003a353de16f1c711f1652695da650af852eafd +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 17:08:54 2005 +0000 + + Add m4 magic to allow AS_HELP_STRING to work with older versions of + autoconf 2.57. + +commit 79258722ace4ccc38f56c840e5ca56ed868e286a +Author: Kevin E Martin <kem@kem.org> +Date: Sat Dec 3 05:49:41 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit c7fa8e6e6d640ee677455fa13d8a6d38f1ea02dc +Author: Eric Anholt <anholt@freebsd.org> +Date: Thu Nov 24 05:21:16 2005 +0000 + + Bug #5122: Use $< instead of $^ to be portable to FreeBSD's make. + +commit 30ee97080785c9fcbf86e907fd05e3b300b8ae6b +Author: Eric Anholt <anholt@freebsd.org> +Date: Tue Nov 22 02:00:22 2005 +0000 + + Add .cvsignores for fonts. + +commit f32715e8014c110a868f7cabc7ab93e69b2c54eb +Author: Kevin E Martin <kem@kem.org> +Date: Tue Nov 15 08:29:20 2005 +0000 + + Add configure option to change the installed font dir. + +commit fcbfa2df3c9ddc9b1ddfc66531381d18f0ec3fed +Author: Kevin E Martin <kem@kem.org> +Date: Fri Jul 29 21:22:49 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 e36ad8fd67868eff93e8125f7f54ac97af08402e +Author: Alan Coopersmith <Alan.Coopersmith@sun.com> +Date: Tue Jul 19 02:40:06 2005 +0000 + + Convert $(foreach...) to more portable suffix substitution rules + +commit ef4585efc4105abdba4db58942f8e5e34f26b95d +Author: Kevin E Martin <kem@kem.org> +Date: Thu Jun 30 22:28:09 2005 +0000 + + Initial build system files for font module + +commit 8a8522666f81423b386abf3a94ab266b65138d33 +Author: Egbert Eich <eich@suse.de> +Date: Fri Apr 23 18:43:01 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 46f9bf49b68969a4c1c4086c8c6acc7888436b40 +Author: Egbert Eich <eich@suse.de> +Date: Sun Mar 14 08:31:10 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 2f952aa85301772168bff48ac77d8d6e2d66542b +Author: Egbert Eich <eich@suse.de> +Date: Wed Mar 3 12:10:49 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 65baf7d802c7ead77e66638d1517e1d01cfc647e +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 13:35:10 2004 +0000 + + readding XFree86's cvs IDs + +commit a4a9ef37125fe9b2e1266400db4a85d1591a5247 +Author: Egbert Eich <eich@suse.de> +Date: Thu Feb 26 09:22:22 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit f7ccb21c8db14690f606f4a4c5c8b44b9a35e1f3 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:41 2003 +0000 + + XFree86 4.3.0.1 + +commit 72ae3ed3d984a33ebad9c8cab3edd69f39643e38 +Author: Kaleb Keithley <kaleb@freedesktop.org> +Date: Fri Nov 14 16:48:41 2003 +0000 + + Initial revision diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-winitzki-cyrillic-X11R7.0-1.0.0/Makefile.am new/font-winitzki-cyrillic-1.0.1/Makefile.am --- old/font-winitzki-cyrillic-X11R7.0-1.0.0/Makefile.am 2005-11-24 06:21:16.000000000 +0100 +++ new/font-winitzki-cyrillic-1.0.1/Makefile.am 2009-10-08 05:05:39.000000000 +0200 @@ -23,25 +23,34 @@ proof9x16 BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) -SUFFIXES = .bdf .pcf.gz +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) CLEANFILES = $(font_DATA) -EXTRA_DIST = $(BDF_FILES) autogen.sh +EXTRA_DIST = $(BDF_FILES) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-winitzki-cyrillic-X11R7.0-1.0.0/README new/font-winitzki-cyrillic-1.0.1/README --- old/font-winitzki-cyrillic-X11R7.0-1.0.0/README 2005-07-01 00:28:09.000000000 +0200 +++ new/font-winitzki-cyrillic-1.0.1/README 2009-10-07 04:14:31.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/winitzki-cyrillic + + http://cgit.freedesktop.org/xorg/font/winitzki-cyrillic + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-winitzki-cyrillic-X11R7.0-1.0.0/autogen.sh new/font-winitzki-cyrillic-1.0.1/autogen.sh --- old/font-winitzki-cyrillic-X11R7.0-1.0.0/autogen.sh 2005-07-01 00:28:09.000000000 +0200 +++ new/font-winitzki-cyrillic-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-winitzki-cyrillic-X11R7.0-1.0.0/configure.ac new/font-winitzki-cyrillic-1.0.1/configure.ac --- old/font-winitzki-cyrillic-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:26.000000000 +0100 +++ new/font-winitzki-cyrillic-1.0.1/configure.ac 2009-10-11 01:44:32.000000000 +0200 @@ -22,25 +22,25 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-winitzki-cyrillic, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-winitzki-cyrillic) +AC_INIT(font-winitzki-cyrillic, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-winitzki-cyrillic) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE + +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + AC_PROG_INSTALL -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/cyrillic -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION +XORG_FONTDIR([cyrillic]) +XORG_FONT_BDF_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-winitzki-cyrillic-X11R7.0-1.0.0/missing new/font-winitzki-cyrillic-1.0.1/missing --- old/font-winitzki-cyrillic-X11R7.0-1.0.0/missing 2005-12-21 09:21:01.000000000 +0100 +++ new/font-winitzki-cyrillic-1.0.1/missing 2009-10-11 03:28:13.000000000 +0200 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -29,6 +31,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -38,18 +42,24 @@ configure_ac=configure.in fi -case "$1" in +msg="missing on your system" + +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -67,6 +77,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -74,11 +85,18 @@ lex create `lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create `y.tab.[ch]', if possible, from existing .[ch]" + yacc create `y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + +Send bug reports to <bug-automake@gnu.org>." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -87,42 +105,69 @@ exit 1 ;; - aclocal*) +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: `tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoconf*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." touch configure ;; - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autoheader*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site." @@ -130,7 +175,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -140,13 +185,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified `Makefile.am', `acinclude.m4' or `${configure_ac}'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site." @@ -155,21 +195,16 @@ while read f; do touch "$f"; done ;; - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + autom4te*) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -183,111 +218,108 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - + help2man*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - + makeinfo*) echo 1>&2 "\ -WARNING: `$1' is missing on your system. You should only need it if +WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy `make' (AIX, DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then - file=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $file` - fi + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; - tar) + tar*) shift - if test -n "$run"; then - echo 1>&2 "ERROR: `tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -300,13 +332,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 @@ -323,8 +355,8 @@ *) echo 1>&2 "\ -WARNING: `$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: `$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the `README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +366,11 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ++++++ font-xfree86-type1-1.0.1.tar.bz2 -> font-xfree86-type1-1.0.2.tar.bz2 ++++++ ++++ 11922 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-xfree86-type1-1.0.1/ChangeLog new/font-xfree86-type1-1.0.2/ChangeLog --- old/font-xfree86-type1-1.0.1/ChangeLog 2008-03-07 02:20:46.000000000 +0100 +++ new/font-xfree86-type1-1.0.2/ChangeLog 2009-10-11 03:28:47.000000000 +0200 @@ -1,3 +1,53 @@ +commit 537e46cc975e3a6ea90b58792c50b812b8564c34 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 17:53:10 2009 -0700 + + font-xfree86-type1 1.0.2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit 7f8f1ccefe2af7677a79ecaeba128856f7ec7b76 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Oct 7 20:13:48 2009 -0700 + + Migrate to xorg macros 1.3 & font-util 1.1 macros + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit 409af7daa6393b96747c7a26573916fc7ea56651 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 6 19:14:31 2009 -0700 + + Add pointers to mailing lists, bugzilla, & git to README + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit 2d8d8f167011c62973be0ab9538c3a7057c65fa4 +Author: Ryan Hill <dirtyepic@gentoo.org> +Date: Sun Aug 16 15:03:06 2009 -0600 + + xfree86-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 <dirtyepic@gentoo.org> + Signed-off-by: Rémi Cardona <remi@gentoo.org> + +commit fb5ea1122156a710a84b71e885e14cdebaf6ac90 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Tue Jan 27 19:11:08 2009 -0200 + + Janitor: Correct make distcheck and configure.ac simplification + +commit c10d7d62778e1259e4ed76304a59814b813ba00c +Author: Andres Salomon <dilinger@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 <jcristau@debian.org> + commit 242c71c56d9c44ea00835ffc50d5ad22c7d40702 Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Thu Mar 6 17:18:40 2008 -0800 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-xfree86-type1-1.0.1/Makefile.am new/font-xfree86-type1-1.0.2/Makefile.am --- old/font-xfree86-type1-1.0.1/Makefile.am 2007-12-08 02:52:13.000000000 +0100 +++ new/font-xfree86-type1-1.0.2/Makefile.am 2009-10-08 05:07:34.000000000 +0200 @@ -25,14 +25,14 @@ fontdir = @FONTDIR@ font_DATA = $(FONT_FILES) -EXTRA_DIST = $(FONT_FILES) autogen.sh +EXTRA_DIST = $(FONT_FILES) install-data-hook: @rm -f $(DESTDIR)$(fontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) - $(FCCACHE) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: @@ -43,6 +43,6 @@ .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) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-xfree86-type1-1.0.1/README new/font-xfree86-type1-1.0.2/README --- old/font-xfree86-type1-1.0.1/README 2006-07-11 05:00:58.000000000 +0200 +++ new/font-xfree86-type1-1.0.2/README 2009-10-07 04:14:31.000000000 +0200 @@ -0,0 +1,24 @@ + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/font/xfree86-type1 + + http://cgit.freedesktop.org/xorg/font/xfree86-type1 + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-xfree86-type1-1.0.1/autogen.sh new/font-xfree86-type1-1.0.2/autogen.sh --- old/font-xfree86-type1-1.0.1/autogen.sh 2006-07-11 05:00:58.000000000 +0200 +++ new/font-xfree86-type1-1.0.2/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-xfree86-type1-1.0.1/configure.ac new/font-xfree86-type1-1.0.2/configure.ac --- old/font-xfree86-type1-1.0.1/configure.ac 2008-03-07 02:16:40.000000000 +0100 +++ new/font-xfree86-type1-1.0.2/configure.ac 2009-10-11 01:44:32.000000000 +0200 @@ -22,25 +22,23 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-xfree86-type1, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-xfree86-type1) +AC_INIT(font-xfree86-type1, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-xfree86-type1) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS AC_PROG_INSTALL -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -DEFAULT_FONTDIR=${libdir}/X11/fonts/Type1 -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) - -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) -AC_PATH_PROG(FCCACHE, fc-cache) - -XORG_RELEASE_VERSION +XORG_FONTDIR([Type1]) +XORG_FONT_SCALED_UTILS AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/font-xfree86-type1-1.0.1/missing new/font-xfree86-type1-1.0.2/missing --- old/font-xfree86-type1-1.0.1/missing 2008-03-07 02:20:40.000000000 +0100 +++ new/font-xfree86-type1-1.0.2/missing 2009-10-11 03:28:37.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create `y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + Send bug reports to <bug-automake@gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: `tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: `$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org