debian/changelog | 11 debian/control | 4 debian/copyright | 284 ++++++++- fslsfonts/COPYING | 45 + fslsfonts/ChangeLog | 184 +++++- fslsfonts/INSTALL | 236 ------- fslsfonts/Makefile.am | 12 fslsfonts/Makefile.in | 147 ++-- fslsfonts/aclocal.m4 | 1434 +++++++++++++++++++++++----------------------- fslsfonts/compile | 142 ---- fslsfonts/config.guess | 32 - fslsfonts/config.sub | 48 + fslsfonts/configure | 206 +++--- fslsfonts/configure.ac | 2 fslsfonts/depcomp | 64 +- fslsfonts/fslsfonts.man | 20 fslsfonts/install-sh | 348 ++++++++--- fslsfonts/missing | 61 + fslsfonts/mkinstalldirs | 158 ----- fstobdf/COPYING | 93 ++- fstobdf/ChangeLog | 229 ++++++- fstobdf/INSTALL | 236 ------- fstobdf/Makefile.am | 12 fstobdf/Makefile.in | 197 ++---- fstobdf/aclocal.m4 | 1434 +++++++++++++++++++++++----------------------- fstobdf/chars.c | 5 fstobdf/compile | 142 ---- fstobdf/config.guess | 32 - fstobdf/config.sub | 48 + fstobdf/configure | 206 +++--- fstobdf/configure.ac | 2 fstobdf/depcomp | 64 +- fstobdf/fstobdf.h | 2 fstobdf/fstobdf.man | 18 fstobdf/install-sh | 348 ++++++++--- fstobdf/missing | 61 + fstobdf/mkinstalldirs | 158 ----- showfont/COPYING | 72 ++ showfont/ChangeLog | 212 ++++++ showfont/INSTALL | 236 ------- showfont/Makefile.am | 12 showfont/Makefile.in | 147 ++-- showfont/aclocal.m4 | 1468 ++++++++++++++++++++++++------------------------ showfont/config.guess | 32 - showfont/config.h.in | 3 showfont/config.sub | 48 + showfont/configure | 332 +++++++--- showfont/configure.ac | 3 showfont/depcomp | 64 +- showfont/install-sh | 348 ++++++++--- showfont/missing | 61 + showfont/mkinstalldirs | 158 ----- showfont/showfont.c | 129 ++-- showfont/showfont.man | 20 xfsinfo/COPYING | 70 ++ xfsinfo/ChangeLog | 208 ++++++ xfsinfo/INSTALL | 236 ------- xfsinfo/Makefile.am | 12 xfsinfo/Makefile.in | 147 ++-- xfsinfo/aclocal.m4 | 1468 ++++++++++++++++++++++++------------------------ xfsinfo/config.guess | 32 - xfsinfo/config.h.in | 3 xfsinfo/config.sub | 48 + xfsinfo/configure | 332 +++++++--- xfsinfo/configure.ac | 3 xfsinfo/depcomp | 64 +- xfsinfo/install-sh | 348 ++++++++--- xfsinfo/missing | 61 + xfsinfo/mkinstalldirs | 158 ----- xfsinfo/xfsinfo.c | 2 xfsinfo/xfsinfo.man | 20 71 files changed, 7032 insertions(+), 6250 deletions(-)
New commits: commit 8eff386c32d8a57b86f73cf594b72b4ec3635c9f Author: Brice Goglin <[EMAIL PROTECTED]> Date: Wed May 28 23:06:49 2008 +0200 Misc fixes in debian/control * Bump Standards-Version to 3.7.3, no change needed. * Add Vcs-Git and -Browser fields to debian/control. diff --git a/debian/changelog b/debian/changelog index c3431da..5493ad6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ x11-xfs-utils (7.4+1) UNRELEASED; urgency=low * fstobdf 1.0.3. * showfont 1.0.2. * xfsinfo 1.0.2. + * Bump Standards-Version to 3.7.3, no change needed. + * Add Vcs-Git and -Browser fields to debian/control. - -- Brice Goglin <[EMAIL PROTECTED]> Wed, 28 May 2008 22:58:50 +0200 + -- Brice Goglin <[EMAIL PROTECTED]> Wed, 28 May 2008 23:05:28 +0200 x11-xfs-utils (7.3+1) unstable; urgency=low diff --git a/debian/control b/debian/control index 52b1d2a..30c8b7c 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,9 @@ Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0), libfs-dev (>= 2:1.0.0) -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 +Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xfs-utils +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xfs-utils.git Package: x11-xfs-utils Architecture: any commit 5e4fa4080c366bc1bb2b06d798047ac54d0d3574 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Wed May 28 23:00:21 2008 +0200 xfsinfo 1.0.2 diff --git a/debian/changelog b/debian/changelog index 02295f5..c3431da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ x11-xfs-utils (7.4+1) UNRELEASED; urgency=low * fslsfonts 1.0.2. * fstobdf 1.0.3. * showfont 1.0.2. + * xfsinfo 1.0.2. - -- Brice Goglin <[EMAIL PROTECTED]> Wed, 28 May 2008 22:57:01 +0200 + -- Brice Goglin <[EMAIL PROTECTED]> Wed, 28 May 2008 22:58:50 +0200 x11-xfs-utils (7.3+1) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index bb8641d..04e796e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -236,3 +236,74 @@ showfont: DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +xfsinfo: + Portions Copyright 1987, 1993, 1998 The Open Group + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation. + + 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 OPEN GROUP 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 Open Group 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 Open Group. + + + Copyright 1990, 1991 Network Computing Devices; + Portions Copyright 1987 by Digital Equipment Corporation + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the names of Network Computing Devices + or Digital not be used in advertising or + publicity pertaining to distribution of the software without specific, + written prior permission. Network Computing Devices and Digital + make no representations about the + suitability of this software for any purpose. It is provided "as is" + without express or implied warranty. + + NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH + REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES OR DIGITAL BE + LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + + Copyright 2005 Red Hat, Inc. + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of Red Hat not be used in + advertising or publicity pertaining to distribution of the software without + specific, written prior permission. Red Hat makes no + representations about the suitability of this software for any purpose. It + is provided "as is" without express or implied warranty. + + RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. diff --git a/xfsinfo/COPYING b/xfsinfo/COPYING index 7f33cbf..1aeb65d 100644 --- a/xfsinfo/COPYING +++ b/xfsinfo/COPYING @@ -1,12 +1,66 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Portions Copyright 1987, 1993, 1998 The Open Group -Please submit updated COPYING files to the Xorg bugzilla: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +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 OPEN GROUP 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. -http://lists.freedesktop.org/mailman/listinfo/xorg +Except as contained in this notice, the name of The Open Group 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 Open Group. + +Copyright 1990, 1991 Network Computing Devices; +Portions Copyright 1987 by Digital Equipment Corporation + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Network Computing Devices +or Digital not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. Network Computing Devices and Digital +make no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. + +NETWORK COMPUTING DEVICES AND DIGITAL DISCLAIM ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES OR DIGITAL BE +LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Copyright 2005 Red Hat, Inc. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Red Hat not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Red Hat makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. diff --git a/xfsinfo/ChangeLog b/xfsinfo/ChangeLog index 6eb4c51..d32ee5f 100644 --- a/xfsinfo/ChangeLog +++ b/xfsinfo/ChangeLog @@ -1,25 +1,203 @@ -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 2212c7ad4386dcddfa2910b0cbf7497d2ac60654 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Fri May 23 16:13:43 2008 -0700 - * configure.ac: - Update package version for X11R7 release. + xfsinfo 1.0.2 -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 3816d144f9f310544d6ddff991911a949d2ae070 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Fri May 23 16:13:31 2008 -0700 - * configure.ac: - Update package version number for final X11R7 release candidate. + Fill in COPYING with copyright/license notices from sources -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 72a78dc043b06192a72e08d37bbac1ee0fb27429 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Fri May 23 16:01:10 2008 -0700 - * Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + Replace (1) with __appmansuffix__ in man page -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 58d4b018eaf3840341c0815bb177521e6311a665 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Fri May 23 15:44:26 2008 -0700 - * configure.ac: - Update package version number for X11R7 RC3 release. + Plug memory leaks (Coverity ids 570 & 571) -2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> +commit 8e614188ba9ee7cd0c87804555a352d1248efa11 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Thu May 22 20:02:34 2008 -0700 - * configure.ac: - Update package version number for RC1 release. + Change xfsinfo_CFLAGS to AM_CFLAGS to make automake-1.10 happier +commit 94c2ffa1fd6a6c8aacb5bce3002a1ec4ccae29dd +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Thu May 22 19:37:56 2008 -0700 + + Clarify syntax of -server & FONTSERVER in man page + +commit 0034621a7661c18f2e2b55239fc7f5c79117b694 +Author: Jeremy Huddleston <[EMAIL PROTECTED]> +Date: Sun Mar 16 23:04:25 2008 -0700 + + Added missing AM_PROG_CC_C_O + +commit cc632b81c4840fed41972b672a6e78e903b64d0c +Author: James Cloos <[EMAIL PROTECTED]> +Date: Thu Dec 6 16:37:15 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 3f09e04800c597beaac11bb6de7d4c2b15e009bb +Author: James Cloos <[EMAIL PROTECTED]> +Date: Mon Sep 3 05:51:23 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit bc30afe115ffaab9aac6a580013e27e76477ac3f +Author: James Cloos <[EMAIL PROTECTED]> +Date: Thu Aug 23 19:24:49 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 16af7a8d70d4abfbcefaf5397ca6a702136c462d +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Dec 21 02:29:50 2005 +0000 + + Update package version for X11R7 release. + +commit 9493acfad1b73681caea030fa4429af7a35c9703 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Mon Dec 19 16:22:44 2005 +0000 + + Stub COPYING files + +commit a970f4d11b32b5dcf32389609950ad6b5bb0f2c4 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Thu Dec 15 00:24:07 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit c6c1e15b824fc8e871994f087e58252bd76df9ba +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Tue Dec 6 22:48:22 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 7623174063bd35bbdf87ffc338a40134750d4fea +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Sat Dec 3 05:49:23 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 76c904a43455515b4cd2b357d5cd5249586b90fa +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Nov 28 22:01:42 2005 +0000 + + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) + +commit ba8bd073ed2d5131e20ccf53c0f3b26a07415f5f +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Mon Nov 21 10:35:01 2005 +0000 + + Another pass at .cvsignores for apps. + +commit ae4e88480f26e057a4c356b2a5d5057ddc8870ef +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Sun Nov 20 22:08:52 2005 +0000 + + Add/improve .cvsignore files for apps. + +commit bb0af487c21e63754891ea05e16f74a68c13a2ac +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Oct 19 02:47:54 2005 +0000 + + Update package version number for RC1 release. + +commit 0f35ff2cea82b2d3c8a3faad2de3397b2ceab22d +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Oct 17 23:56:22 2005 +0000 + + Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to + work better with BSD make + +commit 6b84bdf6ab2d1cdf813475ac003e850cc2ab75b8 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Fri Oct 14 00:25:45 2005 +0000 + + Use sed to fill in variables in man page + +commit ab6ef92d549e286d367889e1fdc3eca0baab6678 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Aug 1 20:25:30 2005 +0000 + + Install man pages to section 1 instead of section m (Patch from Donnie + Berkholz) + +commit a9822002d7a724ac6036401da2e6b24c4e5ddb83 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Fri Jul 29 21:22:34 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 632c814305c180f61beb068b946a7a12e07bf728 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Wed Jul 20 19:31:56 2005 +0000 + + Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global + configure cache, you cache it, and the cached value is probably wrong. + +commit dddb0fc49f851443d9aea595c7c98c109256f407 +Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]> +Date: Wed Jul 6 14:54:15 2005 +0000 + + Build system for xfsinfo + +commit 1358a14ac6d3ae2b4d3f184d240e9da91e2203d6 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Fri Apr 23 19:54:48 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit deba072592938eb8f684756831fef1c03247f187 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Sun Mar 14 08:35:23 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 19186656b5274e8d63b66154798f17584be2416b +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Wed Mar 3 12:13:08 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 9668d8f33eb05c12ecd0831831e57643b2a877c8 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Thu Feb 26 13:36:24 2004 +0000 + + readding XFree86's cvs IDs + +commit bc80c9eeba40ec86e29abb9932d6abc43e657298 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Thu Feb 26 09:24:07 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit a40bcbfdb43fd4f4facca21d3749595322491a97 +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Fri Nov 14 16:49:22 2003 +0000 + + XFree86 4.3.0.1 + +commit 83f8ee18a050cbad1a2d3770bc8c2ad0f89c3837 +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Fri Nov 14 16:49:22 2003 +0000 + + Initial revision diff --git a/xfsinfo/INSTALL b/xfsinfo/INSTALL index 23e5f25..e69de29 100644 --- a/xfsinfo/INSTALL +++ b/xfsinfo/INSTALL @@ -1,236 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - -These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: - - /bin/bash ./configure CONFIG_SHELL=/bin/bash - -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/xfsinfo/Makefile.am b/xfsinfo/Makefile.am index 377a5af..c498ddb 100644 --- a/xfsinfo/Makefile.am +++ b/xfsinfo/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xfsinfo -xfsinfo_CFLAGS = $(XFSINFO_CFLAGS) +AM_CFLAGS = $(XFSINFO_CFLAGS) xfsinfo_LDADD = $(XFSINFO_LIBS) xfsinfo_SOURCES = \ @@ -61,3 +61,13 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): sed $(MAN_SUBSTS) < $< > $@ + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog diff --git a/xfsinfo/Makefile.in b/xfsinfo/Makefile.in index fb89d22..e0334f6 100644 --- a/xfsinfo/Makefile.in +++ b/xfsinfo/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -36,15 +36,11 @@ # PERFORMANCE OF THIS SOFTWARE. -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -59,29 +55,28 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = xfsinfo$(EXEEXT) +subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - compile config.guess config.sub depcomp install-sh missing \ - mkinstalldirs -subdir = . + compile config.guess config.sub depcomp install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + configure.lineno config.status.lineno +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_xfsinfo_OBJECTS = xfsinfo-xfsinfo.$(OBJEXT) +am_xfsinfo_OBJECTS = xfsinfo.$(OBJEXT) xfsinfo_OBJECTS = $(am_xfsinfo_OBJECTS) am__DEPENDENCIES_1 = xfsinfo_DEPENDENCIES = $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I. +DEFAULT_INCLUDES = [EMAIL PROTECTED]@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -114,8 +109,6 @@ distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ @@ -138,6 +131,7 @@ ECHO_T = @ECHO_T@ EXEEXT = @EXEEXT@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -149,11 +143,10 @@ LIB_MAN_DIR = @LIB_MAN_DIR@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -169,9 +162,11 @@ STRIP = @STRIP@ VERSION = @VERSION@ XFSINFO_CFLAGS = @XFSINFO_CFLAGS@ XFSINFO_LIBS = @XFSINFO_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -183,6 +178,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -210,9 +206,12 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -xfsinfo_CFLAGS = $(XFSINFO_CFLAGS) +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AM_CFLAGS = $(XFSINFO_CFLAGS) xfsinfo_LDADD = $(XFSINFO_LIBS) xfsinfo_SOURCES = \ xfsinfo.c @@ -222,7 +221,7 @@ appman_PRE = \ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:[EMAIL PROTECTED]@) -EXTRA_DIST = $(appman_PRE) +EXTRA_DIST = $(appman_PRE) ChangeLog CLEANFILES = $(appman_DATA) SED = sed @@ -243,6 +242,7 @@ MAN_SUBSTS = \ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' SUFFIXES = .$(APP_MAN_SUFFIX) .man +MAINTAINERCLEANFILES = ChangeLog all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -285,7 +285,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @@ -300,7 +300,7 @@ distclean-hdr: -rm -f config.h stamp-h1 install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -323,7 +323,7 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) xfsinfo$(EXEEXT): $(xfsinfo_OBJECTS) $(xfsinfo_DEPENDENCIES) @rm -f xfsinfo$(EXEEXT) - $(LINK) $(xfsinfo_LDFLAGS) $(xfsinfo_OBJECTS) $(xfsinfo_LDADD) $(LIBS) + $(LINK) $(xfsinfo_OBJECTS) $(xfsinfo_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -331,39 +331,24 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c [EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ [EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ .c.o: [EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ [EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi [EMAIL PROTECTED]@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< [EMAIL PROTECTED]@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: [EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ [EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi [EMAIL PROTECTED]@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` [EMAIL PROTECTED]@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -xfsinfo-xfsinfo.o: xfsinfo.c [EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfsinfo_CFLAGS) $(CFLAGS) -MT xfsinfo-xfsinfo.o -MD -MP -MF "$(DEPDIR)/xfsinfo-xfsinfo.Tpo" -c -o xfsinfo-xfsinfo.o `test -f 'xfsinfo.c' || echo '$(srcdir)/'`xfsinfo.c; \ [EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/xfsinfo-xfsinfo.Tpo" "$(DEPDIR)/xfsinfo-xfsinfo.Po"; else rm -f "$(DEPDIR)/xfsinfo-xfsinfo.Tpo"; exit 1; fi [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='xfsinfo.c' object='xfsinfo-xfsinfo.o' libtool=no @AMDEPBACKSLASH@ [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ [EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfsinfo_CFLAGS) $(CFLAGS) -c -o xfsinfo-xfsinfo.o `test -f 'xfsinfo.c' || echo '$(srcdir)/'`xfsinfo.c - -xfsinfo-xfsinfo.obj: xfsinfo.c [EMAIL PROTECTED]@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfsinfo_CFLAGS) $(CFLAGS) -MT xfsinfo-xfsinfo.obj -MD -MP -MF "$(DEPDIR)/xfsinfo-xfsinfo.Tpo" -c -o xfsinfo-xfsinfo.obj `if test -f 'xfsinfo.c'; then $(CYGPATH_W) 'xfsinfo.c'; else $(CYGPATH_W) '$(srcdir)/xfsinfo.c'; fi`; \ [EMAIL PROTECTED]@ then mv -f "$(DEPDIR)/xfsinfo-xfsinfo.Tpo" "$(DEPDIR)/xfsinfo-xfsinfo.Po"; else rm -f "$(DEPDIR)/xfsinfo-xfsinfo.Tpo"; exit 1; fi [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='xfsinfo.c' object='xfsinfo-xfsinfo.obj' libtool=no @AMDEPBACKSLASH@ [EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ [EMAIL PROTECTED]@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfsinfo_CFLAGS) $(CFLAGS) -c -o xfsinfo-xfsinfo.obj `if test -f 'xfsinfo.c'; then $(CYGPATH_W) 'xfsinfo.c'; else $(CYGPATH_W) '$(srcdir)/xfsinfo.c'; fi` -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]